From 6493f3f028c2a14143117060aaaf887d9291122e Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 10 Dec 2014 17:10:24 -0500
Subject: [PATCH] Bug 1013432 - Followup to fix rebase error. r=me

---
 gfx/layers/apz/src/InputQueue.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gfx/layers/apz/src/InputQueue.cpp b/gfx/layers/apz/src/InputQueue.cpp
index 44c1c224403..10da3034e2c 100644
--- a/gfx/layers/apz/src/InputQueue.cpp
+++ b/gfx/layers/apz/src/InputQueue.cpp
@@ -178,6 +178,7 @@ InputQueue::CancelAnimationsForNewBlock(CancelableBlockState* aBlock)
       // and to disallow the touch event from being used as part of a fling.
       if (TouchBlockState* touch = aBlock->AsTouchBlock()) {
         touch->SetDuringFastMotion();
+        INPQ_LOG("block %p tagged as fast-motion\n", touch);
       }
     }
     aBlock->GetOverscrollHandoffChain()->CancelAnimations();
@@ -192,6 +193,10 @@ InputQueue::MaybeRequestContentResponse(const nsRefPtr<AsyncPanZoomController>&
   if (!gfxPrefs::LayoutEventRegionsEnabled()) {
     waitForMainThread |= aTarget->NeedToWaitForContent();
   }
+  if (aBlock->AsTouchBlock() && aBlock->AsTouchBlock()->IsDuringFastMotion()) {
+    aBlock->SetConfirmedTargetApzc(aTarget);
+    waitForMainThread = false;
+  }
 
   if (waitForMainThread) {
     // We either don't know for sure if aTarget is the right APZC, or we may