Backout bug 1259669 due to commited with wrong user name
authorMasayuki Nakano <masayuki@d-toybox.com>
Thu, 12 May 2016 13:23:43 +0900
changeset 366333 0d1d2245fa0092fe49d4e6287d4417e3e051a151
parent 366332 72813a2ef76fb66cb9e1dd0ed402257773352f93
child 366334 95d06a6cc1acaff9ac47d9a071844f8f9e9deacd
push id17960
push usergijskruitbosch@gmail.com
push dateThu, 12 May 2016 14:07:44 +0000
bugs1259669
milestone49.0a1
Backout bug 1259669 due to commited with wrong user name
dom/events/CommandEvent.cpp
widget/MiscEvents.h
--- a/dom/events/CommandEvent.cpp
+++ b/dom/events/CommandEvent.cpp
@@ -31,34 +31,34 @@ NS_INTERFACE_MAP_BEGIN(CommandEvent)
 NS_INTERFACE_MAP_END_INHERITING(Event)
 
 NS_IMPL_ADDREF_INHERITED(CommandEvent, Event)
 NS_IMPL_RELEASE_INHERITED(CommandEvent, Event)
 
 NS_IMETHODIMP
 CommandEvent::GetCommand(nsAString& aCommand)
 {
-  nsIAtom* command = mEvent->AsCommandEvent()->mCommand;
+  nsIAtom* command = mEvent->AsCommandEvent()->command;
   if (command) {
     command->ToString(aCommand);
   } else {
     aCommand.Truncate();
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
 CommandEvent::InitCommandEvent(const nsAString& aTypeArg,
                                bool aCanBubbleArg,
                                bool aCancelableArg,
                                const nsAString& aCommand)
 {
   Event::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
 
-  mEvent->AsCommandEvent()->mCommand = NS_Atomize(aCommand);
+  mEvent->AsCommandEvent()->command = NS_Atomize(aCommand);
   return NS_OK;
 }
 
 } // namespace dom
 } // namespace mozilla
 
 using namespace mozilla;
 using namespace mozilla::dom;
--- a/widget/MiscEvents.h
+++ b/widget/MiscEvents.h
@@ -105,42 +105,42 @@ class WidgetCommandEvent : public Widget
 {
 public:
   virtual WidgetCommandEvent* AsCommandEvent() override { return this; }
 
   WidgetCommandEvent(bool aIsTrusted, nsIAtom* aEventType,
                      nsIAtom* aCommand, nsIWidget* aWidget)
     : WidgetGUIEvent(aIsTrusted, eUnidentifiedEvent, aWidget,
                      eCommandEventClass)
-    , mCommand(aCommand)
+    , command(aCommand)
   {
     mSpecifiedEventType = aEventType;
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     MOZ_ASSERT(mClass == eCommandEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     WidgetCommandEvent* result =
-      new WidgetCommandEvent(false, mSpecifiedEventType, mCommand, nullptr);
+      new WidgetCommandEvent(false, mSpecifiedEventType, command, nullptr);
     result->AssignCommandEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
-  nsCOMPtr<nsIAtom> mCommand;
+  nsCOMPtr<nsIAtom> command;
 
   // XXX Not tested by test_assign_event_data.html
   void AssignCommandEventData(const WidgetCommandEvent& aEvent,
                               bool aCopyTargets)
   {
     AssignGUIEventData(aEvent, aCopyTargets);
 
-    // mCommand must have been initialized with the constructor.
+    // command must have been initialized with the constructor.
   }
 };
 
 /******************************************************************************
  * mozilla::WidgetPluginEvent
  *
  * This event delivers only a native event to focused plugin.
  ******************************************************************************/