Bug 1013432 - Followup to fix rebase error. r=me

This commit is contained in:
Kartikaya Gupta 2014-12-10 17:10:24 -05:00
parent c279dae2f5
commit 6493f3f028

View File

@ -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