Changeset 170757 in webkit

Timestamp:

Jul 3, 2014, 10:13:02 AM (11 years ago)

Author:

Antti Koivisto

Message:

Ensure frame creation messages get through to UI process
​https://bugs.webkit.org/show_bug.cgi?id=134591
<rdar://problem/16918218>

Reviewed by Anders Carlsson.

If we are middle of handling a synchronous message from UI process a frame creation message back gets delayed.
The subsequent synchronous DecidePolicyForNavigationAction message expects that the frame creation
message has arrived first and fails.

• WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::createWithCoreMainFrame):
(WebKit::WebFrame::createSubframe):

Send messages with DispatchMessageEvenWhenWaitingForSyncReply so they always go through in order.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-03  Antti Koivisto  <antti@apple.com>
+
+        Ensure frame creation messages get through to UI process
+        https://bugs.webkit.org/show_bug.cgi?id=134591
+        <rdar://problem/16918218>
+
+        Reviewed by Anders Carlsson.
+
+        If we are middle of handling a synchronous message from UI process a frame creation message back gets delayed.
+        The subsequent synchronous DecidePolicyForNavigationAction message expects that the frame creation
+        message has arrived first and fails.
+
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::createWithCoreMainFrame):
+        (WebKit::WebFrame::createSubframe):
+        
+            Send messages with DispatchMessageEvenWhenWaitingForSyncReply so they always go through in order.
+
 2014-07-03  Anders Carlsson  <andersca@apple.com>
 

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

@@ -110 +110 @@
 {
     RefPtr<WebFrame> frame = create(std::unique_ptr<WebFrameLoaderClient>(static_cast<WebFrameLoaderClient*>(&coreFrame->loader().client())));
-    page->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()));
+    page->send(Messages::WebPageProxy::DidCreateMainFrame(frame->frameID()), page->pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
 
     frame->m_coreFrame = coreFrame;
@@ -121 +121 @@
 {
     RefPtr<WebFrame> frame = create(std::make_unique<WebFrameLoaderClient>());
-    page->send(Messages::WebPageProxy::DidCreateSubframe(frame->frameID()));
+    page->send(Messages::WebPageProxy::DidCreateSubframe(frame->frameID()), page->pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
 
     RefPtr<Frame> coreFrame = Frame::create(page->corePage(), ownerElement, frame->m_frameLoaderClient.get());