Bug 1231500 - Fix a typo in the APZ axis locking code where the lock angle is used when the breakout angle is intended to be used. r=kats
authorBotond Ballo <botond@mozilla.com>
Wed, 09 Dec 2015 15:23:22 -0500
changeset 276161 7bedc0cbb9350c2cdf0cf404f292d9abc576d85f
parent 276160 a1bd47d76f71162534090485acc57866dcd55eef
child 276162 73246a388339af64372f646613aaf9f61a0907ae
push id29784
push usercbook@mozilla.com
push dateFri, 11 Dec 2015 10:38:27 +0000
treeherdermozilla-central@754b4805a65c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1231500
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1231500 - Fix a typo in the APZ axis locking code where the lock angle is used when the breakout angle is intended to be used. r=kats
gfx/layers/apz/src/AsyncPanZoomController.cpp
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -2214,17 +2214,17 @@ void AsyncPanZoomController::HandlePanni
 
     if (fabs(aPanDistance.x) > breakThreshold || fabs(aPanDistance.y) > breakThreshold) {
       if (mState == PANNING_LOCKED_X) {
         if (!IsCloseToHorizontal(angle, gfxPrefs::APZAxisBreakoutAngle())) {
           mY.SetAxisLocked(false);
           SetState(PANNING);
         }
       } else if (mState == PANNING_LOCKED_Y) {
-        if (!IsCloseToVertical(angle, gfxPrefs::APZAxisLockAngle())) {
+        if (!IsCloseToVertical(angle, gfxPrefs::APZAxisBreakoutAngle())) {
           mX.SetAxisLocked(false);
           SetState(PANNING);
         }
       }
     }
   }
 }