Bug 1270165 - Allow ResetTouchInputState to be called while a non-touch block is the current block. r?botond draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 04 May 2016 11:57:36 -0400
changeset 363402 db835bd63b61edf1e6a9ab3c441077c930c52bde
parent 363286 369a5ee3a2880a4a98df3a00bf3db8d8f36b181b
child 520018 538ec29fec9fab38ce7160ec819add81c1997972
push id17182
push userkgupta@mozilla.com
push dateWed, 04 May 2016 15:57:48 +0000
reviewersbotond
bugs1270165
milestone49.0a1
Bug 1270165 - Allow ResetTouchInputState to be called while a non-touch block is the current block. r?botond MozReview-Commit-ID: HN3G249raKW
gfx/layers/apz/src/AsyncPanZoomController.cpp
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -3755,17 +3755,17 @@ AsyncPanZoomController::ResetTouchInputS
   MultiTouchInput cancel(MultiTouchInput::MULTITOUCH_CANCEL, 0, TimeStamp::Now(), 0);
   RefPtr<GestureEventListener> listener = GetGestureEventListener();
   if (listener) {
     listener->HandleInputEvent(cancel);
   }
   CancelAnimationAndGestureState();
   // Clear overscroll along the entire handoff chain, in case an APZC
   // later in the chain is overscrolled.
-  if (TouchBlockState* block = CurrentTouchBlock()) {
+  if (TouchBlockState* block = CurrentInputBlock()->AsTouchBlock()) {
     block->GetOverscrollHandoffChain()->ClearOverscroll();
   }
 }
 
 void
 AsyncPanZoomController::CancelAnimationAndGestureState()
 {
   mX.CancelGesture();