Changeset 166615 in webkit

Timestamp:

Apr 1, 2014, 2:57:15 PM (11 years ago)

Author:

ap@apple.com

Message:

Eliminate HTMLFormElement::m_shouldSubmit
​https://bugs.webkit.org/show_bug.cgi?id=131055

Reviewed by Tim Horton.

m_shouldSubmit was used for two purposes:

• as a return value in a function whose return value is ignored by all callers;
• to make a decision that's local to a function.

There is no need for it to be an instance variable.

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::HTMLFormElement):
(WebCore::HTMLFormElement::prepareForSubmission):
(WebCore::HTMLFormElement::submit):

• html/HTMLFormElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (5 diffs)
• html/HTMLFormElement.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-04-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Eliminate HTMLFormElement::m_shouldSubmit
+        https://bugs.webkit.org/show_bug.cgi?id=131055
+
+        Reviewed by Tim Horton.
+
+        m_shouldSubmit was used for two purposes:
+        - as a return value in a function whose return value is ignored by all callers;
+        - to make a decision that's local to a function.
+
+        There is no need for it to be an instance variable.
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::HTMLFormElement):
+        (WebCore::HTMLFormElement::prepareForSubmission):
+        (WebCore::HTMLFormElement::submit):
+        * html/HTMLFormElement.h:
+
 2014-04-01  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/html/HTMLFormElement.cpp ¶

@@ -58 +58 @@
     , m_wasUserSubmitted(false)
     , m_isSubmittingOrPreparingForSubmission(false)
-    , m_shouldSubmit(false)
     , m_isInResetFunction(false)
     , m_wasDemoted(false)
@@ -261 +260 @@
 }
 
-bool HTMLFormElement::prepareForSubmission(Event* event)
+void HTMLFormElement::prepareForSubmission(Event* event)
 {
     Frame* frame = document().frame();
     if (m_isSubmittingOrPreparingForSubmission || !frame)
-        return m_isSubmittingOrPreparingForSubmission;
+        return;
 
     m_isSubmittingOrPreparingForSubmission = true;
-    m_shouldSubmit = false;
+    bool shouldSubmit = false;
 
     // Interactive validation must be done before dispatching the submit event.
     if (!validateInteractively(event)) {
         m_isSubmittingOrPreparingForSubmission = false;
-        return false;
+        return;
     }
 
@@ -282 +281 @@
 
     if (dispatchEvent(Event::create(eventNames().submitEvent, true, true)))
-        m_shouldSubmit = true;
+        shouldSubmit = true;
 
     m_isSubmittingOrPreparingForSubmission = false;
 
-    if (m_shouldSubmit)
+    if (shouldSubmit)
         submit(event, true, true, NotSubmittedByJavaScript);
-
-    return m_shouldSubmit;
 }
 
@@ -326 +323 @@
         return;
 
-    if (m_isSubmittingOrPreparingForSubmission) {
-        m_shouldSubmit = true;
-        return;
-    }
+    if (m_isSubmittingOrPreparingForSubmission)
+        return;
 
     m_isSubmittingOrPreparingForSubmission = true;
@@ -359 +354 @@
         firstSuccessfulSubmitButton->setActivatedSubmit(false);
 
-    m_shouldSubmit = false;
     m_isSubmittingOrPreparingForSubmission = false;
 }

trunk/Source/WebCore/html/HTMLFormElement.h ¶

@@ -82 +82 @@
     void removeImgElement(HTMLImageElement*);
 
-    bool prepareForSubmission(Event*);
+    void prepareForSubmission(Event*); // FIXME: This function doesn't only prepare, it sometimes calls sumbit() itself.
     void submit();
     void submitFromJavaScript();
@@ -173 +173 @@
     bool m_wasUserSubmitted;
     bool m_isSubmittingOrPreparingForSubmission;
-    bool m_shouldSubmit;
 
     bool m_isInResetFunction;