author | Takahiro Aoyagi <github@takahirox> |
Mon, 25 Apr 2016 16:04:09 +0900 | |
changeset 294749 | 7aeac9da4265727deef801de5416f1f50c9a74dd |
parent 294748 | a84bf33d3e9a2041896dd5400d58439ecda28d4e |
child 294750 | 14a02164b038bddd89b96c33b6932f069b8371ff |
push id | 30211 |
push user | kwierso@gmail.com |
push date | Tue, 26 Apr 2016 00:12:12 +0000 |
treeherder | mozilla-central@cfc7ebe59293 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | masayuki |
bugs | 1259669 |
milestone | 48.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
|
dom/events/CommandEvent.cpp | file | annotate | diff | comparison | revisions | |
widget/MiscEvents.h | file | annotate | diff | comparison | revisions |
--- 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()->command; + nsIAtom* command = mEvent->AsCommandEvent()->mCommand; 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()->command = NS_Atomize(aCommand); + mEvent->AsCommandEvent()->mCommand = 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) - , command(aCommand) + , mCommand(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, command, nullptr); + new WidgetCommandEvent(false, mSpecifiedEventType, mCommand, nullptr); result->AssignCommandEventData(*this, true); result->mFlags = mFlags; return result; } - nsCOMPtr<nsIAtom> command; + nsCOMPtr<nsIAtom> mCommand; // XXX Not tested by test_assign_event_data.html void AssignCommandEventData(const WidgetCommandEvent& aEvent, bool aCopyTargets) { AssignGUIEventData(aEvent, aCopyTargets); - // command must have been initialized with the constructor. + // mCommand must have been initialized with the constructor. } }; /****************************************************************************** * mozilla::WidgetPluginEvent * * This event delivers only a native event to focused plugin. ******************************************************************************/