From aecebf1e47f3120b21bc24d3ed75c785067be68e Mon Sep 17 00:00:00 2001
From: "cdumez@apple.com"
 <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 18 Dec 2019 02:32:05 +0000
Subject: [PATCH] Unreviewed, revert r253493 because it broke an Apple internal
 site

LayoutTests/imported/w3c:

* web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt:
* web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt:

Source/WebCore:

* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::submit):
* html/HTMLFormElement.h:
* loader/FormSubmission.h:
(WebCore::FormSubmission::cancel): Deleted.
(WebCore::FormSubmission::wasCancelled const): Deleted.
* loader/NavigationScheduler.cpp:

LayoutTests:

* platform/mac/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@253666 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                                |  6 ++++++
 LayoutTests/imported/w3c/ChangeLog                   |  7 +++++++
 .../form-double-submit-3-expected.txt                |  2 +-
 .../form-double-submit-expected.txt                  |  2 +-
 LayoutTests/platform/mac/TestExpectations            |  4 +++-
 Source/WebCore/ChangeLog                             | 12 ++++++++++++
 Source/WebCore/html/HTMLFormElement.cpp              |  6 +-----
 Source/WebCore/html/HTMLFormElement.h                |  1 -
 Source/WebCore/loader/FormSubmission.h               |  9 ++-------
 Source/WebCore/loader/NavigationScheduler.cpp        |  3 ---
 10 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 603980bb21248..5fb28ecf94e03 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-17  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, revert r253493 because it broke an Apple internal site
+
+        * platform/mac/TestExpectations:
+
 2019-12-17  Fujii Hironori  <fujii.hironori@gmail.com>
 
         [cairo] text-align:justify wrongly expands CJK ideograph characters
diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index 9d437f286d512..948f3fc22f154 100644
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-17  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, revert r253493 because it broke an Apple internal site
+
+        * web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt:
+        * web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt:
+
 2019-12-17  Chris Dumez  <cdumez@apple.com>
 
         Re-sync html/semantics/embedded-content/the-canvas-element from upstream
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt
index 2a3ea66c2c597..10c21ee35c21d 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt
@@ -4,5 +4,5 @@ This frame should navigate (to 404)
 
 submit
 
-PASS <button> should have the same double-submit protection as <input type=submit> 
+FAIL <button> should have the same double-submit protection as <input type=submit> assert_unreached: Frame1 should not get navigated by this test. Reached unreachable code
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt
index 9a2bcb0efa975..02317acde4e71 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt
@@ -4,5 +4,5 @@ This frame should navigate (to 404)
 
 
 
-PASS default submit action should supersede onclick submit() 
+FAIL default submit action should supersede onclick submit() assert_unreached: Frame1 should not get navigated by this test. Reached unreachable code
 
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 844ad5e1f951f..0ad72489593e4 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1965,4 +1965,6 @@ webkit.org/b/204247 [ Catalina ] webaudio/silence-after-playback.html [ Failure
 
 webkit.org/b/205216 imported/w3c/web-platform-tests/content-security-policy/reporting/report-same-origin-with-cookies.html [ Pass Failure ]
 
-webkit.org/b/205361 [ Release ] crypto/workers/subtle/aes-indexeddb.html [ Pass Timeout ]
\ No newline at end of file
+webkit.org/b/205361 [ Release ] crypto/workers/subtle/aes-indexeddb.html [ Pass Timeout ]
+
+webkit.org/b/205164 imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3.html [ Pass Failure ]
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c6fe0ddcb4534..a26ed9c75d1d3 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2019-12-17  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, revert r253493 because it broke an Apple internal site
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::submit):
+        * html/HTMLFormElement.h:
+        * loader/FormSubmission.h:
+        (WebCore::FormSubmission::cancel): Deleted.
+        (WebCore::FormSubmission::wasCancelled const): Deleted.
+        * loader/NavigationScheduler.cpp:
+
 2019-12-17  Fujii Hironori  <fujii.hironori@gmail.com>
 
         [cairo] text-align:justify wrongly expands CJK ideograph characters
