Merge pull request 'Allow <button> children to receive pointer events' (#2043) from martok/UXP-contrib:2030-button into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2043

2 files changed, 6 insertions, 0 deletions

diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
index 0ce0f587dd..9631dfd257 100644
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -80,6 +80,8 @@ public:
   // the first <label> element is clicked, that one may set this true.
   // Then, the second <label> element won't handle the event.
   bool    mMultipleActionsPrevented : 1;
+  // Similar to above but expected to be used during PreHandleEvent phase.
+  bool    mMultiplePreActionsPrevented : 1;
   // If mIsBeingDispatched is true, the DOM event created from the event is
   // dispatching into the DOM tree and not completed.
   bool    mIsBeingDispatched : 1;
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
index 4b8ff44ce6..c9a608bb4a 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -275,6 +275,10 @@ public:
     return result;
   }
 
+  // If during mouseup handling we detect that click event might need to be
+  // dispatched, this is setup to be the target of the click event.
+  nsCOMPtr<dom::EventTarget> mClickTarget;
+
   // mReason indicates the reason why the event is fired:
   // - Representing mouse operation.
   // - Synthesized for emulating mousemove event when the content under the