Bug 1398858 - Have apz.frame_delay.enabled ride the trains on desktop. r=kats draft
authorBotond Ballo <botond@mozilla.com>
Mon, 11 Sep 2017 13:33:54 -0400
changeset 662495 3df9ddd8590d9f168f8f2f1f7f2d44b66aa4cef9
parent 662474 02c78441c03d5d004e57596a130856861a30188a
child 730883 1a75a870df9b477a5457be3f0deaa16f016b2c22
push id79098
push userbballo@mozilla.com
push dateMon, 11 Sep 2017 18:46:33 +0000
reviewerskats
bugs1398858
milestone57.0a1
Bug 1398858 - Have apz.frame_delay.enabled ride the trains on desktop. r=kats MozReview-Commit-ID: HAOFPBlqEq0
mobile/android/app/mobile.js
modules/libpref/init/all.js
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -563,20 +563,18 @@ pref("apz.fling_curve_threshold_inches_p
 pref("apz.fling_friction", "0.004");
 pref("apz.fling_stopped_threshold", "0.0");
 pref("apz.max_velocity_inches_per_ms", "0.07");
 pref("apz.overscroll.enabled", true);
 pref("apz.second_tap_tolerance", "0.3");
 pref("apz.touch_move_tolerance", "0.03");
 pref("apz.touch_start_tolerance", "0.06");
 
-#ifdef NIGHTLY_BUILD
-// Temporary fix of Bug 1390145 for Fennec Nightly
+// Enabling this on Fennec is blocked on a proper fix for bug 1390145.
 pref("apz.frame_delay.enabled", false);
-#endif
 
 pref("layers.progressive-paint", true);
 pref("layers.low-precision-buffer", true);
 pref("layers.low-precision-resolution", "0.25");
 pref("layers.low-precision-opacity", "1.0");
 // We want to limit layers for two reasons:
 // 1) We can't scroll smoothly if we have to many draw calls
 // 2) Pages that have too many layers consume too much memory and crash.
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -686,21 +686,17 @@ pref("apz.fling_curve_function_x1", "0.0
 pref("apz.fling_curve_function_y1", "0.0");
 pref("apz.fling_curve_function_x2", "1.0");
 pref("apz.fling_curve_function_y2", "1.0");
 pref("apz.fling_curve_threshold_inches_per_ms", "-1.0");
 pref("apz.fling_friction", "0.002");
 pref("apz.fling_min_velocity_threshold", "0.5");
 pref("apz.fling_stop_on_tap_threshold", "0.05");
 pref("apz.fling_stopped_threshold", "0.01");
-#ifdef NIGHTLY_BUILD
 pref("apz.frame_delay.enabled", true);
-#else
-pref("apz.frame_delay.enabled", false);
-#endif
 #if !defined(MOZ_WIDGET_ANDROID)
 pref("apz.keyboard.enabled", true);
 pref("apz.keyboard.passive-listeners", true);
 #else
 pref("apz.keyboard.enabled", false);
 pref("apz.keyboard.passive-listeners", false);
 #endif
 pref("apz.max_velocity_inches_per_ms", "-1.0");