Back out cset 156e0990abc8 (bug 1246676) since it's not needed any more. r=backout
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 16 Feb 2016 09:39:25 -0500
changeset 331297 04972721d1fbfbe8365ddf5b8c1f7423f863303d
parent 331296 8ef6378d6a59103b2dbb504c7a642a9230cb8920
child 331298 46180e3cd0c6adda64977bd6ecd82aec201d6f3a
push id10956
push userjolesen@mozilla.com
push dateTue, 16 Feb 2016 19:12:12 +0000
reviewersbackout
bugs1246676
milestone47.0a1
backs out156e0990abc81a90923e037131c41af11a694dff
Back out cset 156e0990abc8 (bug 1246676) since it's not needed any more. r=backout
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -563,26 +563,17 @@ pref("apz.axis_lock.mode", 0);
 pref("apz.axis_lock.lock_angle", "0.5235987");        // PI / 6 (30 degrees)
 pref("apz.axis_lock.breakout_threshold", "0.03125");  // 1/32 inches
 pref("apz.axis_lock.breakout_angle", "0.3926991");    // PI / 8 (22.5 degrees)
 pref("apz.axis_lock.direct_pan_angle", "1.047197");   // PI / 3 (60 degrees)
 pref("apz.content_response_timeout", 300);
 pref("apz.drag.enabled", false);
 pref("apz.danger_zone_x", 50);
 pref("apz.danger_zone_y", 100);
-
-// See bug 1246676, we're experimenting to see what's best
-#if defined(XP_WIN)
-pref("apz.displayport_expiry_ms", 0);
-#elif defined(XP_MACOSX)
-pref("apz.displayport_expiry_ms", 30000);
-#else
 pref("apz.displayport_expiry_ms", 15000);
-#endif
-
 pref("apz.enlarge_displayport_when_clipped", false);
 pref("apz.fling_accel_base_mult", "1.0");
 pref("apz.fling_accel_interval_ms", 500);
 pref("apz.fling_accel_supplemental_mult", "1.0");
 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");