Changeset 169306 in webkit

Timestamp:

May 24, 2014 12:17:53 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r165841): Messages sent before the child process is launched are never sent after r165841
​https://bugs.webkit.org/show_bug.cgi?id=131675

Reviewed by Anders Carlsson.

Since r165841 the connection is opened after the pending messages
are sent, because connectionWillOpen might send messages that we
want to happen after the ones already pending. The problem is that
Connection::canSendOutgoingMessages() returns false when
connection hasn't been opened. We should ensure no messages are
sent by connectionWillOpen.

• Shared/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::didFinishLaunching): Open the
connection before sending pending messages.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::connectionWillOpen): Do not call
VisitedLinkProvider::addProcess() here because it tries to send a
message to the web process, but the connection hasn't be opened yet.
(WebKit::WebPageProxy::processDidFinishLaunching): Call
VisitedLinkProvider::addProcess() here instead.

• UIProcess/WebPageProxy.h:
• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didFinishLaunching): Call
WebPageProxy::processDidFinishLaunching() for every web page.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ChildProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r165841): Messages sent before the child process is launched are never sent after r165841
+        https://bugs.webkit.org/show_bug.cgi?id=131675
+
+        Reviewed by Anders Carlsson.
+
+        Since r165841 the connection is opened after the pending messages
+        are sent, because connectionWillOpen might send messages that we
+        want to happen after the ones already pending. The problem is that
+        Connection::canSendOutgoingMessages() returns false when
+        connection hasn't been opened. We should ensure no messages are
+        sent by connectionWillOpen.
+
+        * Shared/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::didFinishLaunching): Open the
+        connection before sending pending messages.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::connectionWillOpen): Do not call
+        VisitedLinkProvider::addProcess() here because it tries to send a
+        message to the web process, but the connection hasn't be opened yet.
+        (WebKit::WebPageProxy::processDidFinishLaunching): Call
+        VisitedLinkProvider::addProcess() here instead.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didFinishLaunching): Call
+        WebPageProxy::processDidFinishLaunching() for every web page.
+
 2014-05-23  Ian Henderson  <ianh@apple.com>
 

trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp

@@ -139 +139 @@
 #endif
 
+    connectionWillOpen(m_connection.get());
+    m_connection->open();
+
     for (size_t i = 0; i < m_pendingMessages.size(); ++i) {
         std::unique_ptr<IPC::MessageEncoder> message = std::move(m_pendingMessages[i].first);
@@ -144 +147 @@
         m_connection->sendMessage(std::move(message), messageSendFlags);
     }
-
-    connectionWillOpen(m_connection.get());
-    m_connection->open();
 
     m_pendingMessages.clear();

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2919 +2919 @@
     ASSERT(connection == m_process->connection());
 
+    m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
+}
+
+void WebPageProxy::connectionWillClose(IPC::Connection* connection)
+{
+    ASSERT_UNUSED(connection, connection == m_process->connection());
+
+    m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
+}
+
+void WebPageProxy::processDidFinishLaunching()
+{
     if (m_userContentController)
         m_userContentController->addProcess(m_process.get());
     m_visitedLinkProvider->addProcess(m_process.get());
-
-    m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
-}
-
-void WebPageProxy::connectionWillClose(IPC::Connection* connection)
-{
-    ASSERT_UNUSED(connection, connection == m_process->connection());
-
-    m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -1075 +1075 @@
     void connectionWillClose(IPC::Connection*);
 
+    void processDidFinishLaunching();
+
     void didSaveToPageCache();
         

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -455 +455 @@
     ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
 
+    for (auto& page : m_pageMap.values())
+        page->processDidFinishLaunching();
+
     m_webConnection = WebConnectionToWebProcess::create(this);