Bug 895274 part.44 Rename NS_POINTER_ENTER to ePointerEnter r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 01 Sep 2015 00:20:05 +0900
changeset 260186 64973fea75722564451f73a524fc335d0f27d76e
parent 260185 81616c5e77d7893153138a33652694099827bc50
child 260187 628fdef4a033fed83cd1bac4b1f1b6ea5b4017e1
push id29304
push usercbook@mozilla.com
push dateTue, 01 Sep 2015 12:32:25 +0000
treeherdermozilla-central@dd509db16a13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 895274 part.44 Rename NS_POINTER_ENTER to ePointerEnter r=smaug
dom/events/EventNameList.h
dom/events/EventStateManager.cpp
widget/EventMessageList.h
widget/MouseEvents.h
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -330,17 +330,17 @@ EVENT(pointerover,
       NS_POINTER_OVER,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerout,
       NS_POINTER_OUT,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerenter,
-      NS_POINTER_ENTER,
+      ePointerEnter,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerleave,
       ePointerLeave,
       EventNameType_All,
       ePointerEventClass)
 EVENT(gotpointercapture,
       ePointerGotCapture,
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3867,18 +3867,17 @@ public:
         // mouseenter/leave is fired only on elements.
         current = current->GetParent();
       }
     }
   }
 
   ~EnterLeaveDispatcher()
   {
-    if (mEventMessage == eMouseEnter ||
-        mEventMessage == NS_POINTER_ENTER) {
+    if (mEventMessage == eMouseEnter || mEventMessage == ePointerEnter) {
       for (int32_t i = mTargets.Count() - 1; i >= 0; --i) {
         mESM->DispatchMouseOrPointerEvent(mMouseEvent, mEventMessage,
                                           mTargets[i], mRelatedTarget);
       }
     } else {
       for (int32_t i = 0; i < mTargets.Count(); ++i) {
         mESM->DispatchMouseOrPointerEvent(mMouseEvent, mEventMessage,
                                           mTargets[i], mRelatedTarget);
@@ -4005,17 +4004,17 @@ EventStateManager::NotifyMouseOver(Widge
   // DispatchMouseOrPointerEvent() call below, since NotifyMouseOut() resets it, bug 298477.
   nsCOMPtr<nsIContent> lastOverElement = wrapper->mLastOverElement;
 
   bool isPointer = aMouseEvent->mClass == ePointerEventClass;
   
   Maybe<EnterLeaveDispatcher> enterDispatcher;
   if (dispatch) {
     enterDispatcher.emplace(this, aContent, lastOverElement, aMouseEvent,
-                            isPointer ? NS_POINTER_ENTER : eMouseEnter);
+                            isPointer ? ePointerEnter : eMouseEnter);
   }
 
   NotifyMouseOut(aMouseEvent, aContent);
 
   // Store the first mouseOver event we fire and don't refire mouseOver
   // to that element while the first mouseOver is still ongoing.
   wrapper->mFirstOverEventElement = aContent;
 
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -64,17 +64,17 @@ NS_EVENT_MESSAGE(eMouseLongTap,         
 
 // Pointer spec events
 NS_EVENT_MESSAGE(ePointerEventFirst,    4400)
 NS_EVENT_MESSAGE(NS_POINTER_MOVE,         ePointerEventFirst)
 NS_EVENT_MESSAGE(NS_POINTER_UP,           ePointerEventFirst + 1)
 NS_EVENT_MESSAGE(NS_POINTER_DOWN,         ePointerEventFirst + 2)
 NS_EVENT_MESSAGE(NS_POINTER_OVER,         ePointerEventFirst + 22)
 NS_EVENT_MESSAGE(NS_POINTER_OUT,          ePointerEventFirst + 23)
-NS_EVENT_MESSAGE(NS_POINTER_ENTER,        ePointerEventFirst + 24)
+NS_EVENT_MESSAGE(ePointerEnter,         ePointerEventFirst + 24)
 NS_EVENT_MESSAGE(ePointerLeave,         ePointerEventFirst + 25)
 NS_EVENT_MESSAGE(ePointerCancel,        ePointerEventFirst + 26)
 NS_EVENT_MESSAGE(ePointerGotCapture,    ePointerEventFirst + 27)
 NS_EVENT_MESSAGE(ePointerLostCapture,   ePointerEventFirst + 28)
 NS_EVENT_MESSAGE(ePointerEventLast,     ePointerLostCapture)
 
 NS_EVENT_MESSAGE(NS_CONTEXTMENU_MESSAGE_START, 500)
 NS_EVENT_MESSAGE(NS_CONTEXTMENU,        NS_CONTEXTMENU_MESSAGE_START)
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -620,17 +620,17 @@ public:
   {
     mClass = ePointerEventClass;
     UpdateFlags();
   }
 
   void UpdateFlags()
   {
     switch (mMessage) {
-      case NS_POINTER_ENTER:
+      case ePointerEnter:
       case ePointerLeave:
         mFlags.mBubbles = false;
         mFlags.mCancelable = false;
         break;
       case ePointerCancel:
       case ePointerGotCapture:
       case ePointerLostCapture:
         mFlags.mCancelable = false;