Bug 962881 - Fix regression to y scrolling with x overflow:hidden. r=botond, a=1.3+
authorBenoit Girard <b56girard@gmail.com>
Thu, 23 Jan 2014 11:57:40 -0500
changeset 175025 573b19cdae30c4208a361ac380f4e48850c7ca22
parent 175024 0d038e13031752e4093dfc30bea3fe6fe759abcf
child 175026 f10161f83105c7c281ef0142f3d71dca18df8e93
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond, 1
bugs962881
milestone28.0a2
Bug 962881 - Fix regression to y scrolling with x overflow:hidden. r=botond, a=1.3+
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -1078,17 +1078,17 @@ bool FlingAnimation::Sample(FrameMetrics
 
   // Inversely scale the offset by the resolution (when you're zoomed further in,
   // a larger swipe should move you a shorter distance).
   CSSPoint cssOffset = offset / aFrameMetrics.mZoom;
   aFrameMetrics.mScrollOffset += CSSPoint::FromUnknownPoint(gfx::Point(
     mX.AdjustDisplacement(cssOffset.x, overscroll.x,
                           aFrameMetrics.GetDisableScrollingX()),
     mY.AdjustDisplacement(cssOffset.y, overscroll.y,
-                          aFrameMetrics.GetDisableScrollingX())
+                          aFrameMetrics.GetDisableScrollingY())
   ));
 
   return true;
 }
 
 void AsyncPanZoomController::StartAnimation(AsyncPanZoomAnimation* aAnimation)
 {
   ReentrantMonitorAutoEnter lock(mMonitor);