diff options
author | Moonchild <moonchild@palemoon.org> | 2020-04-17 16:02:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-17 16:02:56 +0200 |
commit | d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf (patch) | |
tree | 2bfef192cbb748b675ce8308c242a376798e265d /widget | |
parent | 5caf99795aa81e1fc145b8e937b1ee8197ed2486 (diff) | |
parent | f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82 (diff) | |
download | UXP-d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf.tar UXP-d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf.tar.gz UXP-d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf.tar.lz UXP-d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf.tar.xz UXP-d5102d6beafc2a2a0cec3cc3ee5f7ebde31ae7bf.zip |
Merge pull request #1518 from MoonchildProductions/shadowdom-merge
Incremental shadowdom-merge
Diffstat (limited to 'widget')
-rw-r--r-- | widget/BasicEvents.h | 10 | ||||
-rw-r--r-- | widget/ContentEvents.h | 4 | ||||
-rw-r--r-- | widget/MouseEvents.h | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h index 960cb67c6..0ce0f587d 100644 --- a/widget/BasicEvents.h +++ b/widget/BasicEvents.h @@ -25,6 +25,8 @@ struct ParamTraits; namespace mozilla { +class EventTargetChainItem; + /****************************************************************************** * mozilla::BaseEventFlags * @@ -350,6 +352,7 @@ protected: , mRefPoint(0, 0) , mLastRefPoint(0, 0) , mSpecifiedEventType(nullptr) + , mPath(nullptr) { MOZ_COUNT_CTOR(WidgetEvent); mFlags.Clear(); @@ -361,6 +364,7 @@ protected: WidgetEvent() : WidgetEventTime() + , mPath(nullptr) { MOZ_COUNT_CTOR(WidgetEvent); } @@ -419,6 +423,11 @@ public: nsCOMPtr<dom::EventTarget> mCurrentTarget; nsCOMPtr<dom::EventTarget> mOriginalTarget; + /// The possible related target + nsCOMPtr<dom::EventTarget> mRelatedTarget; + + nsTArray<EventTargetChainItem>* mPath; + dom::EventTarget* GetDOMEventTarget() const; dom::EventTarget* GetCurrentDOMEventTarget() const; dom::EventTarget* GetOriginalDOMEventTarget() const; @@ -436,6 +445,7 @@ public: mTarget = aCopyTargets ? aEvent.mTarget : nullptr; mCurrentTarget = aCopyTargets ? aEvent.mCurrentTarget : nullptr; mOriginalTarget = aCopyTargets ? aEvent.mOriginalTarget : nullptr; + mRelatedTarget = aCopyTargets ? aEvent.mRelatedTarget : nullptr; } /** diff --git a/widget/ContentEvents.h b/widget/ContentEvents.h index be64b7beb..09d4d9928 100644 --- a/widget/ContentEvents.h +++ b/widget/ContentEvents.h @@ -212,9 +212,6 @@ public: return result; } - /// The possible related target - nsCOMPtr<dom::EventTarget> mRelatedTarget; - bool mFromRaise; bool mIsRefocus; @@ -222,7 +219,6 @@ public: { AssignUIEventData(aEvent, aCopyTargets); - mRelatedTarget = aCopyTargets ? aEvent.mRelatedTarget : nullptr; mFromRaise = aEvent.mFromRaise; mIsRefocus = aEvent.mIsRefocus; } diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h index 442ac41e8..4b8ff44ce 100644 --- a/widget/MouseEvents.h +++ b/widget/MouseEvents.h @@ -110,9 +110,6 @@ public: MOZ_CRASH("WidgetMouseEventBase must not be most-subclass"); } - /// The possible related target - nsCOMPtr<nsISupports> relatedTarget; - enum buttonType { eLeftButton = 0, @@ -162,7 +159,6 @@ public: { AssignInputEventData(aEvent, aCopyTargets); - relatedTarget = aCopyTargets ? aEvent.relatedTarget : nullptr; button = aEvent.button; buttons = aEvent.buttons; pressure = aEvent.pressure; |