Bug 1046101 part.23 Rename NS_CLIPBOARD_EVENT to eClipboardEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:55 +0900
changeset 220561 b55f3c2894ff3e1fb18bed76900425f02a020826
parent 220560 7d500741f3e97c5d1ba7a12292e223cfcec3a8a0
child 220562 8afadb6c396c7b2ebfaf0d88dfb66c5a4e0d3ca8
push id583
push userbhearsum@mozilla.com
push dateMon, 24 Nov 2014 19:04:58 +0000
treeherdermozilla-release@c107e74250f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1046101
milestone34.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 1046101 part.23 Rename NS_CLIPBOARD_EVENT to eClipboardEventClass r=smaug
dom/events/Event.cpp
dom/events/EventDispatcher.cpp
dom/events/EventNameList.h
widget/BasicEvents.h
widget/ContentEvents.h
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -166,17 +166,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Ev
         tmp->mEvent->AsMouseEventBase()->relatedTarget = nullptr;
         break;
       case eDragEventClass: {
         WidgetDragEvent* dragEvent = tmp->mEvent->AsDragEvent();
         dragEvent->dataTransfer = nullptr;
         dragEvent->relatedTarget = nullptr;
         break;
       }
-      case NS_CLIPBOARD_EVENT:
+      case eClipboardEventClass:
         tmp->mEvent->AsClipboardEvent()->clipboardData = nullptr;
         break;
       case NS_MUTATION_EVENT:
         tmp->mEvent->AsMutationEvent()->mRelatedNode = nullptr;
         break;
       case eFocusEventClass:
         tmp->mEvent->AsFocusEvent()->relatedTarget = nullptr;
         break;
@@ -207,17 +207,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(
       case eDragEventClass: {
         WidgetDragEvent* dragEvent = tmp->mEvent->AsDragEvent();
         NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->dataTransfer");
         cb.NoteXPCOMChild(dragEvent->dataTransfer);
         NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
         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;
       case NS_MUTATION_EVENT:
         NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mRelatedNode");
         cb.NoteXPCOMChild(tmp->mEvent->AsMutationEvent()->mRelatedNode);
         break;
       case eFocusEventClass:
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -718,17 +718,17 @@ EventDispatcher::CreateEvent(EventTarget
       return NS_NewDOMInputEvent(aDOMEvent, aOwner, aPresContext,
                                  aEvent->AsEditorInputEvent());
     case eDragEventClass:
       return NS_NewDOMDragEvent(aDOMEvent, aOwner, aPresContext,
                                 aEvent->AsDragEvent());
     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:
       return NS_NewDOMSVGZoomEvent(aDOMEvent, aOwner, aPresContext,
                                    aEvent->AsSVGZoomEvent());
     case NS_SMIL_TIME_EVENT:
       return NS_NewDOMTimeEvent(aDOMEvent, aOwner, aPresContext,
                                 aEvent->AsSMILTimeEvent());
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -402,25 +402,25 @@ EVENT(waiting,
       NS_EVENT)
 EVENT(wheel,
       NS_WHEEL_WHEEL,
       EventNameType_All,
       eWheelEventClass)
 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,
       EventNameType_HTMLXUL,
       NS_EVENT)
 EVENT(afterscriptexecute,
       NS_AFTER_SCRIPT_EXECUTE,
       EventNameType_HTMLXUL,
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -51,17 +51,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   eSimpleGestureEventClass,          // WidgetSimpleGestureEvent
   eTouchEventClass,                  // WidgetTouchEvent
 
   // ContentEvents.h
   eScrollPortEventClass,             // InternalScrollPortEvent
   eScrollAreaEventClass,             // InternalScrollAreaEvent
   eFormEventClass,                   // InternalFormEvent
   eFocusEventClass,                  // InternalFocusEvent
-  NS_CLIPBOARD_EVENT,                // InternalClipboardEvent
+  eClipboardEventClass,              // InternalClipboardEvent
   NS_TRANSITION_EVENT,               // InternalTransitionEvent
   NS_ANIMATION_EVENT,                // InternalAnimationEvent
   NS_SVGZOOM_EVENT,                  // InternalSVGZoomEvent
   NS_SMIL_TIME_EVENT,                // InternalSMILTimeEvent
 
   // MiscEvents.h
   NS_COMMAND_EVENT,                  // WidgetCommandEvent
   NS_CONTENT_COMMAND_EVENT,          // WidgetContentCommandEvent
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -154,24 +154,24 @@ public:
 class InternalClipboardEvent : public WidgetEvent
 {
 public:
   virtual InternalClipboardEvent* AsClipboardEvent() MOZ_OVERRIDE
   {
     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);
     result->mFlags = mFlags;
     return result;
   }
 
   nsCOMPtr<dom::DataTransfer> clipboardData;