Bug 950488 - Bustage fixup for uplift to aurora. r=me a=1.3+
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 22 Jan 2014 12:00:44 -0500
changeset 175929 c612bde706544e34e3d4d95068fd648842839334
parent 175928 7824e4c50fae04fff19b68595eaedf1318048025
child 175930 9739614a88364c986eb0c898699fce4e6f58d4bf
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, 1
bugs950488
milestone28.0a2
Bug 950488 - Bustage fixup for uplift to aurora. r=me a=1.3+
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -918,30 +918,30 @@ nsEventStatus AsyncPanZoomController::St
   }
 
   double angle = atan2(dy, dx); // range [-pi, pi]
   angle = fabs(angle); // range [0, pi]
 
   if (!gCrossSlideEnabled && (!mX.Scrollable() || !mY.Scrollable())) {
     SetState(PANNING);
   } else if (IsCloseToHorizontal(angle, AXIS_LOCK_ANGLE)) {
-    mY.SetScrollingDisabled(true);
+    mY.SetAxisLocked(true);
     if (mX.Scrollable()) {
       SetState(PANNING_LOCKED_X);
     } else {
       SetState(CROSS_SLIDING_X);
-      mX.SetScrollingDisabled(true);
+      mX.SetAxisLocked(true);
     }
   } else if (IsCloseToVertical(angle, AXIS_LOCK_ANGLE)) {
-    mX.SetScrollingDisabled(true);
+    mX.SetAxisLocked(true);
     if (mY.Scrollable()) {
       SetState(PANNING_LOCKED_Y);
     } else {
       SetState(CROSS_SLIDING_Y);
-      mY.SetScrollingDisabled(true);
+      mY.SetAxisLocked(true);
     }
   } else {
     SetState(PANNING);
   }
 
   // Don't consume an event that starts a cross-slide.
   return IsPanningState(mState) ? nsEventStatus_eConsumeNoDefault
                                 : nsEventStatus_eIgnore;