wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1223946 - Part 2: Ensure wheel event from nsDOMWindowUtil is dispatched on correct thread. r=kats

Browse Source
This commit is contained in:
Randall Barker 2015-11-18 19:33:00 -05:00
parent 3fef84f2dc
commit 87ed63b77f
2 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
widget/nsBaseWidget.cpp
View File

@ -60,6 +60,7 @@
#include "nsRefPtrHashtable.h"
#include "TouchEvents.h"
#include "WritingModes.h"
#include "InputData.h"
#ifdef ACCESSIBILITY
#include "nsAccessibilityService.h"
#endif
@ -1045,18 +1046,94 @@ nsBaseWidget::DispatchInputEvent(WidgetInputEvent* aEvent)
return status;
}
class DispatchWheelEventOnMainThread : public Task
{
public:
DispatchWheelEventOnMainThread(const ScrollWheelInput& aWheelInput,
nsBaseWidget* aWidget,
nsEventStatus aAPZResult,
uint64_t aInputBlockId,
ScrollableLayerGuid aGuid)
: mWheelInput(aWheelInput)
, mWidget(aWidget)
, mAPZResult(aAPZResult)
, mInputBlockId(aInputBlockId)
, mGuid(aGuid)
{
}
void Run()
{
WidgetWheelEvent wheelEvent = mWheelInput.ToWidgetWheelEvent(mWidget);
mWidget->ProcessUntransformedAPZEvent(&wheelEvent, mGuid, mInputBlockId, mAPZResult);
return;
}
private:
ScrollWheelInput mWheelInput;
nsBaseWidget* mWidget;
nsEventStatus mAPZResult;
uint64_t mInputBlockId;
ScrollableLayerGuid mGuid;
};
class DispatchWheelInputOnControllerThread : public Task
{
public:
DispatchWheelInputOnControllerThread(const WidgetWheelEvent& aWheelEvent,
APZCTreeManager* aAPZC,
nsBaseWidget* aWidget)
: mMainMessageLoop(MessageLoop::current())
, mWheelInput(aWheelEvent)
, mAPZC(aAPZC)
, mWidget(aWidget)
, mInputBlockId(0)
{
}
void Run()
{
mAPZResult = mAPZC->ReceiveInputEvent(mWheelInput, &mGuid, &mInputBlockId);
if (mAPZResult == nsEventStatus_eConsumeNoDefault) {
return;
}
mMainMessageLoop->PostTask(FROM_HERE,
new DispatchWheelEventOnMainThread(mWheelInput, mWidget, mAPZResult, mInputBlockId, mGuid));
return;
}
private:
MessageLoop* mMainMessageLoop;
ScrollWheelInput mWheelInput;
RefPtr<APZCTreeManager> mAPZC;
nsBaseWidget* mWidget;
nsEventStatus mAPZResult;
uint64_t mInputBlockId;
ScrollableLayerGuid mGuid;
};
nsEventStatus
nsBaseWidget::DispatchAPZAwareEvent(WidgetInputEvent* aEvent)
{
MOZ_ASSERT(NS_IsMainThread());
if (mAPZC) {
uint64_t inputBlockId = 0;
ScrollableLayerGuid guid;
if (APZThreadUtils::IsControllerThread()) {
uint64_t inputBlockId = 0;
ScrollableLayerGuid guid;
nsEventStatus result = mAPZC->ReceiveInputEvent(*aEvent, &guid, &inputBlockId);
if (result == nsEventStatus_eConsumeNoDefault) {
return result;
nsEventStatus result = mAPZC->ReceiveInputEvent(*aEvent, &guid, &inputBlockId);
if (result == nsEventStatus_eConsumeNoDefault) {
return result;
}
return ProcessUntransformedAPZEvent(aEvent, guid, inputBlockId, result);
} else {
WidgetWheelEvent* wheelEvent = aEvent->AsWheelEvent();
if (wheelEvent) {
APZThreadUtils::RunOnControllerThread(new DispatchWheelInputOnControllerThread(*wheelEvent, mAPZC, this));
return nsEventStatus_eConsumeDoDefault;
}
MOZ_CRASH();
}
return ProcessUntransformedAPZEvent(aEvent, guid, inputBlockId, result);
}
nsEventStatus status;

1
widget/nsBaseWidget.h
View File

@ -86,6 +86,7 @@ public:
class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
{
friend class nsAutoRollup;
friend class DispatchWheelEventOnMainThread;
protected:
typedef base::Thread Thread;