From 7b05fecc9bc132834e64a54139af1c8edc94d72f Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 4 Aug 2014 14:28:55 +0900
Subject: [PATCH] Bug 1046101 part.23 Rename NS_CLIPBOARD_EVENT to
 eClipboardEventClass r=smaug

---
 dom/events/Event.cpp           | 4 ++--
 dom/events/EventDispatcher.cpp | 2 +-
 dom/events/EventNameList.h     | 6 +++---
 widget/BasicEvents.h           | 2 +-
 widget/ContentEvents.h         | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp
index f8a7a25671b4..f212c608beda 100644
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -171,7 +171,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Event)
         dragEvent->relatedTarget = nullptr;
         break;
       }
-      case NS_CLIPBOARD_EVENT:
+      case eClipboardEventClass:
         tmp->mEvent->AsClipboardEvent()->clipboardData = nullptr;
         break;
       case NS_MUTATION_EVENT:
@@ -212,7 +212,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
         cb.NoteXPCOMChild(dragEvent->relatedTarget);
         break;
       }
-      case NS_CLIPBOARD_EVENT:
+      case eClipboardEventClass:
         NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->clipboardData");
         cb.NoteXPCOMChild(tmp->mEvent->AsClipboardEvent()->clipboardData);
         break;
diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index 76505694f40c..3b032027ec08 100644
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -723,7 +723,7 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
     case eTextEventClass:
       return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
                               aEvent->AsTextEvent());
-    case NS_CLIPBOARD_EVENT:
+    case eClipboardEventClass:
       return NS_NewDOMClipboardEvent(aDOMEvent, aOwner, aPresContext,
                                      aEvent->AsClipboardEvent());
     case NS_SVGZOOM_EVENT:
diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
index 900ab53da5f5..1438b0aae613 100644
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -407,15 +407,15 @@ EVENT(wheel,
 EVENT(copy,
       NS_COPY,
       EventNameType_HTMLXUL,
-      NS_CLIPBOARD_EVENT)
+      eClipboardEventClass)
 EVENT(cut,
       NS_CUT,
       EventNameType_HTMLXUL,
-      NS_CLIPBOARD_EVENT)
+      eClipboardEventClass)
 EVENT(paste,
       NS_PASTE,
       EventNameType_HTMLXUL,
-      NS_CLIPBOARD_EVENT)
+      eClipboardEventClass)
 // Gecko-specific extensions that apply to elements
 EVENT(beforescriptexecute,
       NS_BEFORE_SCRIPT_EXECUTE,
diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
index 3f8b17b2e9e8..91411e6162fd 100644
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -56,7 +56,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
   eScrollAreaEventClass,             // InternalScrollAreaEvent
   eFormEventClass,                   // InternalFormEvent
   eFocusEventClass,                  // InternalFocusEvent
-  NS_CLIPBOARD_EVENT,                // InternalClipboardEvent
+  eClipboardEventClass,              // InternalClipboardEvent
   NS_TRANSITION_EVENT,               // InternalTransitionEvent
   NS_ANIMATION_EVENT,                // InternalAnimationEvent
   NS_SVGZOOM_EVENT,                  // InternalSVGZoomEvent
diff --git a/widget/ContentEvents.h b/widget/ContentEvents.h
index 09f838830a04..4ea244beef18 100644
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -159,14 +159,14 @@ class InternalClipboardEvent : public WidgetEvent
     return this;
   }
 
-  InternalClipboardEvent(bool aIsTrusted, uint32_t aMessage) :
-    WidgetEvent(aIsTrusted, aMessage, NS_CLIPBOARD_EVENT)
+  InternalClipboardEvent(bool aIsTrusted, uint32_t aMessage)
+    : WidgetEvent(aIsTrusted, aMessage, eClipboardEventClass)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_CLIPBOARD_EVENT,
+    MOZ_ASSERT(mClass == eClipboardEventClass,
                "Duplicate() must be overridden by sub class");
     InternalClipboardEvent* result = new InternalClipboardEvent(false, message);
     result->AssignClipboardEventData(*this, true);