corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests 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 76c0053ddf
commit 0d36973798
8 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();
}