From 9fb6e3527b610cda567ecf0d9173df03e1aaae53 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Wed, 2 Sep 2015 15:08:01 +0900
Subject: [PATCH] Bug 895274 part.76 Rename NS_DRAGDROP_LEAVE to eDragLeave
 r=smaug

---
 dom/events/EventNameList.h       | 2 +-
 dom/events/EventStateManager.cpp | 6 +++---
 widget/EventMessageList.h        | 4 ++--
 widget/MouseEvents.h             | 2 +-
 widget/WidgetEventImpl.cpp       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index f9408ae7a0b3..460a03ea12bd 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -191,7 +191,7 @@ EVENT(dragenter,
       EventNameType_HTMLXUL,
       eDragEventClass)
 EVENT(dragleave,
-      NS_DRAGDROP_LEAVE,
+      eDragLeave,
       EventNameType_HTMLXUL,
       eDragEventClass)
 EVENT(dragover,
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index cb3d4d7b6c92..a9b3ebb27545 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -4325,7 +4325,7 @@ EventStateManager::GenerateDragDropEnterExit(nsPresContext* aPresContext,
 
         if (sLastDragOverFrame) {
           FireDragEnterOrExit(sLastDragOverFrame->PresContext(),
-                              aDragEvent, NS_DRAGDROP_LEAVE,
+                              aDragEvent, eDragLeave,
                               targetContent, lastContent, sLastDragOverFrame);
         }
 
@@ -4347,7 +4347,7 @@ EventStateManager::GenerateDragDropEnterExit(nsPresContext* aPresContext,
                             aDragEvent, NS_DRAGDROP_EXIT,
                             nullptr, lastContent, sLastDragOverFrame);
         FireDragEnterOrExit(lastDragOverFramePresContext,
-                            aDragEvent, NS_DRAGDROP_LEAVE,
+                            aDragEvent, eDragLeave,
                             nullptr, lastContent, sLastDragOverFrame);
 
         sLastDragOverFrame = nullptr;
@@ -4402,7 +4402,7 @@ EventStateManager::FireDragEnterOrExit(nsPresContext* aPresContext,
 
     // collect any changes to moz cursor settings stored in the event's
     // data transfer.
-    if (aMessage == NS_DRAGDROP_LEAVE || aMessage == NS_DRAGDROP_EXIT ||
+    if (aMessage == eDragLeave || aMessage == NS_DRAGDROP_EXIT ||
         aMessage == NS_DRAGDROP_ENTER) {
       UpdateDragDataTransfer(&event);
     }
diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
index 11602e09904b..ae154b92a5fc 100644
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -111,8 +111,8 @@ NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG,      eDragDropEventFirst + 5)
 NS_EVENT_MESSAGE(NS_DRAGDROP_END,       eDragDropEventFirst + 6)
 NS_EVENT_MESSAGE(NS_DRAGDROP_START,     eDragDropEventFirst + 7)
 NS_EVENT_MESSAGE(NS_DRAGDROP_DROP,      eDragDropEventFirst + 8)
-NS_EVENT_MESSAGE(NS_DRAGDROP_LEAVE,     eDragDropEventFirst + 9)
-NS_EVENT_MESSAGE(eDragDropEventLast,    NS_DRAGDROP_LEAVE)
+NS_EVENT_MESSAGE(eDragLeave,            eDragDropEventFirst + 9)
+NS_EVENT_MESSAGE(eDragDropEventLast,    eDragLeave)
 
 // Events for popups
 NS_EVENT_MESSAGE(NS_XUL_EVENT_START,    1500)
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
index f9c5e6f8a0fd..dd9cdea54b1e 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -323,7 +323,7 @@ public:
   {
     mFlags.mCancelable =
       (aMessage != NS_DRAGDROP_EXIT &&
-       aMessage != NS_DRAGDROP_LEAVE &&
+       aMessage != eDragLeave &&
        aMessage != NS_DRAGDROP_END);
   }
 
diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp
index ed9a958b9f42..56aba754c8b2 100644
--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -108,7 +108,7 @@ WidgetEvent::HasDragEventMessage() const
     case NS_DRAGDROP_END:
     case NS_DRAGDROP_START:
     case NS_DRAGDROP_DROP:
-    case NS_DRAGDROP_LEAVE:
+    case eDragLeave:
       return true;
     default:
       return false;