Unreviewed, rolling out r236631.

https://bugs.webkit.org/show_bug.cgi?id=190112

Caused various eventSender tests, including fast/css/pseudo-
active-style-sharing*, to fail (Requested by smfr on #webkit).

Reverted changeset:

"Regression(r236512): http/tests/navigation/keyboard-events-
during-provisional-navigation.html is flaky"
https://bugs.webkit.org/show_bug.cgi?id=190052
https://trac.webkit.org/changeset/236631

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1ea14d1..dfc721d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2018-09-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r236631.
+        https://bugs.webkit.org/show_bug.cgi?id=190112
+
+        Caused various eventSender tests, including fast/css/pseudo-
+        active-style-sharing*, to fail (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "Regression(r236512): http/tests/navigation/keyboard-events-
+        during-provisional-navigation.html is flaky"
+        https://bugs.webkit.org/show_bug.cgi?id=190052
+        https://trac.webkit.org/changeset/236631
+
 2018-09-28  Zamiul Haque  <zhaque@apple.com>
 
         Angled gradient backgrounds in body render vertically when body height is 0

diff --git a/LayoutTests/fast/forms/file/input-file-write-files-using-open-panel.html b/LayoutTests/fast/forms/file/input-file-write-files-using-open-panel.html
index 845c7cb..44da5d5 100644 (file)
--- a/LayoutTests/fast/forms/file/input-file-write-files-using-open-panel.html
+++ b/LayoutTests/fast/forms/file/input-file-write-files-using-open-panel.html
@@ -18,9 +18,8 @@ if (window.testRunner) {
 
     file1.addEventListener("change", function() {
         file2.addEventListener("change", function() {
-            setTimeout(() => {
-                runTest(file1, file2);
-            }, 0);
+            runTest(file1, file2);
+            finishJSTest();
         });
         window.setTimeout(function() {
             dragFilesOntoInput(file2, ["bar.txt"]);
@@ -44,8 +43,6 @@ function runTest(file1, file2) {
     file1.files = file2.files;
     shouldBe("file1.files.length", "1");
     shouldBeEqualToString("file1.files.item(0).name", "bar.txt");
-
-    finishJSTest();
 }
 
 function dragFilesOntoInput(input, files) {

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 3f02c36..6c0da55 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2018-09-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r236631.
+        https://bugs.webkit.org/show_bug.cgi?id=190112
+
+        Caused various eventSender tests, including fast/css/pseudo-
+        active-style-sharing*, to fail (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "Regression(r236512): http/tests/navigation/keyboard-events-
+        during-provisional-navigation.html is flaky"
+        https://bugs.webkit.org/show_bug.cgi?id=190052
+        https://trac.webkit.org/changeset/236631
+
 2018-09-29  Chris Dumez  <cdumez@apple.com>
 
         [PSON] Deal with the drawing area potentially being null in WebFrameLoaderClient::transitionToCommittedForNewPage()

diff --git a/Source/WebKit/Platform/IPC/Connection.cpp b/Source/WebKit/Platform/IPC/Connection.cpp
index c02108f..d0dae93 100644 (file)
--- a/Source/WebKit/Platform/IPC/Connection.cpp
+++ b/Source/WebKit/Platform/IPC/Connection.cpp
@@ -400,7 +400,7 @@ bool Connection::sendMessage(std::unique_ptr<Encoder> encoder, OptionSet<SendOpt
     if (!isValid())
         return false;
 
-    if (isMainThread() && m_inDispatchMessageMarkedToUseFullySynchronousModeForTesting && !encoder->isSyncMessage() && !(encoder->messageReceiverName() == "IPC") && !sendOptions.contains(SendOption::IgnoreFullySynchronousMode)) {
+    if (isMainThread() && m_inDispatchMessageMarkedToUseFullySynchronousModeForTesting && !encoder->isSyncMessage() && !(encoder->messageReceiverName() == "IPC")) {
         uint64_t syncRequestID;
         auto wrappedMessage = createSyncMessageEncoder("IPC", "WrappedAsyncMessageForTesting", encoder->destinationID(), syncRequestID);
         wrappedMessage->setFullySynchronousModeForTesting();

diff --git a/Source/WebKit/Platform/IPC/Connection.h b/Source/WebKit/Platform/IPC/Connection.h
index 72f0eaa..e6395c9 100644 (file)
--- a/Source/WebKit/Platform/IPC/Connection.h
+++ b/Source/WebKit/Platform/IPC/Connection.h
@@ -61,7 +61,6 @@ enum class SendOption {
     // Whether this message should be dispatched when waiting for a sync reply.
     // This is the default for synchronous messages.
     DispatchMessageEvenWhenWaitingForSyncReply = 1 << 0,
-    IgnoreFullySynchronousMode = 1 << 1,
 };
 
 enum class SendSyncOption {

diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
index 07d0242..fcd6e1b 100644 (file)
--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -665,11 +665,6 @@ void WKBundlePagePostMessage(WKBundlePageRef pageRef, WKStringRef messageNameRef
     toImpl(pageRef)->postMessage(toWTFString(messageNameRef), toImpl(messageBodyRef));
 }
 
-void WKBundlePagePostMessageIgnoringFullySynchronousMode(WKBundlePageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
-{
-    toImpl(pageRef)->postMessageIgnoringFullySynchronousMode(toWTFString(messageNameRef), toImpl(messageBodyRef));
-}
-
 void WKBundlePagePostSynchronousMessageForTesting(WKBundlePageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef, WKTypeRef* returnDataRef)
 {
     WebPage* page = toImpl(pageRef);

diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.h b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.h
index 34503a6..cd013df 100644 (file)
--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.h
+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.h
@@ -124,8 +124,6 @@ WK_EXPORT void WKBundlePagePostMessage(WKBundlePageRef page, WKStringRef message
 
 // Switches a connection into a fully synchronous mode, so all messages become synchronous until we get a response.
 WK_EXPORT void WKBundlePagePostSynchronousMessageForTesting(WKBundlePageRef page, WKStringRef messageName, WKTypeRef messageBody, WKTypeRef* returnData);
-// Same as WKBundlePagePostMessage() but the message cannot become synchronous, even if the connection is in fully synchronous mode.
-WK_EXPORT void WKBundlePagePostMessageIgnoringFullySynchronousMode(WKBundlePageRef page, WKStringRef messageName, WKTypeRef messageBody);
 
 #ifdef __cplusplus
 }

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
index 541fe8e..920079f 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -5828,11 +5828,6 @@ void WebPage::postMessage(const String& messageName, API::Object* messageBody)
     send(Messages::WebPageProxy::HandleMessage(messageName, UserData(WebProcess::singleton().transformObjectsToHandles(messageBody))));
 }
 
-void WebPage::postMessageIgnoringFullySynchronousMode(const String& messageName, API::Object* messageBody)
-{
-    send(Messages::WebPageProxy::HandleMessage(messageName, UserData(WebProcess::singleton().transformObjectsToHandles(messageBody))), pageID(), IPC::SendOption::IgnoreFullySynchronousMode);
-}
-
 void WebPage::postSynchronousMessageForTesting(const String& messageName, API::Object* messageBody, RefPtr<API::Object>& returnData)
 {
     UserData returnUserData;

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
index 989b55b..070bda6 100644 (file)
--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -1014,7 +1014,6 @@ public:
 
     void postMessage(const String& messageName, API::Object* messageBody);
     void postSynchronousMessageForTesting(const String& messageName, API::Object* messageBody, RefPtr<API::Object>& returnData);
-    void postMessageIgnoringFullySynchronousMode(const String& messageName, API::Object* messageBody);
 
 #if PLATFORM(GTK)
     void setInputMethodState(bool);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ff10164..477c4df 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2018-09-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r236631.
+        https://bugs.webkit.org/show_bug.cgi?id=190112
+
+        Caused various eventSender tests, including fast/css/pseudo-
+        active-style-sharing*, to fail (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "Regression(r236512): http/tests/navigation/keyboard-events-
+        during-provisional-navigation.html is flaky"
+        https://bugs.webkit.org/show_bug.cgi?id=190052
+        https://trac.webkit.org/changeset/236631
+
 2018-09-28  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [WHLSL] Fix build after r236635

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index 44e0926..5f1c220 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -603,10 +603,7 @@ void InjectedBundle::outputText(const String& output)
         return;
     WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("TextOutput"));
     WKRetainPtr<WKStringRef> messageBody(AdoptWK, WKStringCreateWithUTF8CString(output.utf8().data()));
-    // We use WKBundlePagePostMessageIgnoringFullySynchronousMode() instead of WKBundlePagePostMessage() to make sure that all text output
-    // is done via asynchronous IPC, even if the connection is in fully synchronous mode due to a WKBundlePagePostSynchronousMessageForTesting()
-    // call. Otherwise, messages logged via sync and async IPC may end up out of order and cause flakiness.
-    WKBundlePagePostMessageIgnoringFullySynchronousMode(page()->page(), messageName.get(), messageBody.get());
+    WKBundlePagePostMessage(page()->page(), messageName.get(), messageBody.get());
 }
 
 void InjectedBundle::postNewBeforeUnloadReturnValue(bool value)