diff --git a/Source/WebCore/html/HTMLFormElement.cpp b/Source/WebCore/html/HTMLFormElement.cpp
index 15ad57f91bbf0..435d9514dd29d 100644
--- a/Source/WebCore/html/HTMLFormElement.cpp
+++ b/Source/WebCore/html/HTMLFormElement.cpp
@@ -358,11 +358,7 @@ void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool proce
     auto protectedThis = makeRef(*this); // Form submission can execute arbitary JavaScript.
 
     auto shouldLockHistory = processingUserGesture ? LockHistory::No : LockHistory::Yes;
-    auto formSubmission = FormSubmission::create(*this, m_attributes, event, shouldLockHistory, formSubmissionTrigger);
-    if (m_plannedFormSubmission)
-        m_plannedFormSubmission->cancel();
-    m_plannedFormSubmission = makeWeakPtr(formSubmission.get());
-    frame->loader().submitForm(WTFMove(formSubmission));
+    frame->loader().submitForm(FormSubmission::create(*this, m_attributes, event, shouldLockHistory, formSubmissionTrigger));
 
     if (needButtonActivation && firstSuccessfulSubmitButton)
         firstSuccessfulSubmitButton->setActivatedSubmit(false);
diff --git a/Source/WebCore/html/HTMLFormElement.h b/Source/WebCore/html/HTMLFormElement.h
index b2171d7195122..ebcdc0a66233e 100644
--- a/Source/WebCore/html/HTMLFormElement.h
+++ b/Source/WebCore/html/HTMLFormElement.h
@@ -181,7 +181,6 @@ class HTMLFormElement final : public HTMLElement {
     Vector<FormAssociatedElement*> m_associatedElements;
     Vector<WeakPtr<HTMLImageElement>> m_imageElements;
     WeakHashSet<HTMLFormControlElement> m_invalidAssociatedFormControls;
-    WeakPtr<FormSubmission> m_plannedFormSubmission;
 
     bool m_wasUserSubmitted { false };
     bool m_isSubmittingOrPreparingForSubmission { false };
diff --git a/Source/WebCore/loader/FormSubmission.h b/Source/WebCore/loader/FormSubmission.h
index 3c176628449a9..f9accf17215bb 100644
--- a/Source/WebCore/loader/FormSubmission.h
+++ b/Source/WebCore/loader/FormSubmission.h
@@ -33,7 +33,6 @@
 #include "FormState.h"
 #include "FrameLoaderTypes.h"
 #include <wtf/URL.h>
-#include <wtf/WeakPtr.h>
 
 namespace WebCore {
 
@@ -41,9 +40,9 @@ class Event;
 class FormData;
 class FrameLoadRequest;
 
-class FormSubmission : public RefCounted<FormSubmission>, public CanMakeWeakPtr<FormSubmission> {
+class FormSubmission : public RefCounted<FormSubmission> {
 public:
-    enum class Method : bool { Get, Post };
+    enum class Method { Get, Post };
 
     class Attributes {
     public:
@@ -97,15 +96,11 @@ class FormSubmission : public RefCounted<FormSubmission>, public CanMakeWeakPtr<
     void setReferrer(const String& referrer) { m_referrer = referrer; }
     void setOrigin(const String& origin) { m_origin = origin; }
 
-    void cancel() { m_wasCancelled = true; }
-    bool wasCancelled() const { return m_wasCancelled; }
-
 private:
     FormSubmission(Method, const URL& action, const String& target, const String& contentType, Ref<FormState>&&, Ref<FormData>&&, const String& boundary, LockHistory, Event*);
 
     // FIXME: Hold an instance of Attributes instead of individual members.
     Method m_method;
-    bool m_wasCancelled { false };
     URL m_action;
     String m_target;
     String m_contentType;
diff --git a/Source/WebCore/loader/NavigationScheduler.cpp b/Source/WebCore/loader/NavigationScheduler.cpp
index 80ded7992686c..3c2c252aa51b9 100644
--- a/Source/WebCore/loader/NavigationScheduler.cpp
+++ b/Source/WebCore/loader/NavigationScheduler.cpp
@@ -277,9 +277,6 @@ class ScheduledFormSubmission : public ScheduledNavigation {
 
     void fire(Frame& frame) override
     {
-        if (m_submission->wasCancelled())
-            return;
-
         UserGestureIndicator gestureIndicator(userGestureToForward());
 
         // The submitForm function will find a target frame before using the redirection timer.