diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 1bbbd8abc63..6601e0afd0d 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -1025,7 +1025,6 @@ pref("apz.fling_curve_function_x2", "0.80"); pref("apz.fling_curve_function_y2", "1.0"); pref("apz.fling_curve_threshold_inches_per_ms", "0.01"); pref("apz.fling_friction", "0.0019"); -pref("apz.fling_snap_friction", "0.015"); pref("apz.max_velocity_inches_per_ms", "0.07"); pref("apz.touch_start_tolerance", "0.1"); diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index 2c43a0841a5..fccc11d6681 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -2347,7 +2347,7 @@ void AsyncPanZoomController::AcceptFling(ParentLayerPoint& aVelocity, aOverscrollHandoffChain, !aHandoff); // only apply acceleration if this is an initial fling - float friction = gfxPrefs::APZFlingSnapFriction(); + float friction = gfxPrefs::APZFlingFriction(); ParentLayerPoint velocity(mX.GetVelocity(), mY.GetVelocity()); ParentLayerPoint predictedDelta; // "-velocity / log(1.0 - friction)" is the integral of the deceleration diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h index af5b74b8065..7d10c28030a 100644 --- a/gfx/thebes/gfxPrefs.h +++ b/gfx/thebes/gfxPrefs.h @@ -162,7 +162,6 @@ private: DECL_GFX_PREF(Live, "apz.fling_curve_threshold_inches_per_ms", APZCurveThreshold, float, -1.0f); DECL_GFX_PREF(Once, "apz.fling_friction", APZFlingFriction, float, 0.002f); DECL_GFX_PREF(Live, "apz.fling_repaint_interval", APZFlingRepaintInterval, int32_t, 75); - DECL_GFX_PREF(Once, "apz.fling_snap_friction", APZFlingSnapFriction, float, 0.015f); DECL_GFX_PREF(Once, "apz.fling_stop_on_tap_threshold", APZFlingStopOnTapThreshold, float, 0.05f); DECL_GFX_PREF(Once, "apz.fling_stopped_threshold", APZFlingStoppedThreshold, float, 0.01f); DECL_GFX_PREF(Once, "apz.highlight_checkerboarded_areas", APZHighlightCheckerboardedAreas, bool, false); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 089c9dc299a..88686697fb5 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -567,7 +567,6 @@ 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_snap_friction", "0.015"); pref("apz.fling_stop_on_tap_threshold", "0.05"); pref("apz.fling_stopped_threshold", "0.01"); pref("apz.highlight_checkerboarded_areas", false);