Changeset 166793 in webkit

Timestamp:

Apr 4, 2014, 11:07:44 AM (11 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r166615): Pressing return doesn’t submit search term at bing.com
​https://bugs.webkit.org/show_bug.cgi?id=131212
<rdar://problem/16521788>

Reviewed by Dan Bernstein.

Source/WebCore:

Test: fast/forms/submit-while-you-submit.html

Turns out that m_shouldSubmit can actually be modified in a code path where we can't
directly return the result. I'm not sure if the current behavior is entirely correct
(we have open bugs about submitting forms multiple times), but let's restore it to
pre-r166615 state.

• html/HTMLFormElement.cpp:

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

• html/HTMLFormElement.h:

LayoutTests:

• fast/forms/submit-while-you-submit-expected.txt: Added.
• fast/forms/submit-while-you-submit.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/submit-while-you-submit-expected.txt (added)
• LayoutTests/fast/forms/submit-while-you-submit.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLFormElement.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLFormElement.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-04  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r166615): Pressing return doesn’t submit search term at bing.com
+        https://bugs.webkit.org/show_bug.cgi?id=131212
+        <rdar://problem/16521788>
+
+        Reviewed by Dan Bernstein.
+
+        * fast/forms/submit-while-you-submit-expected.txt: Added.
+        * fast/forms/submit-while-you-submit.html: Added.
+
 2014-04-04  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-04  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r166615): Pressing return doesn’t submit search term at bing.com
+        https://bugs.webkit.org/show_bug.cgi?id=131212
+        <rdar://problem/16521788>
+
+        Reviewed by Dan Bernstein.
+
+        Test: fast/forms/submit-while-you-submit.html
+
+        Turns out that m_shouldSubmit can actually be modified in a code path where we can't
+        directly return the result. I'm not sure if the current behavior is entirely correct
+        (we have open bugs about submitting forms multiple times), but let's restore it to
+        pre-r166615 state.
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::HTMLFormElement):
+        (WebCore::HTMLFormElement::prepareForSubmission):
+        (WebCore::HTMLFormElement::submit):
+        * html/HTMLFormElement.h:
+
 2014-04-04  Martin Hock  <mhock@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)
@@ -267 +268 @@
 
     m_isSubmittingOrPreparingForSubmission = true;
-    bool shouldSubmit = false;
+    m_shouldSubmit = false;
 
     // Interactive validation must be done before dispatching the submit event.
@@ -280 +281 @@
     frame->loader().client().dispatchWillSendSubmitEvent(formState.release());
 
+    // Event handling can result in m_shouldSubmit becoming true, regardless of dispatchEvent() return value.
     if (dispatchEvent(Event::create(eventNames().submitEvent, true, true)))
-        shouldSubmit = true;
+        m_shouldSubmit = true;
 
     m_isSubmittingOrPreparingForSubmission = false;
 
-    if (shouldSubmit)
+    if (m_shouldSubmit)
         submit(event, true, true, NotSubmittedByJavaScript);
 }
@@ -323 +325 @@
         return;
 
-    if (m_isSubmittingOrPreparingForSubmission)
-        return;
+    if (m_isSubmittingOrPreparingForSubmission) {
+        m_shouldSubmit = true;
+        return;
+    }
 
     m_isSubmittingOrPreparingForSubmission = true;
@@ -354 +358 @@
         firstSuccessfulSubmitButton->setActivatedSubmit(false);
 
+    m_shouldSubmit = false;
     m_isSubmittingOrPreparingForSubmission = false;
 }

trunk/Source/WebCore/html/HTMLFormElement.h

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