<!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>[177803] 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/177803">177803</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 11:27:32 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert injected bundle message posting to UserData
https://bugs.webkit.org/show_bug.cgi?id=139993
Reviewed by Sam Weinig.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::postMessageToInjectedBundle):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::handleInjectedBundleMessage):
(WebKit::WebProcess::postInjectedBundleMessage): Deleted.
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177802 => 177803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 19:25:45 UTC (rev 177802)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 19:27:32 UTC (rev 177803)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-29 Anders Carlsson <andersca@apple.com>
+
+ Convert injected bundle message posting to UserData
+ https://bugs.webkit.org/show_bug.cgi?id=139993
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::postMessageToInjectedBundle):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::handleInjectedBundleMessage):
+ (WebKit::WebProcess::postInjectedBundleMessage): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2014-12-29 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Try to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (177802 => 177803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 19:25:45 UTC (rev 177802)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 19:27:32 UTC (rev 177803)
</span><span class="lines">@@ -720,13 +720,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_processModel == ProcessModelSharedSecondaryProcess) {
</span><span class="cx"> for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
</span><del>- std::pair<String, RefPtr<API::Object>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
</del><ins>+ auto& messageNameAndBody = m_messagesToInjectedBundlePostedToEmptyContext[i];
</ins><span class="cx">
</span><del>- IPC::ArgumentEncoder messageData;
-
- messageData.encode(message.first);
- messageData.encode(WebContextUserMessageEncoder(message.second.get(), process));
- process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
</del><ins>+ process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageNameAndBody.first, UserData(process->transformObjectsToHandles(messageNameAndBody.second.get()).get())), 0);
</ins><span class="cx"> }
</span><span class="cx"> m_messagesToInjectedBundlePostedToEmptyContext.clear();
</span><span class="cx"> } else
</span><span class="lines">@@ -941,11 +937,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& process : m_processes) {
</span><span class="cx"> // FIXME: Return early if the message body contains any references to WKPageRefs/WKFrameRefs etc. since they're local to a process.
</span><del>- IPC::ArgumentEncoder messageData;
- messageData.encode(messageName);
- messageData.encode(WebContextUserMessageEncoder(messageBody, *process.get()));
-
- process->send(Messages::WebProcess::PostInjectedBundleMessage(IPC::DataReference(messageData.buffer(), messageData.bufferSize())), 0);
</del><ins>+ process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageName, UserData(process->transformObjectsToHandles(messageBody).get())), 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177802 => 177803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 19:25:45 UTC (rev 177802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 19:27:32 UTC (rev 177803)
</span><span class="lines">@@ -947,24 +947,13 @@
</span><span class="cx"> gcController().setJavaScriptGarbageCollectorTimerEnabled(flag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::postInjectedBundleMessage(const IPC::DataReference& messageData)
</del><ins>+void WebProcess::handleInjectedBundleMessage(const String& messageName, const UserData& messageBody)
</ins><span class="cx"> {
</span><span class="cx"> InjectedBundle* injectedBundle = WebProcess::shared().injectedBundle();
</span><span class="cx"> if (!injectedBundle)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- IPC::ArgumentDecoder decoder(messageData.data(), messageData.size());
-
- String messageName;
- if (!decoder.decode(messageName))
- return;
-
- RefPtr<API::Object> messageBody;
- InjectedBundleUserMessageDecoder messageBodyDecoder(messageBody);
- if (!decoder.decode(messageBodyDecoder))
- return;
-
- injectedBundle->didReceiveMessage(messageName, messageBody.get());
</del><ins>+ injectedBundle->didReceiveMessage(messageName, transformHandlesToObjects(messageBody.object()).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::setInjectedBundleParameter(const String& key, const IPC::DataReference& value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177802 => 177803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-29 19:25:45 UTC (rev 177802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-29 19:27:32 UTC (rev 177803)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> class DownloadManager;
</span><span class="cx"> class EventDispatcher;
</span><span class="cx"> class InjectedBundle;
</span><ins>+class UserData;
</ins><span class="cx"> class WebConnectionToUIProcess;
</span><span class="cx"> class WebFrame;
</span><span class="cx"> class WebIconDatabaseProxy;
</span><span class="lines">@@ -266,7 +267,7 @@
</span><span class="cx"> void setEnabledServices(bool hasImageServices, bool hasSelectionServices, bool hasRichContentServices);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void postInjectedBundleMessage(const IPC::DataReference& messageData);
</del><ins>+ void handleInjectedBundleMessage(const String& messageName, const UserData& messageBody);
</ins><span class="cx"> void setInjectedBundleParameter(const String& key, const IPC::DataReference&);
</span><span class="cx">
</span><span class="cx"> // ChildProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (177802 => 177803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-29 19:25:45 UTC (rev 177802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2014-12-29 19:27:32 UTC (rev 177803)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> SetJavaScriptGarbageCollectorTimerEnabled(bool enable)
</span><span class="cx">
</span><span class="cx"> SetInjectedBundleParameter(String parameter, IPC::DataReference value);
</span><del>- PostInjectedBundleMessage(IPC::DataReference messageData);
</del><ins>+ HandleInjectedBundleMessage(String messageName, WebKit::UserData messageBody);
</ins><span class="cx">
</span><span class="cx"> ReleasePageCache()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>