<!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>[177796] 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/177796">177796</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 11:02:08 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert all variadic web process messages to UserData
https://bugs.webkit.org/show_bug.cgi?id=139991
Reviewed by Sam Weinig.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadRequest):
(WebKit::WebPageProxy::loadFile):
(WebKit::WebPageProxy::loadData):
(WebKit::WebPageProxy::loadHTMLString):
(WebKit::WebPageProxy::loadAlternateHTMLString):
(WebKit::WebPageProxy::loadPlainTextString):
(WebKit::WebPageProxy::loadWebArchiveData):
(WebKit::WebPageProxy::postMessageToInjectedBundle):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadRequest):
(WebKit::WebPage::loadDataImpl):
(WebKit::WebPage::loadString):
(WebKit::WebPage::loadData):
(WebKit::WebPage::loadHTMLString):
(WebKit::WebPage::loadAlternateHTMLString):
(WebKit::WebPage::loadPlainTextString):
(WebKit::WebPage::loadWebArchiveData):
(WebKit::WebPage::postInjectedBundleMessage):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.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 (177795 => 177796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 18:38:07 UTC (rev 177795)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 19:02:08 UTC (rev 177796)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-12-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Convert all variadic web process messages to UserData
+ https://bugs.webkit.org/show_bug.cgi?id=139991
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadRequest):
+ (WebKit::WebPageProxy::loadFile):
+ (WebKit::WebPageProxy::loadData):
+ (WebKit::WebPageProxy::loadHTMLString):
+ (WebKit::WebPageProxy::loadAlternateHTMLString):
+ (WebKit::WebPageProxy::loadPlainTextString):
+ (WebKit::WebPageProxy::loadWebArchiveData):
+ (WebKit::WebPageProxy::postMessageToInjectedBundle):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadRequest):
+ (WebKit::WebPage::loadDataImpl):
+ (WebKit::WebPage::loadString):
+ (WebKit::WebPage::loadData):
+ (WebKit::WebPage::loadHTMLString):
+ (WebKit::WebPage::loadAlternateHTMLString):
+ (WebKit::WebPage::loadPlainTextString):
+ (WebKit::WebPage::loadWebArchiveData):
+ (WebKit::WebPage::postInjectedBundleMessage):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
+2014-12-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Convert all variadic WebProcessProxy message over to UserData
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139990
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177795 => 177796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-29 18:38:07 UTC (rev 177795)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-29 19:02:08 UTC (rev 177796)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> bool createdExtension = maybeInitializeSandboxExtensionHandle(request.url(), sandboxExtensionHandle);
</span><span class="cx"> if (createdExtension)
</span><span class="cx"> m_process->willAcquireUniversalFileReadSandboxExtension();
</span><del>- m_process->send(Messages::WebPage::LoadRequest(navigationID, request, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(navigationID, request, sandboxExtensionHandle, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return navigationID;
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> SandboxExtension::Handle sandboxExtensionHandle;
</span><span class="cx"> SandboxExtension::createHandle(resourceDirectoryPath, SandboxExtension::ReadOnly, sandboxExtensionHandle);
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(resourceDirectoryURL);
</span><del>- m_process->send(Messages::WebPage::LoadRequest(navigationID, fileURL, sandboxExtensionHandle, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadRequest(navigationID, fileURL, sandboxExtensionHandle, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return navigationID;
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><del>- m_process->send(Messages::WebPage::LoadData(data->dataReference(), MIMEType, encoding, baseURL, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadData(data->dataReference(), MIMEType, encoding, baseURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return navigationID;
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><del>- m_process->send(Messages::WebPage::LoadHTMLString(navigationID, htmlString, baseURL, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadHTMLString(navigationID, htmlString, baseURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx">
</span><span class="cx"> return navigationID;
</span><span class="lines">@@ -846,7 +846,7 @@
</span><span class="cx"> m_mainFrame->setUnreachableURL(unreachableURL);
</span><span class="cx">
</span><span class="cx"> m_process->assumeReadAccessToBaseURL(baseURL);
</span><del>- m_process->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadAlternateHTMLString(htmlString, baseURL, unreachableURL, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::LoadPlainTextString(string, WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadPlainTextString(string, UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -870,7 +870,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::LoadWebArchiveData(webArchiveData->dataReference(), WebContextUserMessageEncoder(userData, process())), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::LoadWebArchiveData(webArchiveData->dataReference(), UserData(process().transformObjectsToHandles(userData).get())), m_pageID);
</ins><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3689,7 +3689,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><del>- process().send(Messages::WebPage::PostInjectedBundleMessage(messageName, WebContextUserMessageEncoder(messageBody, process())), m_pageID);
</del><ins>+ process().send(Messages::WebPage::PostInjectedBundleMessage(messageName, UserData(process().transformObjectsToHandles(messageBody).get())), m_pageID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (177795 => 177796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-29 18:38:07 UTC (rev 177795)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-29 19:02:08 UTC (rev 177796)
</span><span class="lines">@@ -1052,22 +1052,17 @@
</span><span class="cx"> frame->coreFrame()->loader().load(FrameLoadRequest(frame->coreFrame(), ResourceRequest(URL(URL(), url))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadRequest(uint64_t navigationID, const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadRequest(uint64_t navigationID, const ResourceRequest& request, const SandboxExtension::Handle& sandboxExtensionHandle, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> SendStopResponsivenessTimer stopper(this);
</span><span class="cx">
</span><del>- RefPtr<API::Object> userData;
- InjectedBundleUserMessageDecoder userMessageDecoder(userData);
- if (!decoder.decode(userMessageDecoder))
- return;
-
</del><span class="cx"> m_pendingNavigationID = navigationID;
</span><span class="cx">
</span><span class="cx"> m_sandboxExtensionTracker.beginLoad(m_mainFrame.get(), sandboxExtensionHandle);
</span><span class="cx">
</span><span class="cx"> // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx"> // to all the client to set up any needed state.
</span><del>- m_loaderClient.willLoadURLRequest(this, request, userData.get());
</del><ins>+ m_loaderClient.willLoadURLRequest(this, request, WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</ins><span class="cx">
</span><span class="cx"> // Initate the load in WebCore.
</span><span class="cx"> corePage()->userInputBridge().loadRequest(FrameLoadRequest(m_mainFrame->coreFrame(), request));
</span><span class="lines">@@ -1075,15 +1070,10 @@
</span><span class="cx"> ASSERT(!m_pendingNavigationID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadDataImpl(uint64_t navigationID, PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadDataImpl(uint64_t navigationID, PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> SendStopResponsivenessTimer stopper(this);
</span><span class="cx">
</span><del>- RefPtr<API::Object> userData;
- InjectedBundleUserMessageDecoder userMessageDecoder(userData);
- if (!decoder.decode(userMessageDecoder))
- return;
-
</del><span class="cx"> m_pendingNavigationID = navigationID;
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(baseURL);
</span><span class="lines">@@ -1091,52 +1081,52 @@
</span><span class="cx">
</span><span class="cx"> // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx"> // to all the client to set up any needed state.
</span><del>- m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), userData.get());
</del><ins>+ m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</ins><span class="cx">
</span><span class="cx"> // Initate the load in WebCore.
</span><span class="cx"> m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadString(uint64_t navigationID, const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadString(uint64_t navigationID, const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!htmlString.isNull() && htmlString.is8Bit()) {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
</span><del>- loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, decoder);
</del><ins>+ loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, userData);
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
</span><del>- loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, decoder);
</del><ins>+ loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, userData);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadData(const IPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadData(const IPC::DataReference& data, const String& MIMEType, const String& encodingName, const String& baseURLString, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(data.data()), data.size());
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><del>- loadDataImpl(0, sharedBuffer, MIMEType, encodingName, baseURL, URL(), decoder);
</del><ins>+ loadDataImpl(0, sharedBuffer, MIMEType, encodingName, baseURL, URL(), userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURLString, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURLString, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><del>- loadString(navigationID, htmlString, ASCIILiteral("text/html"), baseURL, URL(), decoder);
</del><ins>+ loadString(navigationID, htmlString, ASCIILiteral("text/html"), baseURL, URL(), userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadAlternateHTMLString(const String& htmlString, const String& baseURLString, const String& unreachableURLString, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> URL baseURL = baseURLString.isEmpty() ? blankURL() : URL(URL(), baseURLString);
</span><span class="cx"> URL unreachableURL = unreachableURLString.isEmpty() ? URL() : URL(URL(), unreachableURLString);
</span><del>- loadString(0, htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, decoder);
</del><ins>+ loadString(0, htmlString, ASCIILiteral("text/html"), baseURL, unreachableURL, userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadPlainTextString(const String& string, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadPlainTextString(const String& string, const UserData& userData)
</ins><span class="cx"> {
</span><del>- loadString(0, string, ASCIILiteral("text/plain"), blankURL(), URL(), decoder);
</del><ins>+ loadString(0, string, ASCIILiteral("text/plain"), blankURL(), URL(), userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::loadWebArchiveData(const IPC::DataReference& webArchiveData, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::loadWebArchiveData(const IPC::DataReference& webArchiveData, const UserData& userData)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(webArchiveData.data()), webArchiveData.size() * sizeof(uint8_t));
</span><del>- loadDataImpl(0, sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), decoder);
</del><ins>+ loadDataImpl(0, sharedBuffer, ASCIILiteral("application/x-webarchive"), ASCIILiteral("utf-16"), blankURL(), URL(), userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::navigateToURLWithSimulatedClick(const String& url, IntPoint documentPoint, IntPoint screenPoint)
</span><span class="lines">@@ -1600,18 +1590,13 @@
</span><span class="cx"> m_page->setPagination(pagination);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::postInjectedBundleMessage(const String& messageName, IPC::MessageDecoder& decoder)
</del><ins>+void WebPage::postInjectedBundleMessage(const String& messageName, const UserData& userData)
</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>- RefPtr<API::Object> messageBody;
- InjectedBundleUserMessageDecoder messageBodyDecoder(messageBody);
- if (!decoder.decode(messageBodyDecoder))
- return;
-
- injectedBundle->didReceiveMessageToPage(this, messageName, messageBody.get());
</del><ins>+ injectedBundle->didReceiveMessageToPage(this, messageName, WebProcess::shared().transformHandlesToObjects(userData.object()).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (177795 => 177796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-12-29 18:38:07 UTC (rev 177795)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-12-29 19:02:08 UTC (rev 177796)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "ShareableBitmap.h"
</span><ins>+#include "UserData.h"
</ins><span class="cx"> #include "UserMediaPermissionRequestManager.h"
</span><span class="cx"> #include <WebCore/DictationAlternative.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="lines">@@ -374,7 +375,7 @@
</span><span class="cx"> void setPageLength(double);
</span><span class="cx"> void setGapBetweenPages(double);
</span><span class="cx">
</span><del>- void postInjectedBundleMessage(const String& messageName, IPC::MessageDecoder&);
</del><ins>+ void postInjectedBundleMessage(const String& messageName, const UserData&);
</ins><span class="cx">
</span><span class="cx"> bool drawsBackground() const { return m_drawsBackground; }
</span><span class="cx"> bool drawsTransparentBackground() const { return m_drawsTransparentBackground; }
</span><span class="lines">@@ -907,19 +908,19 @@
</span><span class="cx">
</span><span class="cx"> String sourceForFrame(WebFrame*);
</span><span class="cx">
</span><del>- void loadDataImpl(uint64_t navigationID, PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
- void loadString(uint64_t navigationID, const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, IPC::MessageDecoder&);
</del><ins>+ void loadDataImpl(uint64_t navigationID, PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, const UserData&);
+ void loadString(uint64_t navigationID, const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, const UserData&);
</ins><span class="cx">
</span><span class="cx"> bool platformHasLocalDataForURL(const WebCore::URL&);
</span><span class="cx">
</span><span class="cx"> // Actions
</span><span class="cx"> void tryClose();
</span><del>- void loadRequest(uint64_t navigationID, const WebCore::ResourceRequest&, const SandboxExtension::Handle&, IPC::MessageDecoder&);
- void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, IPC::MessageDecoder&);
- void loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURL, IPC::MessageDecoder&);
- void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, IPC::MessageDecoder&);
- void loadPlainTextString(const String&, IPC::MessageDecoder&);
- void loadWebArchiveData(const IPC::DataReference&, IPC::MessageDecoder&);
</del><ins>+ void loadRequest(uint64_t navigationID, const WebCore::ResourceRequest&, const SandboxExtension::Handle&, const UserData&);
+ void loadData(const IPC::DataReference&, const String& MIMEType, const String& encodingName, const String& baseURL, const UserData&);
+ void loadHTMLString(uint64_t navigationID, const String& htmlString, const String& baseURL, const UserData&);
+ void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, const UserData&);
+ void loadPlainTextString(const String&, const UserData&);
+ void loadWebArchiveData(const IPC::DataReference&, const UserData&);
</ins><span class="cx"> void navigateToURLWithSimulatedClick(const String& url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint);
</span><span class="cx"> void reload(uint64_t navigationID, bool reloadFromOrigin, const SandboxExtension::Handle&);
</span><span class="cx"> void goForward(uint64_t navigationID, uint64_t);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (177795 => 177796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-29 18:38:07 UTC (rev 177795)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-12-29 19:02:08 UTC (rev 177796)
</span><span class="lines">@@ -123,12 +123,12 @@
</span><span class="cx"> TryRestoreScrollPosition()
</span><span class="cx">
</span><span class="cx"> LoadURLInFrame(String url, uint64_t frameID)
</span><del>- LoadRequest(uint64_t navigationID, WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadHTMLString(uint64_t navigationID, String htmlString, String baseURL, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadPlainTextString(String string, WebKit::WebContextUserMessageEncoder userData) Variadic
- LoadWebArchiveData(IPC::DataReference webArchiveData, WebKit::WebContextUserMessageEncoder userData) Variadic
</del><ins>+ LoadRequest(uint64_t navigationID, WebCore::ResourceRequest request, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::UserData userData)
+ LoadData(IPC::DataReference data, String MIMEType, String encoding, String baseURL, WebKit::UserData userData)
+ LoadHTMLString(uint64_t navigationID, String htmlString, String baseURL, WebKit::UserData userData)
+ LoadAlternateHTMLString(String htmlString, String baseURL, String unreachableURL, WebKit::UserData userData)
+ LoadPlainTextString(String string, WebKit::UserData userData)
+ LoadWebArchiveData(IPC::DataReference webArchiveData, WebKit::UserData userData)
</ins><span class="cx"> NavigateToURLWithSimulatedClick(String url, WebCore::IntPoint documentPoint, WebCore::IntPoint screenPoint)
</span><span class="cx">
</span><span class="cx"> Reload(uint64_t navigationID, bool reloadFromOrigin, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> SetPageLength(double pageLength)
</span><span class="cx"> SetGapBetweenPages(double gap)
</span><span class="cx">
</span><del>- PostInjectedBundleMessage(String messageName, WebKit::WebContextUserMessageEncoder messageBody) Variadic
</del><ins>+ PostInjectedBundleMessage(String messageName, WebKit::UserData messageBody)
</ins><span class="cx">
</span><span class="cx"> # Find.
</span><span class="cx"> FindString(String string, uint32_t findOptions, unsigned maxMatchCount)
</span></span></pre>
</div>
</div>
</body>
</html>