Bug 1304729 - Followup to fix careless mistake. r=botond
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 23 Sep 2016 12:14:17 -0400
changeset 315178 6029a9a8b8db8c851e488c6de8b0c0876e633408
parent 315177 6557447e01f44167334c39aa6f7b517be18540a1
child 315179 1db5e766a1ecaf1f1f501932215d717304c6fa70
push id32563
push userihsiao@mozilla.com
push dateMon, 26 Sep 2016 11:18:33 +0000
treeherderautoland@eb840c87b5fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1304729
milestone52.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 1304729 - Followup to fix careless mistake. r=botond MozReview-Commit-ID: 5gsVh4JgroW
gfx/layers/apz/src/AsyncPanZoomController.cpp
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -1435,17 +1435,17 @@ nsEventStatus AsyncPanZoomController::On
   {
     ReentrantMonitorAutoEnter lock(mMonitor);
     ScheduleComposite();
     RequestContentRepaint();
     UpdateSharedCompositorFrameMetrics();
   }
 
   // Non-negative focus point would indicate that one finger is still down
-  if (aEvent.mFocusPoint.x != -1 && aEvent.mFocusPoint.y != -1) {
+  if (aEvent.mLocalFocusPoint.x != -1 && aEvent.mLocalFocusPoint.y != -1) {
     mPanDirRestricted = false;
     mX.StartTouch(aEvent.mLocalFocusPoint.x, aEvent.mTime);
     mY.StartTouch(aEvent.mLocalFocusPoint.y, aEvent.mTime);
     SetState(TOUCHING);
   } else {
     // Otherwise, handle the fingers being lifted.
     ReentrantMonitorAutoEnter lock(mMonitor);