Bug 1046101 part.30 Rename NS_PLUGIN_COMMAND_EVENT to ePluginEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:57 +0900
changeset 197670 17473a495afbe09ba031b4bbf97d0fbff0e975ec
parent 197669 ed8b6fe7bc44a62a82b955023de77ddd64df09e8
child 197671 878f57134601c9e3b672f350a3af8efb5449d629
push id27249
push userryanvm@gmail.com
push dateMon, 04 Aug 2014 20:14:35 +0000
treeherdermozilla-central@7f81be7db528 [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.30 Rename NS_PLUGIN_COMMAND_EVENT to ePluginEventClass r=smaug
widget/BasicEvents.h
widget/MiscEvents.h
widget/shared/WidgetEventImpl.cpp
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -60,17 +60,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   eTransitionEventClass,             // InternalTransitionEvent
   eAnimationEventClass,              // InternalAnimationEvent
   eSVGZoomEventClass,                // InternalSVGZoomEvent
   eSMILTimeEventClass,               // InternalSMILTimeEvent
 
   // MiscEvents.h
   eCommandEventClass,                // WidgetCommandEvent
   eContentCommandEventClass,         // WidgetContentCommandEvent
-  NS_PLUGIN_EVENT,                   // WidgetPluginEvent
+  ePluginEventClass,                 // WidgetPluginEvent
 
   // InternalMutationEvent.h (dom/events)
   NS_MUTATION_EVENT                  // InternalMutationEvent
 };
 
 } // namespace mozilla
 
 /******************************************************************************
--- a/widget/MiscEvents.h
+++ b/widget/MiscEvents.h
@@ -140,27 +140,27 @@ public:
  * This event delivers only a native event to focused plugin.
  ******************************************************************************/
 
 class WidgetPluginEvent : public WidgetGUIEvent
 {
 public:
   virtual WidgetPluginEvent* AsPluginEvent() MOZ_OVERRIDE { return this; }
 
-  WidgetPluginEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget) :
-    WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_PLUGIN_EVENT),
-    retargetToFocusedDocument(false)
+  WidgetPluginEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, ePluginEventClass)
+    , retargetToFocusedDocument(false)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
     // NOTE: PluginEvent has to be dispatched to nsIFrame::HandleEvent().
     //       So, this event needs to support Duplicate().
-    MOZ_ASSERT(mClass == NS_PLUGIN_EVENT,
+    MOZ_ASSERT(mClass == ePluginEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     WidgetPluginEvent* result = new WidgetPluginEvent(false, message, nullptr);
     result->AssignPluginEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
--- a/widget/shared/WidgetEventImpl.cpp
+++ b/widget/shared/WidgetEventImpl.cpp
@@ -59,17 +59,17 @@ bool
 WidgetEvent::IsContentCommandEvent() const
 {
   return mClass == eContentCommandEventClass;
 }
 
 bool
 WidgetEvent::IsNativeEventDelivererForPlugin() const
 {
-  return mClass == NS_PLUGIN_EVENT;
+  return mClass == ePluginEventClass;
 }
 
 
 /******************************************************************************
  * mozilla::WidgetEvent
  *
  * Event message checking methods.
  ******************************************************************************/