Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout bug 1259669 due to commited with wrong user name

Browse Source 
--HG--
extra : rebase_source : eec830244783ded2e16bbe1e123849fbab0b3c8e
This commit is contained in:
Masayuki Nakano 2016-05-12 13:23:43 +09:00
parent 50166d7047
commit a369570d88
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/events/CommandEvent.cpp
View File

@ -36,7 +36,7 @@ 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 {
@ -53,7 +53,7 @@ CommandEvent::InitCommandEvent(const nsAString& aTypeArg,
{
Event::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
mEvent->AsCommandEvent()->mCommand = NS_Atomize(aCommand);
mEvent->AsCommandEvent()->command = NS_Atomize(aCommand);
return NS_OK;
}

8
widget/MiscEvents.h
View File

@ -110,7 +110,7 @@ public:
nsIAtom* aCommand, nsIWidget* aWidget)
: WidgetGUIEvent(aIsTrusted, eUnidentifiedEvent, aWidget,
eCommandEventClass)
, mCommand(aCommand)
, command(aCommand)
{
mSpecifiedEventType = aEventType;
}
@ -121,13 +121,13 @@ public:
"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,
@ -135,7 +135,7 @@ public:
{
AssignGUIEventData(aEvent, aCopyTargets);
// mCommand must have been initialized with the constructor.
// command must have been initialized with the constructor.
}
};