Bug 1259661 part.7 Get rid of WidgetMouseEvent::acceptActivation because of unused r?smaug draft
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 10 May 2016 21:01:15 +0900
changeset 366159 4e9b20f3cf673492366ddd9fe040973ecf555b49
parent 366158 a190a79bc0100ad9818826a33cfdd6d79cea6736
child 366160 bf0f97d4f66722ca3851687942c012b5a2cf7a2c
push id17909
push usermasayuki@d-toybox.com
push dateThu, 12 May 2016 03:02:36 +0000
reviewerssmaug
bugs1259661
milestone49.0a1
Bug 1259661 part.7 Get rid of WidgetMouseEvent::acceptActivation because of unused r?smaug MozReview-Commit-ID: ItkudUhGGN4
widget/MouseEvents.h
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -202,29 +202,27 @@ public:
     eTopLevel
   };
 
 protected:
   WidgetMouseEvent()
     : mReason(eReal)
     , mContextMenuTrigger(eNormal)
     , mExitFrom(eChild)
-    , acceptActivation(false)
     , ignoreRootScrollFrame(false)
     , clickCount(0)
   {
   }
 
   WidgetMouseEvent(bool aIsTrusted, EventMessage aMessage, nsIWidget* aWidget,
                    EventClassID aEventClassID, Reason aReason)
     : WidgetMouseEventBase(aIsTrusted, aMessage, aWidget, aEventClassID)
     , mReason(aReason)
     , mContextMenuTrigger(eNormal)
     , mExitFrom(eChild)
-    , acceptActivation(false)
     , ignoreRootScrollFrame(false)
     , clickCount(0)
   {
   }
 
 public:
   virtual WidgetMouseEvent* AsMouseEvent() override { return this; }
 
@@ -232,17 +230,16 @@ public:
                    EventMessage aMessage,
                    nsIWidget* aWidget,
                    Reason aReason,
                    ContextMenuTrigger aContextMenuTrigger = eNormal)
     : WidgetMouseEventBase(aIsTrusted, aMessage, aWidget, eMouseEventClass)
     , mReason(aReason)
     , mContextMenuTrigger(aContextMenuTrigger)
     , mExitFrom(eChild)
-    , acceptActivation(false)
     , ignoreRootScrollFrame(false)
     , clickCount(0)
   {
     if (aMessage == eContextMenu) {
       button = (mContextMenuTrigger == eNormal) ? eRightButton : eLeftButton;
     }
   }
 
@@ -271,31 +268,27 @@ public:
   }
 
   Reason mReason;
 
   ContextMenuTrigger mContextMenuTrigger;
 
   ExitFrom mExitFrom;
 
-  // Special return code for MOUSE_ACTIVATE to signal.
-  // If the target accepts activation (1), or denies it (0).
-  bool acceptActivation;
   // Whether the event should ignore scroll frame bounds during dispatch.
   bool ignoreRootScrollFrame;
 
   /// The number of mouse clicks.
   uint32_t clickCount;
 
   void AssignMouseEventData(const WidgetMouseEvent& aEvent, bool aCopyTargets)
   {
     AssignMouseEventBaseData(aEvent, aCopyTargets);
     AssignPointerHelperData(aEvent);
 
-    acceptActivation = aEvent.acceptActivation;
     ignoreRootScrollFrame = aEvent.ignoreRootScrollFrame;
     clickCount = aEvent.clickCount;
   }
 
   /**
    * Returns true if the event is a context menu event caused by key.
    */
   bool IsContextMenuKeyEvent() const