<!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>[167853] trunk/Source</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/167853">167853</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-04-27 04:53:43 -0700 (Sun, 27 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Coalesce responses on network process side
https://bugs.webkit.org/show_bug.cgi?id=132229
Reviewed by Andreas Kling.
Source/WebCore:
* WebCore.exp.in:
Source/WebKit2:
To reduce IPC we should coalesce response data in the network process and send it over with single IPC call.
* NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
(WebKit::AsynchronousNetworkLoaderClient::AsynchronousNetworkLoaderClient):
(WebKit::AsynchronousNetworkLoaderClient::didReceiveResponse):
(WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
(WebKit::AsynchronousNetworkLoaderClient::didFinishLoading):
(WebKit::AsynchronousNetworkLoaderClient::didFail):
(WebKit::AsynchronousNetworkLoaderClient::dispatchPartialCoalescedResponse):
(WebKit::AsynchronousNetworkLoaderClient::clearCoalescedResponse):
(WebKit::AsynchronousNetworkLoaderClient::responseCoalesceTimerFired):
Coalesce the response. Completed response is sent on didFinishLoading. If the coalesce timer fires
before that the data accumulated so far is dispatched.
* NetworkProcess/AsynchronousNetworkLoaderClient.h:
* NetworkProcess/NetworkResourceLoader.h:
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveCompleteResponse):
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Network/WebResourceLoader.messages.in:
Add a new message type that covers didReceiveResponse, didReceiveBuffer and didFinishLoading in a single message.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp">trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClienth">trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebCore/ChangeLog 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-27 Antti Koivisto <antti@apple.com>
+
+ Coalesce responses on network process side
+ https://bugs.webkit.org/show_bug.cgi?id=132229
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-04-27 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out changes not part of the patch reviewed for Bug 132089
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -233,6 +233,7 @@
</span><span class="cx"> __ZN7WebCore12SharedBuffer12createNSDataEv
</span><span class="cx"> __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore12SharedBuffer6appendEPKcj
</span><ins>+__ZN7WebCore12SharedBuffer6appendEPS0_
</ins><span class="cx"> __ZN7WebCore12SharedBufferC1EPKcj
</span><span class="cx"> __ZN7WebCore12SharedBufferC1EPKhj
</span><span class="cx"> __ZN7WebCore12SharedBufferC1Ev
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-04-27 Antti Koivisto <antti@apple.com>
+
+ Coalesce responses on network process side
+ https://bugs.webkit.org/show_bug.cgi?id=132229
+
+ Reviewed by Andreas Kling.
+
+ To reduce IPC we should coalesce response data in the network process and send it over with single IPC call.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ (WebKit::AsynchronousNetworkLoaderClient::AsynchronousNetworkLoaderClient):
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveResponse):
+ (WebKit::AsynchronousNetworkLoaderClient::didReceiveBuffer):
+ (WebKit::AsynchronousNetworkLoaderClient::didFinishLoading):
+ (WebKit::AsynchronousNetworkLoaderClient::didFail):
+ (WebKit::AsynchronousNetworkLoaderClient::dispatchPartialCoalescedResponse):
+ (WebKit::AsynchronousNetworkLoaderClient::clearCoalescedResponse):
+ (WebKit::AsynchronousNetworkLoaderClient::responseCoalesceTimerFired):
+
+ Coalesce the response. Completed response is sent on didFinishLoading. If the coalesce timer fires
+ before that the data accumulated so far is dispatched.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.h:
+ * NetworkProcess/NetworkResourceLoader.h:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveCompleteResponse):
+ * WebProcess/Network/WebResourceLoader.h:
+ * WebProcess/Network/WebResourceLoader.messages.in:
+
+ Add a new message type that covers didReceiveResponse, didReceiveBuffer and didFinishLoading in a single message.
+
</ins><span class="cx"> 2014-04-26 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167775): Safari crashes in ViewSnapshotStore::pruneSnapshots after loading 20 pages
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> AsynchronousNetworkLoaderClient::AsynchronousNetworkLoaderClient()
</span><ins>+ : m_responseCoalescingTimer(RunLoop::main(), this, &AsynchronousNetworkLoaderClient::responseCoalescingTimerFired)
+ , m_coalescingLoader(nullptr)
+ , m_coalescingResponseEncodedDataLength(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -63,6 +66,17 @@
</span><span class="cx">
</span><span class="cx"> void AsynchronousNetworkLoaderClient::didReceiveResponse(NetworkResourceLoader* loader, const ResourceResponse& response)
</span><span class="cx"> {
</span><ins>+ if (!loader->isLoadingMainResource()) {
+ ASSERT(!m_coalescingLoader);
+ m_coalescingResponse = response;
+ m_coalescingLoader = loader;
+
+ // FIXME: Some resources can only be used when completely loaded. We should always delay those until completion.
+ static const double responseCoalescingTime = 0.1;
+ m_responseCoalescingTimer.startOneShot(responseCoalescingTime);
+ return;
+ }
+
</ins><span class="cx"> loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(response, CertificateInfo(response), loader->isLoadingMainResource()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,6 +86,12 @@
</span><span class="cx"> ShareableResource::Handle shareableResourceHandle;
</span><span class="cx"> NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer);
</span><span class="cx"> if (!shareableResourceHandle.isNull()) {
</span><ins>+ if (m_responseCoalescingTimer.isActive()) {
+ ASSERT(!m_coalescingResponse.isNull());
+ ASSERT(!m_coalescingResponseData);
+ loader->send(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(m_coalescingResponse, CertificateInfo(m_coalescingResponse), false));
+ clearCoalescedResponse();
+ }
</ins><span class="cx"> // Since we're delivering this resource by ourselves all at once and don't need anymore data or callbacks from the network layer, abort the loader.
</span><span class="cx"> loader->abort();
</span><span class="cx"> loader->send(Messages::WebResourceLoader::DidReceiveResource(shareableResourceHandle, currentTime()));
</span><span class="lines">@@ -79,6 +99,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx">
</span><ins>+ if (m_responseCoalescingTimer.isActive()) {
+ ASSERT(m_coalescingLoader == loader);
+ ASSERT(!m_coalescingResponse.isNull());
+ if (m_coalescingResponseData)
+ m_coalescingResponseData->append(buffer);
+ else
+ m_coalescingResponseData = buffer;
+ m_coalescingResponseEncodedDataLength += encodedDataLength;
+ return;
+ }
+
</ins><span class="cx"> IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
</span><span class="cx"> loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));
</span><span class="cx"> }
</span><span class="lines">@@ -90,14 +121,58 @@
</span><span class="cx">
</span><span class="cx"> void AsynchronousNetworkLoaderClient::didFinishLoading(NetworkResourceLoader* loader, double finishTime)
</span><span class="cx"> {
</span><ins>+ if (m_responseCoalescingTimer.isActive()) {
+ ASSERT(!m_coalescingResponse.isNull());
+ IPC::DataReference dataReference;
+ if (m_coalescingResponseData)
+ dataReference = IPC::DataReference(reinterpret_cast<const uint8_t*>(m_coalescingResponseData->data()), m_coalescingResponseData->size());
+
+ loader->send(Messages::WebResourceLoader::DidReceiveCompleteResponse(m_coalescingResponse, CertificateInfo(m_coalescingResponse), dataReference, m_coalescingResponseEncodedDataLength, finishTime));
+ clearCoalescedResponse();
+ return;
+ }
+
</ins><span class="cx"> loader->send(Messages::WebResourceLoader::DidFinishResourceLoad(finishTime));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsynchronousNetworkLoaderClient::didFail(NetworkResourceLoader* loader, const ResourceError& error)
</span><span class="cx"> {
</span><ins>+ if (m_responseCoalescingTimer.isActive())
+ dispatchPartialCoalescedResponse(loader);
+
</ins><span class="cx"> loader->send(Messages::WebResourceLoader::DidFailResourceLoad(error));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AsynchronousNetworkLoaderClient::dispatchPartialCoalescedResponse(NetworkResourceLoader* loader)
+{
+ ASSERT(m_coalescingLoader == loader);
+ ASSERT(!m_coalescingResponse.isNull());
+ loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveResponseWithCertificateInfo(m_coalescingResponse, CertificateInfo(m_coalescingResponse), false));
+
+ if (m_coalescingResponseData) {
+ IPC::DataReference dataReference(reinterpret_cast<const uint8_t*>(m_coalescingResponseData->data()), m_coalescingResponseData->size());
+ loader->sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, m_coalescingResponseEncodedDataLength));
+ }
+
+ clearCoalescedResponse();
+}
+
+void AsynchronousNetworkLoaderClient::clearCoalescedResponse()
+{
+ m_coalescingResponse = ResourceResponse();
+ m_coalescingLoader = nullptr;
+ m_coalescingResponseData = nullptr;
+ m_coalescingResponseEncodedDataLength = 0;
+ m_responseCoalescingTimer.stop();
+}
+
+void AsynchronousNetworkLoaderClient::responseCoalescingTimerFired()
+{
+ ASSERT(m_coalescingLoader);
+ dispatchPartialCoalescedResponse(m_coalescingLoader);
+}
+
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETWORK_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessAsynchronousNetworkLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include "NetworkLoaderClient.h"
</span><span class="cx"> #include "ShareableResource.h"
</span><ins>+#include <WebCore/ResourceResponse.h>
+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx">
</span><span class="lines">@@ -47,6 +49,16 @@
</span><span class="cx"> virtual void didSendData(NetworkResourceLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="cx"> virtual void didFinishLoading(NetworkResourceLoader*, double finishTime) override;
</span><span class="cx"> virtual void didFail(NetworkResourceLoader*, const WebCore::ResourceError&) override;
</span><ins>+
+ void dispatchPartialCoalescedResponse(NetworkResourceLoader*);
+ void clearCoalescedResponse();
+ void responseCoalescingTimerFired();
+
+ RunLoop::Timer<AsynchronousNetworkLoaderClient> m_responseCoalescingTimer;
+ NetworkResourceLoader* m_coalescingLoader;
+ WebCore::ResourceResponse m_coalescingResponse;
+ RefPtr<WebCore::SharedBuffer> m_coalescingResponseData;
+ long long m_coalescingResponseEncodedDataLength;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <WebCore/ResourceHandleClient.h>
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><ins>+#include <WebCore/ResourceResponse.h>
</ins><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -130,6 +130,22 @@
</span><span class="cx"> send(Messages::NetworkResourceLoader::ContinueDidReceiveResponse());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebResourceLoader::didReceiveCompleteResponse(const ResourceResponse& response, const CertificateInfo& certificateInfo, const IPC::DataReference& data, int64_t encodedDataLength, double finishTime)
+{
+ LOG(Network, "(WebProcess) WebResourceLoader::didReceiveCompleteResponse for '%s'. Status %d.", m_coreLoader->url().string().utf8().data(), response.httpStatusCode());
+
+ Ref<WebResourceLoader> protect(*this);
+
+ didReceiveResponseWithCertificateInfo(response, certificateInfo, false);
+ if (!m_coreLoader)
+ return;
+ if (!data.isEmpty())
+ didReceiveData(data, encodedDataLength);
+ if (!m_coreLoader)
+ return;
+ didFinishResourceLoad(finishTime);
+}
+
</ins><span class="cx"> void WebResourceLoader::didReceiveData(const IPC::DataReference& data, int64_t encodedDataLength)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %i for '%s'", (int)data.size(), m_coreLoader->url().string().utf8().data());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
</span><span class="cx"> void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent);
</span><span class="cx"> void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, bool needsContinueDidReceiveResponseMessage);
</span><ins>+ void didReceiveCompleteResponse(const WebCore::ResourceResponse&, const WebCore::CertificateInfo&, const IPC::DataReference&, int64_t encodedDataLength, double finishTime);
</ins><span class="cx"> void didReceiveData(const IPC::DataReference&, int64_t encodedDataLength);
</span><span class="cx"> void didFinishResourceLoad(double finishTime);
</span><span class="cx"> void didFailResourceLoad(const WebCore::ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in (167852 => 167853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2014-04-27 08:15:13 UTC (rev 167852)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2014-04-27 11:53:43 UTC (rev 167853)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
</span><span class="cx"> DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
</span><span class="cx"> DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, bool needsContinueDidReceiveResponseMessage)
</span><ins>+ DidReceiveCompleteResponse(WebCore::ResourceResponse response, WebCore::CertificateInfo certificateInfo, IPC::DataReference data, int64_t encodedDataLength, double finishTime)
</ins><span class="cx"> DidReceiveData(IPC::DataReference data, int64_t encodedDataLength)
</span><span class="cx"> DidFinishResourceLoad(double finishTime)
</span><span class="cx"> DidFailResourceLoad(WebCore::ResourceError error)
</span></span></pre>
</div>
</div>
</body>
</html>