<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169306] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169306">169306</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-24 00:17:53 -0700 (Sat, 24 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/165841">r165841</a>): Messages sent before the child process is launched are never sent after <a href="http://trac.webkit.org/projects/webkit/changeset/165841">r165841</a>
https://bugs.webkit.org/show_bug.cgi?id=131675
Reviewed by Anders Carlsson.
Since <a href="http://trac.webkit.org/projects/webkit/changeset/165841">r165841</a> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessProxycpp">trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169305 => 169306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-24 04:56:50 UTC (rev 169305)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-24 07:17:53 UTC (rev 169306)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-05-23 Ian Henderson <ianh@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Rubberbanding out jumps to top left corner on google.com
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp (169305 => 169306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2014-05-24 04:56:50 UTC (rev 169305)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2014-05-24 07:17:53 UTC (rev 169306)
</span><span class="lines">@@ -138,15 +138,15 @@
</span><span class="cx"> m_connection->setShouldCloseConnectionOnMachExceptions();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ connectionWillOpen(m_connection.get());
+ m_connection->open();
+
</ins><span class="cx"> for (size_t i = 0; i < m_pendingMessages.size(); ++i) {
</span><span class="cx"> std::unique_ptr<IPC::MessageEncoder> message = std::move(m_pendingMessages[i].first);
</span><span class="cx"> unsigned messageSendFlags = m_pendingMessages[i].second;
</span><span class="cx"> m_connection->sendMessage(std::move(message), messageSendFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- connectionWillOpen(m_connection.get());
- m_connection->open();
-
</del><span class="cx"> m_pendingMessages.clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169305 => 169306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-24 04:56:50 UTC (rev 169305)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-24 07:17:53 UTC (rev 169306)
</span><span class="lines">@@ -2918,10 +2918,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(connection == m_process->connection());
</span><span class="cx">
</span><del>- if (m_userContentController)
- m_userContentController->addProcess(m_process.get());
- m_visitedLinkProvider->addProcess(m_process.get());
-
</del><span class="cx"> m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2932,6 +2928,13 @@
</span><span class="cx"> m_process->context().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::processDidFinishLaunching()
+{
+ if (m_userContentController)
+ m_userContentController->addProcess(m_process.get());
+ m_visitedLinkProvider->addProcess(m_process.get());
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebPageProxy::unavailablePluginButtonClicked(uint32_t opaquePluginUnavailabilityReason, const String& mimeType, const String& pluginURLString, const String& pluginspageAttributeURLString, const String& frameURLString, const String& pageURLString)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169305 => 169306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-24 04:56:50 UTC (rev 169305)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-24 07:17:53 UTC (rev 169306)
</span><span class="lines">@@ -1074,6 +1074,8 @@
</span><span class="cx"> void connectionWillOpen(IPC::Connection*);
</span><span class="cx"> void connectionWillClose(IPC::Connection*);
</span><span class="cx">
</span><ins>+ void processDidFinishLaunching();
+
</ins><span class="cx"> void didSaveToPageCache();
</span><span class="cx">
</span><span class="cx"> void setScrollPinningBehavior(WebCore::ScrollPinningBehavior);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (169305 => 169306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-24 04:56:50 UTC (rev 169305)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-24 07:17:53 UTC (rev 169306)
</span><span class="lines">@@ -454,6 +454,9 @@
</span><span class="cx"> {
</span><span class="cx"> ChildProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
</span><span class="cx">
</span><ins>+ for (auto& page : m_pageMap.values())
+ page->processDidFinishLaunching();
+
</ins><span class="cx"> m_webConnection = WebConnectionToWebProcess::create(this);
</span><span class="cx">
</span><span class="cx"> m_context->processDidFinishLaunching(this);
</span></span></pre>
</div>
</div>
</body>
</html>