Changeset 236492 in webkit

Timestamp:

Sep 25, 2018, 6:27:54 PM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r236471 and r236480.

Seems to be causing some flaky crashes

Reverted changesets:

"UIProcess should process incoming sync IPC from WebProcess
when waiting for a sync IPC reply from it"
​https://bugs.webkit.org/show_bug.cgi?id=189927
​https://trac.webkit.org/changeset/236471

"Revert some of the changes in r236471"
​https://bugs.webkit.org/show_bug.cgi?id=189973
​https://trac.webkit.org/changeset/236480

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-25  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r236471 and r236480.
+
+        Seems to be causing some flaky crashes
+
+        Reverted changesets:
+
+        "UIProcess should process incoming sync IPC from WebProcess
+        when waiting for a sync IPC reply from it"
+        https://bugs.webkit.org/show_bug.cgi?id=189927
+        https://trac.webkit.org/changeset/236471
+
+        "Revert some of the changes in r236471"
+        https://bugs.webkit.org/show_bug.cgi?id=189973
+        https://trac.webkit.org/changeset/236480
+
 2018-09-25  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -4014 +4014 @@
         m_pageLoadState.clearPendingAPIRequestURL(transaction);
 
-    auto* frame = m_process->webFrame(frameID);
+    WebFrameProxy* frame = m_process->webFrame(frameID);
     MESSAGE_CHECK(frame);
     MESSAGE_CHECK_URL(request.url());

trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

@@ -112 +112 @@
 {
     auto frame = create(std::unique_ptr<WebFrameLoaderClient>(static_cast<WebFrameLoaderClient*>(&coreFrame->loader().client())));
-    // DispatchMessageEvenWhenWaitingForSyncReply SendOption is needed to ensure that this IPC always gets received before the DecidePolicyForNavigationSync synchronous
-    // IPC for this frame.
     page->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()), page->pageID(), IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
 
@@ -125 +123 @@
 {
     auto frame = create(std::make_unique<WebFrameLoaderClient>());
-    // DispatchMessageEvenWhenWaitingForSyncReply SendOption is needed to ensure that this IPC always gets received before the DecidePolicyForNavigationSync synchronous
-    // IPC for this frame.
     page->send(Messages::WebPageProxy::DidCreateSubframe(frame->frameID()), page->pageID(), IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -252 +252 @@
 
     m_webConnection = WebConnectionToUIProcess::create(this);
+
+    // In order to ensure that the asynchronous messages that are used for notifying the UI process
+    // about when WebFrame objects come and go are always delivered before the synchronous policy messages,
+    // use this flag to force synchronous messages to be treated as asynchronous messages in the UI process
+    // unless when doing so would lead to a deadlock.
+    connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
 }