Split HTMLFormElement::m_isSubmittingOrInUserJSSubmitEvent.

third_party/WebKit/Source/core/html/HTMLFormElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 37 matching lines @@
 #include "core/html/RadioNodeList.h"
 #include "core/html/forms/FormController.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/FormSubmission.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/loader/NavigationScheduler.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
+#include "wtf/AutoReset.h"
 #include "wtf/text/AtomicString.h"
 #include <limits>
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLFormElement::HTMLFormElement(Document& document)
     : HTMLElement(formTag, document)
     , m_associatedElementsAreDirty(false)
     , m_imageElementsAreDirty(false)
     , m_hasElementsAssociatedByParser(false)
     , m_hasElementsAssociatedByFormAttribute(false)
     , m_didFinishParsingChildren(false)
-    , m_isSubmittingOrInUserJSSubmitEvent(false)
     , m_shouldSubmit(false)
     , m_isInResetFunction(false)
     , m_wasDemoted(false)
 {
 }
 
 HTMLFormElement* HTMLFormElement::create(Document& document)
 {
     UseCounter::count(document, UseCounter::FormElement);
     return new HTMLFormElement(document);
@@ skipping 203 matching lines @@
             message.replace("%name", unhandled->name());
             document().addConsoleMessage(ConsoleMessage::create(RenderingMessageSource, ErrorMessageLevel, message));
         }
     }
     return false;
 }
 
 void HTMLFormElement::prepareForSubmission(Event* event)
 {
     LocalFrame* frame = document().frame();
-    if (!frame || m_isSubmittingOrInUserJSSubmitEvent)
+    if (!frame || m_isSubmitting || m_inUserJSSubmitEvent)
         return;
 
     if (document().isSandboxed(SandboxForms)) {
         document().addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Blocked form submission to '" + m_attributes.action() + "' because the form's frame is sandboxed and the 'allow-forms' permission is not set."));
         return;
     }
 
     bool skipValidation = !document().page() || noValidate();
     ASSERT(event);
     HTMLFormControlElement* submitElement = submitElementFromEvent(event);
     if (submitElement && submitElement->formNoValidate())
         skipValidation = true;
 
     UseCounter::count(document(), UseCounter::FormSubmissionStarted);
     // Interactive validation must be done before dispatching the submit event.
     if (!skipValidation && !validateInteractively())
         return;
 
-    m_isSubmittingOrInUserJSSubmitEvent = true;
-    m_shouldSubmit = false;
-
-    frame->loader().client()->dispatchWillSendSubmitEvent(this);
-
-    if (dispatchEvent(Event::createCancelableBubble(EventTypeNames::submit)) == DispatchEventResult::NotCanceled)
-        m_shouldSubmit = true;
-
-    m_isSubmittingOrInUserJSSubmitEvent = false;
+    {
+        AutoReset<bool> submitEventHandlerScope(&m_inUserJSSubmitEvent, true);
+        m_shouldSubmit = false;
+        frame->loader().client()->dispatchWillSendSubmitEvent(this);
+        if (dispatchEvent(Event::createCancelableBubble(EventTypeNames::submit)) == DispatchEventResult::NotCanceled)
+            m_shouldSubmit = true;
+    }
 
     if (m_shouldSubmit)
         submit(event, true);
 }
 
 void HTMLFormElement::submitFromJavaScript()
 {
     submit(0, false);
 }
 
@@ skipping 10 matching lines @@
 void HTMLFormElement::submit(Event* event, bool activateSubmitButton)
 {
     FrameView* view = document().view();
     LocalFrame* frame = document().frame();
     if (!view || !frame || !frame->page())
         return;
     // See crbug.com/586749.
     if (!isConnected())
         UseCounter::count(document(), UseCounter::FormSubmissionNotInDocumentTree);
 
-    if (m_isSubmittingOrInUserJSSubmitEvent) {
+    if (m_isSubmitting || m_inUserJSSubmitEvent) {
         m_shouldSubmit = true;
         return;
     }
 
-    m_isSubmittingOrInUserJSSubmitEvent = true;
+    // Delay dispatching 'close' to dialog until done submitting.
+    EventQueueScope scopeForDialogClose;
+    AutoReset<bool> submitScope(&m_isSubmitting, true);
 
     HTMLFormControlElement* firstSuccessfulSubmitButton = nullptr;
     bool needButtonActivation = activateSubmitButton; // do we need to activate a submit button?
 
     const FormAssociatedElement::List& elements = associatedElements();
     for (unsigned i = 0; i < elements.size(); ++i) {
         FormAssociatedElement* associatedElement = elements[i];
         if (!associatedElement->isFormControlElement())
             continue;
         if (needButtonActivation) {
             HTMLFormControlElement* control = toHTMLFormControlElement(associatedElement);
             if (control->isActivatedSubmit())
                 needButtonActivation = false;
             else if (firstSuccessfulSubmitButton == 0 && control->isSuccessfulSubmitButton())
                 firstSuccessfulSubmitButton = control;
         }
     }
 
     if (needButtonActivation && firstSuccessfulSubmitButton)
         firstSuccessfulSubmitButton->setActivatedSubmit(true);
 
     FormSubmission* formSubmission = FormSubmission::create(this, m_attributes, event);
-    EventQueueScope scopeForDialogClose; // Delay dispatching 'close' to dialog until done submitting.
-    if (formSubmission->method() == FormSubmission::DialogMethod)
+    if (formSubmission->method() == FormSubmission::DialogMethod) {
         submitDialog(formSubmission);
-    else
+    } else {
+        // This runs JavaScript code if action attribute value is javascript:
+        // protocol.
         scheduleFormSubmission(formSubmission);
+    }
 
     if (needButtonActivation && firstSuccessfulSubmitButton)
         firstSuccessfulSubmitButton->setActivatedSubmit(false);
 
     m_shouldSubmit = false;
-    m_isSubmittingOrInUserJSSubmitEvent = false;
 }
 
 void HTMLFormElement::scheduleFormSubmission(FormSubmission* submission)
 {
     ASSERT(submission->method() == FormSubmission::PostMethod || submission->method() == FormSubmission::GetMethod);
     ASSERT(submission->data());
     ASSERT(submission->form());
     if (submission->action().isEmpty())
         return;
     if (document().isSandboxed(SandboxForms)) {
@@ skipping 386 matching lines @@
 {
     for (const auto& control : associatedElements()) {
         if (!control->isFormControlElement())
             continue;
         if (toHTMLFormControlElement(control)->canBeSuccessfulSubmitButton())
             toHTMLFormControlElement(control)->pseudoStateChanged(CSSSelector::PseudoDefault);
     }
 }
 
 } // namespace blink