зеркало из https://github.com/mozilla/gecko-dev.git
Backout bug 1259669 due to commited with wrong user name
--HG-- extra : rebase_source : eec830244783ded2e16bbe1e123849fbab0b3c8e
This commit is contained in:
Родитель
50166d7047
Коммит
a369570d88
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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.
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче