Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1193062 - Only send a content response for wheel events that have also been processed by APZ. r=kats

Browse Source 
--HG--
extra : commitid : FOt4Lwsp6xZ
extra : rebase_source : 1bea318e6274626c935e8a70317a412ac1f9037d
extra : histedit_source : c3cf20adf2358fb0e7a1295d624c3819fe8cd046
This commit is contained in:
Markus Stange 2015-08-12 15:15:49 -04:00
parent 7f81818f06
commit 316505e2bd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/TabChild.cpp
View File

@ -1880,7 +1880,7 @@ TabChild::RecvMouseWheelEvent(const WidgetWheelEvent& aEvent,
event.widget = mPuppetWidget;
APZCCallbackHelper::DispatchWidgetEvent(event);
if (AsyncPanZoomEnabled()) {
if (aEvent.mFlags.mHandledByAPZ) {
mAPZEventState->ProcessWheelEvent(event, aGuid, aInputBlockId);
}
return true;

8
widget/nsBaseWidget.cpp
View File

@ -1002,9 +1002,11 @@ nsBaseWidget::ProcessUntransformedAPZEvent(WidgetInputEvent* aEvent,
}
mAPZEventState->ProcessTouchEvent(*touchEvent, aGuid, aInputBlockId, aApzResponse);
} else if (WidgetWheelEvent* wheelEvent = aEvent->AsWheelEvent()) {
APZCCallbackHelper::SendSetTargetAPZCNotification(this, GetDocument(), *aEvent,
aGuid, aInputBlockId);
mAPZEventState->ProcessWheelEvent(*wheelEvent, aGuid, aInputBlockId);
if (wheelEvent->mFlags.mHandledByAPZ) {
APZCCallbackHelper::SendSetTargetAPZCNotification(this, GetDocument(), *aEvent,
aGuid, aInputBlockId);
mAPZEventState->ProcessWheelEvent(*wheelEvent, aGuid, aInputBlockId);
}
}
}