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

Bug 1666201 - Part 2: Make Dispatch*Thread support multiple types of event; r=kats

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D91491
This commit is contained in:
Edgar Chen 2020-10-01 08:52:22 +00:00
parent 007c999be8
commit 91c7e03f17
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
widget/nsBaseWidget.cpp
View File

@ -1015,54 +1015,54 @@ nsEventStatus nsBaseWidget::ProcessUntransformedAPZEvent(
return status;
}
class DispatchWheelEventOnMainThread : public Runnable {
template <class InputType, class EventType>
class DispatchEventOnMainThread : public Runnable {
public:
DispatchWheelEventOnMainThread(const ScrollWheelInput& aWheelInput,
nsBaseWidget* aWidget,
const APZEventResult& aAPZResult)
: mozilla::Runnable("DispatchWheelEventOnMainThread"),
mWheelInput(aWheelInput),
DispatchEventOnMainThread(const InputType& aInput, nsBaseWidget* aWidget,
const APZEventResult& aAPZResult)
: mozilla::Runnable("DispatchEventOnMainThread"),
mInput(aInput),
mWidget(aWidget),
mAPZResult(aAPZResult) {}
NS_IMETHOD Run() override {
WidgetWheelEvent wheelEvent = mWheelInput.ToWidgetEvent(mWidget);
mWidget->ProcessUntransformedAPZEvent(&wheelEvent, mAPZResult);
EventType event = mInput.ToWidgetEvent(mWidget);
mWidget->ProcessUntransformedAPZEvent(&event, mAPZResult);
return NS_OK;
}
private:
ScrollWheelInput mWheelInput;
InputType mInput;
nsBaseWidget* mWidget;
APZEventResult mAPZResult;
};
class DispatchWheelInputOnControllerThread : public Runnable {
template <class InputType, class EventType>
class DispatchInputOnControllerThread : public Runnable {
public:
DispatchWheelInputOnControllerThread(const WidgetWheelEvent& aWheelEvent,
IAPZCTreeManager* aAPZC,
nsBaseWidget* aWidget)
: mozilla::Runnable("DispatchWheelInputOnControllerThread"),
DispatchInputOnControllerThread(const EventType& aEvent,
IAPZCTreeManager* aAPZC,
nsBaseWidget* aWidget)
: mozilla::Runnable("DispatchInputOnControllerThread"),
mMainMessageLoop(MessageLoop::current()),
mWheelInput(aWheelEvent),
mInput(aEvent),
mAPZC(aAPZC),
mWidget(aWidget) {}
NS_IMETHOD Run() override {
APZEventResult result =
mAPZC->InputBridge()->ReceiveInputEvent(mWheelInput);
APZEventResult result = mAPZC->InputBridge()->ReceiveInputEvent(mInput);
if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
return NS_OK;
}
RefPtr<Runnable> r =
new DispatchWheelEventOnMainThread(mWheelInput, mWidget, result);
RefPtr<Runnable> r = new DispatchEventOnMainThread<InputType, EventType>(
mInput, mWidget, result);
mMainMessageLoop->PostTask(r.forget());
return NS_OK;
}
private:
MessageLoop* mMainMessageLoop;
ScrollWheelInput mWheelInput;
InputType mInput;
RefPtr<IAPZCTreeManager> mAPZC;
nsBaseWidget* mWidget;
};
@ -1117,10 +1117,11 @@ nsEventStatus nsBaseWidget::DispatchInputEvent(WidgetInputEvent* aEvent) {
}
return ProcessUntransformedAPZEvent(aEvent, result);
}
WidgetWheelEvent* wheelEvent = aEvent->AsWheelEvent();
if (wheelEvent) {
if (WidgetWheelEvent* wheelEvent = aEvent->AsWheelEvent()) {
RefPtr<Runnable> r =
new DispatchWheelInputOnControllerThread(*wheelEvent, mAPZC, this);
new DispatchInputOnControllerThread<ScrollWheelInput,
WidgetWheelEvent>(*wheelEvent,
mAPZC, this);
APZThreadUtils::RunOnControllerThread(std::move(r));
return nsEventStatus_eConsumeDoDefault;
}

3
widget/nsBaseWidget.h
View File

@ -114,7 +114,8 @@ class WidgetShutdownObserver final : public nsIObserver {
*/
class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
friend class DispatchWheelEventOnMainThread;
template <class EventType, class InputType>
friend class DispatchEventOnMainThread;
friend class mozilla::widget::InProcessCompositorWidget;
friend class mozilla::layers::RemoteCompositorSession;