Diff
Modified: trunk/LayoutTests/ChangeLog (253665 => 253666)
--- trunk/LayoutTests/ChangeLog 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/LayoutTests/ChangeLog 2019-12-18 02:32:05 UTC (rev 253666)
@@ -1,3 +1,9 @@
+2019-12-17 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, revert r253493 because it broke an Apple internal site
+
+ * platform/mac/TestExpectations:
+
2019-12-17 Fujii Hironori <fujii.hiron...@gmail.com>
[cairo] text-align:justify wrongly expands CJK ideograph characters
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (253665 => 253666)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2019-12-18 02:32:05 UTC (rev 253666)
@@ -1,5 +1,12 @@
2019-12-17 Chris Dumez <cdu...@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 <cdu...@apple.com>
+
Re-sync html/semantics/embedded-content/the-canvas-element from upstream
https://bugs.webkit.org/show_bug.cgi?id=205352
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt (253665 => 253666)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-3-expected.txt 2019-12-18 02:32:05 UTC (rev 253666)
@@ -4,5 +4,5 @@
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
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt (253665 => 253666)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/form-submission-0/form-double-submit-expected.txt 2019-12-18 02:32:05 UTC (rev 253666)
@@ -4,5 +4,5 @@
-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
Modified: trunk/LayoutTests/platform/mac/TestExpectations (253665 => 253666)
--- trunk/LayoutTests/platform/mac/TestExpectations 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2019-12-18 02:32:05 UTC (rev 253666)
@@ -1965,4 +1965,6 @@
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 ]
Modified: trunk/Source/WebCore/ChangeLog (253665 => 253666)
--- trunk/Source/WebCore/ChangeLog 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/Source/WebCore/ChangeLog 2019-12-18 02:32:05 UTC (rev 253666)
@@ -1,3 +1,15 @@
+2019-12-17 Chris Dumez <cdu...@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.hiron...@gmail.com>
[cairo] text-align:justify wrongly expands CJK ideograph characters
Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (253665 => 253666)
--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2019-12-18 02:32:05 UTC (rev 253666)
@@ -358,11 +358,7 @@
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);
Modified: trunk/Source/WebCore/html/HTMLFormElement.h (253665 => 253666)
--- trunk/Source/WebCore/html/HTMLFormElement.h 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2019-12-18 02:32:05 UTC (rev 253666)
@@ -181,7 +181,6 @@
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 };
Modified: trunk/Source/WebCore/loader/FormSubmission.h (253665 => 253666)
--- trunk/Source/WebCore/loader/FormSubmission.h 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/Source/WebCore/loader/FormSubmission.h 2019-12-18 02:32:05 UTC (rev 253666)
@@ -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 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 @@
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;
Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (253665 => 253666)
--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2019-12-18 02:21:29 UTC (rev 253665)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2019-12-18 02:32:05 UTC (rev 253666)
@@ -277,9 +277,6 @@
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.
