Bug 895274 part.43 Rename NS_POINTER_LEAVE to ePointerLeave r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 01 Sep 2015 00:20:05 +0900
changeset 260185 81616c5e77d7893153138a33652694099827bc50
parent 260184 c0b1bff50484386fa3bcbb70e79f67f2748c69ee
child 260186 64973fea75722564451f73a524fc335d0f27d76e
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.43 Rename NS_POINTER_LEAVE to ePointerLeave 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
@@ -334,17 +334,17 @@ EVENT(pointerout,
       NS_POINTER_OUT,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerenter,
       NS_POINTER_ENTER,
       EventNameType_All,
       ePointerEventClass)
 EVENT(pointerleave,
-      NS_POINTER_LEAVE,
+      ePointerLeave,
       EventNameType_All,
       ePointerEventClass)
 EVENT(gotpointercapture,
       ePointerGotCapture,
       EventNameType_All,
       ePointerEventClass)
 EVENT(lostpointercapture,
       ePointerLostCapture,
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -617,17 +617,17 @@ EventStateManager::PreHandleEvent(nsPres
       // "exit" or "move" events.  Any necessary "out" or "over" events
       // will be generated by GenerateMouseEnterExit
       mouseEvent->mMessage = eMouseMove;
       mouseEvent->reason = WidgetMouseEvent::eSynthesized;
       // then fall through...
     } else {
       if (sPointerEventEnabled) {
         // We should synthetize corresponding pointer events
-        GeneratePointerEnterExit(NS_POINTER_LEAVE, mouseEvent);
+        GeneratePointerEnterExit(ePointerLeave, mouseEvent);
       }
       GenerateMouseEnterExit(mouseEvent);
       //This is a window level mouse exit event and should stop here
       aEvent->mMessage = eVoidEvent;
       break;
     }
   case eMouseMove:
   case NS_POINTER_DOWN:
@@ -3939,24 +3939,24 @@ EventStateManager::NotifyMouseOut(Widget
   // switching the hover state to null here.
   bool isPointer = aMouseEvent->mClass == ePointerEventClass;
   if (!aMovingInto && !isPointer) {
     // Unset :hover
     SetContentState(nullptr, NS_EVENT_STATE_HOVER);
   }
 
   // In case we go out from capturing element (retargetedByPointerCapture is true)
-  // we should dispatch NS_POINTER_LEAVE event and only for capturing element.
+  // we should dispatch ePointerLeave event and only for capturing element.
   nsRefPtr<nsIContent> movingInto = aMouseEvent->retargetedByPointerCapture
                                     ? wrapper->mLastOverElement->GetParent()
                                     : aMovingInto;
 
   EnterLeaveDispatcher leaveDispatcher(this, wrapper->mLastOverElement,
                                        movingInto, aMouseEvent,
-                                       isPointer ? NS_POINTER_LEAVE : eMouseLeave);
+                                       isPointer ? ePointerLeave : eMouseLeave);
 
   // Fire mouseout
   DispatchMouseOrPointerEvent(aMouseEvent, isPointer ? NS_POINTER_OUT : eMouseOut,
                               wrapper->mLastOverElement, aMovingInto);
 
   wrapper->mLastOverFrame = nullptr;
   wrapper->mLastOverElement = nullptr;
 
@@ -4179,17 +4179,17 @@ EventStateManager::GenerateMouseEnterExi
         OverOutElementsWrapper* helper = GetWrapperByEventID(aMouseEvent);
         if (helper) {
           helper->mLastOverElement = targetElement;
         }
         NotifyMouseOut(aMouseEvent, nullptr);
       }
     }
     break;
-  case NS_POINTER_LEAVE:
+  case ePointerLeave:
   case ePointerCancel:
   case eMouseExitFromWidget:
     {
       // This is actually the window mouse exit or pointer leave event. We're not moving
       // into any new element.
 
       OverOutElementsWrapper* helper = GetWrapperByEventID(aMouseEvent);
       if (helper->mLastOverFrame &&
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -65,17 +65,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(NS_POINTER_LEAVE,        ePointerEventFirst + 25)
+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
@@ -621,17 +621,17 @@ public:
     mClass = ePointerEventClass;
     UpdateFlags();
   }
 
   void UpdateFlags()
   {
     switch (mMessage) {
       case NS_POINTER_ENTER:
-      case NS_POINTER_LEAVE:
+      case ePointerLeave:
         mFlags.mBubbles = false;
         mFlags.mCancelable = false;
         break;
       case ePointerCancel:
       case ePointerGotCapture:
       case ePointerLostCapture:
         mFlags.mCancelable = false;
         break;