<!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>[177793] 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/177793">177793</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 10:11:49 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use UserData for bundle initialization data
https://bugs.webkit.org/show_bug.cgi?id=139989
Reviewed by Sam Weinig.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::~WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-12-29 Anders Carlsson <andersca@apple.com>
+
+ Use UserData for bundle initialization data
+ https://bugs.webkit.org/show_bug.cgi?id=139989
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::~WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-12-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use UserData when sending messages to the process pool
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -56,10 +56,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebProcessCreationParameters::~WebProcessCreationParameters()
+{
+}
+
</ins><span class="cx"> void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << injectedBundlePath;
</span><span class="cx"> encoder << injectedBundlePathExtensionHandle;
</span><ins>+ encoder << initializationUserData;
</ins><span class="cx"> encoder << applicationCacheDirectory;
</span><span class="cx"> encoder << applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << webSQLDatabaseDirectory;
</span><span class="lines">@@ -148,6 +153,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.injectedBundlePathExtensionHandle))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.initializationUserData))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.applicationCacheDirectory))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.applicationCacheDirectoryExtensionHandle))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "TextCheckerState.h"
</span><ins>+#include "UserData.h"
</ins><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -49,14 +50,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class ArgumentDecoder;
- class ArgumentEncoder;
</del><ins>+class ArgumentDecoder;
+class ArgumentEncoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> struct WebProcessCreationParameters {
</span><span class="cx"> WebProcessCreationParameters();
</span><ins>+ ~WebProcessCreationParameters();
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebProcessCreationParameters&);
</span><span class="lines">@@ -64,6 +66,8 @@
</span><span class="cx"> String injectedBundlePath;
</span><span class="cx"> SandboxExtension::Handle injectedBundlePathExtensionHandle;
</span><span class="cx">
</span><ins>+ UserData initializationUserData;
+
</ins><span class="cx"> String applicationCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
</span><span class="cx"> String webSQLDatabaseDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -702,8 +702,10 @@
</span><span class="cx"> RefPtr<API::Object> injectedBundleInitializationUserData = m_injectedBundleClient.getInjectedBundleInitializationUserData(this);
</span><span class="cx"> if (!injectedBundleInitializationUserData)
</span><span class="cx"> injectedBundleInitializationUserData = m_injectedBundleInitializationUserData;
</span><del>- process->send(Messages::WebProcess::InitializeWebProcess(parameters, WebContextUserMessageEncoder(injectedBundleInitializationUserData.get(), process)), 0);
</del><ins>+ parameters.initializationUserData = UserData(process->transformObjectsToHandles(injectedBundleInitializationUserData.get()));
</ins><span class="cx">
</span><ins>+ process->send(Messages::WebProcess::InitializeWebProcess(parameters), 0);
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> return *supplement<AuthenticationManager>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters, IPC::MessageDecoder& decoder)
</del><ins>+void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageMap.isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -279,19 +279,14 @@
</span><span class="cx"> m_usesNetworkProcess = parameters.usesNetworkProcess;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- platformInitializeWebProcess(WTF::move(parameters), decoder);
</del><ins>+ platformInitializeWebProcess(WTF::move(parameters));
</ins><span class="cx">
</span><span class="cx"> WTF::setCurrentThreadIsUserInitiated();
</span><span class="cx">
</span><span class="cx"> memoryPressureHandler().install();
</span><span class="cx">
</span><del>- RefPtr<API::Object> injectedBundleInitializationUserData;
- InjectedBundleUserMessageDecoder messageDecoder(injectedBundleInitializationUserData);
- if (!decoder.decode(messageDecoder))
- return;
-
</del><span class="cx"> if (!parameters.injectedBundlePath.isEmpty())
</span><del>- m_injectedBundle = InjectedBundle::create(parameters, injectedBundleInitializationUserData.get());
</del><ins>+ m_injectedBundle = InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
</ins><span class="cx">
</span><span class="cx"> WebProcessSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="cx"> WebProcessSupplementMap::const_iterator end = m_supplements.end();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> virtual IPC::Connection* downloadProxyConnection() override;
</span><span class="cx"> virtual AuthenticationManager& downloadsAuthenticationManager() override;
</span><span class="cx">
</span><del>- void initializeWebProcess(WebProcessCreationParameters&&, IPC::MessageDecoder&);
- void platformInitializeWebProcess(WebProcessCreationParameters&&, IPC::MessageDecoder&);
</del><ins>+ void initializeWebProcess(WebProcessCreationParameters&&);
+ void platformInitializeWebProcess(WebProcessCreationParameters&&);
</ins><span class="cx">
</span><span class="cx"> void platformTerminate();
</span><span class="cx"> void registerURLSchemeAsEmptyDocument(const String&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -21,8 +21,7 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> messages -> WebProcess LegacyReceiver {
</span><del>- # Initialize the WebProcess.
- InitializeWebProcess(struct WebKit::WebProcessCreationParameters processCreationParameters, WebKit::WebContextUserMessageEncoder initializationUserData) Variadic
</del><ins>+ InitializeWebProcess(struct WebKit::WebProcessCreationParameters processCreationParameters)
</ins><span class="cx">
</span><span class="cx"> # Create a new page.
</span><span class="cx"> CreateWebPage(uint64_t newPageID, struct WebKit::WebPageCreationParameters pageCreationParameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (177792 => 177793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-29 17:46:02 UTC (rev 177792)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-29 18:11:49 UTC (rev 177793)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters, IPC::MessageDecoder&)
</del><ins>+void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span></span></pre>
</div>
</div>
</body>
</html>