Bug 962881 - Fix regression to y scrolling with x overflow:hidden. r=botond
authorBenoit Girard <b56girard@gmail.com>
Thu, 23 Jan 2014 11:57:40 -0500
changeset 164869 c2029fa259451b06edd184367e5416c29cbf0a37
parent 164868 3822e729fc7f4d80092f059eca2fd65f9c67ebdf
child 164870 496f64d5024ef22f2f2c0c0ff3819a44317875b3
push id4116
push userb56girard@gmail.com
push dateThu, 23 Jan 2014 16:58:46 +0000
treeherderb2g-inbound@c2029fa25945 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs962881
milestone29.0a1
Bug 962881 - Fix regression to y scrolling with x overflow:hidden. r=botond
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -1223,17 +1223,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);