Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 895274 part.64 Rename NS_FORM_RESET to eFormReset r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-02 15:08:00 +09:00
parent 167dc4aade
commit 5bb3e1799f
8 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/FragmentOrElement.cpp
View File

@ -811,7 +811,7 @@ nsIContent::PreHandleEvent(EventChainPreVisitor& aVisitor)
case NS_FORM_SELECTED:
case NS_FORM_CHANGE:
case eLoad:
case NS_FORM_RESET:
case eFormReset:
case eResize:
case eScroll:
stopEvent = true;

2
dom/events/Event.cpp
View File

@ -858,7 +858,7 @@ Event::GetEventPopupControlState(WidgetEvent* aEvent, nsIDOMEvent* aDOMEvent)
abuse = openControlled;
}
break;
case NS_FORM_RESET :
case eFormReset:
if (PopupAllowedForEvent("reset")) {
abuse = openControlled;
}

2
dom/events/EventNameList.h
View File

@ -374,7 +374,7 @@ EVENT(ratechange,
EventNameType_HTML,
eBasicEventClass)
EVENT(reset,
NS_FORM_RESET,
eFormReset,
EventNameType_HTMLXUL,
eBasicEventClass)
EVENT(seeked,

2
dom/html/HTMLButtonElement.cpp
View File

@ -370,7 +370,7 @@ HTMLButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
if (mForm && (mType == NS_FORM_BUTTON_SUBMIT ||
mType == NS_FORM_BUTTON_RESET)) {
InternalFormEvent event(true,
(mType == NS_FORM_BUTTON_RESET) ? NS_FORM_RESET : eFormSubmit);
(mType == NS_FORM_BUTTON_RESET) ? eFormReset : eFormSubmit);
event.originator = this;
nsEventStatus status = nsEventStatus_eIgnore;

14
dom/html/HTMLFormElement.cpp
View File

@ -270,7 +270,7 @@ HTMLFormElement::Submit()
NS_IMETHODIMP
HTMLFormElement::Reset()
{
InternalFormEvent event(true, NS_FORM_RESET);
InternalFormEvent event(true, eFormReset);
EventDispatcher::Dispatch(static_cast<nsIContent*>(this), nullptr, &event);
return NS_OK;
}
@ -504,8 +504,7 @@ HTMLFormElement::PreHandleEvent(EventChainPreVisitor& aVisitor)
// that means that if there are scripted submissions, the
// latest one will be deferred until after the exit point of the handler.
mDeferSubmission = true;
}
else if (msg == NS_FORM_RESET) {
} else if (msg == eFormReset) {
if (mGeneratingReset) {
aVisitor.mCanHandle = false;
return NS_OK;
@ -523,7 +522,7 @@ HTMLFormElement::WillHandleEvent(EventChainPostVisitor& aVisitor)
// received a submit event we do *not* want to handle the submit event
// for this form too.
if ((aVisitor.mEvent->mMessage == eFormSubmit ||
aVisitor.mEvent->mMessage == NS_FORM_RESET) &&
aVisitor.mEvent->mMessage == eFormReset) &&
aVisitor.mEvent->mFlags.mInBubblingPhase &&
aVisitor.mEvent->originalTarget != static_cast<nsIContent*>(this)) {
aVisitor.mEvent->mFlags.mPropagationStopped = true;
@ -543,7 +542,7 @@ HTMLFormElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
if (aVisitor.mEventStatus == nsEventStatus_eIgnore) {
switch (msg) {
case NS_FORM_RESET:
case eFormReset:
case eFormSubmit: {
if (mPendingSubmission && msg == eFormSubmit) {
// tell the form to forget a possible pending submission.
@ -571,8 +570,7 @@ HTMLFormElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
if (msg == eFormSubmit) {
mGeneratingSubmit = false;
}
else if (msg == NS_FORM_RESET) {
} else if (msg == eFormReset) {
mGeneratingReset = false;
}
}
@ -592,7 +590,7 @@ HTMLFormElement::DoSubmitOrReset(WidgetEvent* aEvent,
// JBK Don't get form frames anymore - bug 34297
// Submit or Reset the form
if (NS_FORM_RESET == aMessage) {
if (eFormReset == aMessage) {
return DoReset();
}

2
dom/html/HTMLInputElement.cpp
View File

@ -4015,7 +4015,7 @@ HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
case NS_FORM_INPUT_IMAGE:
if (mForm) {
InternalFormEvent event(true,
(mType == NS_FORM_INPUT_RESET) ? NS_FORM_RESET : eFormSubmit);
(mType == NS_FORM_INPUT_RESET) ? eFormReset : eFormSubmit);
event.originator = this;
nsEventStatus status = nsEventStatus_eIgnore;

2
widget/EventMessageList.h
View File

@ -91,7 +91,7 @@ NS_EVENT_MESSAGE(eReadyStateChange, eStreamEventFirst + 8)
NS_EVENT_MESSAGE(eFormEventFirst, 1200)
NS_EVENT_MESSAGE(eFormSubmit, eFormEventFirst)
NS_EVENT_MESSAGE(NS_FORM_RESET, eFormEventFirst + 1)
NS_EVENT_MESSAGE(eFormReset, eFormEventFirst + 1)
NS_EVENT_MESSAGE(NS_FORM_CHANGE, eFormEventFirst + 2)
NS_EVENT_MESSAGE(NS_FORM_SELECTED, eFormEventFirst + 3)
NS_EVENT_MESSAGE(NS_FORM_INVALID, eFormEventFirst + 4)

2
widget/nsBaseWidget.cpp
View File

@ -2641,7 +2641,7 @@ case _value: eventName.AssignLiteral(_name) ; break
_ASSIGN_eventName(NS_FOCUS_CONTENT,"NS_FOCUS_CONTENT");
_ASSIGN_eventName(NS_FORM_SELECTED,"NS_FORM_SELECTED");
_ASSIGN_eventName(NS_FORM_CHANGE,"NS_FORM_CHANGE");
_ASSIGN_eventName(NS_FORM_RESET,"NS_FORM_RESET");
_ASSIGN_eventName(eFormReset,"eFormReset");
_ASSIGN_eventName(eFormSubmit,"eFormSubmit");
_ASSIGN_eventName(eImageAbort,"eImageAbort");
_ASSIGN_eventName(eLoadError,"eLoadError");