mozilla-central: changeset 276161:7bedc0cbb9350c2cdf0cf404f292d9abc576d85f

author	Botond Ballo <botond@mozilla.com>
	Wed, 09 Dec 2015 15:23:22 -0500
changeset 276161	7bedc0cbb9350c2cdf0cf404f292d9abc576d85f
parent 276160	a1bd47d76f71162534090485acc57866dcd55eef
child 276162	73246a388339af64372f646613aaf9f61a0907ae
push id	29784
push user	cbook@mozilla.com
push date	Fri, 11 Dec 2015 10:38:27 +0000
treeherder	mozilla-central@754b4805a65c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	kats
bugs	1231500
milestone	45.0a1
first release with	nightly linux32 754b4805a65c / 45.0a1 / 20151211030207 / files nightly linux64 754b4805a65c / 45.0a1 / 20151211030207 / files nightly mac 754b4805a65c / 45.0a1 / 20151211030207 / files nightly win32 754b4805a65c / 45.0a1 / 20151211030207 / files nightly win64 754b4805a65c / 45.0a1 / 20151211030207 / files
last release without	nightly linux32 b40ba117fa75 / 45.0a1 / 20151210030212 / files nightly linux64 b40ba117fa75 / 45.0a1 / 20151210030212 / files nightly mac b40ba117fa75 / 45.0a1 / 20151210030212 / files nightly win32 b40ba117fa75 / 45.0a1 / 20151210030212 / files nightly win64 b40ba117fa75 / 45.0a1 / 20151210030212 / files

--- 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);
         }
       }
     }
   }
 }