<!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>[170928] 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/170928">170928</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-07-09 13:55:35 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
https://bugs.webkit.org/show_bug.cgi?id=134732
Reviewed by Darin Adler.
Source/WebCore:
No new tests because no functional changes.
* WebCore.exp.in:
Source/WebKit2:
Buffer the resource in NetworkResourceLoader instead of SynchronousNetworkLoaderClient. This
is in preparation for bug 134560 where we will be supporting JS and CSS resource buffering
that uses AsynchronousNetworkLoaderClient.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
(WebKit::NetworkResourceLoader::didReceiveBuffer):
(WebKit::NetworkResourceLoader::didFinishLoading):
* NetworkProcess/NetworkResourceLoader.h:
(WebKit::NetworkResourceLoader::bufferedData):
* NetworkProcess/SynchronousNetworkLoaderClient.cpp:
(WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
(WebKit::SynchronousNetworkLoaderClient::didFinishLoading):
(WebKit::SynchronousNetworkLoaderClient::didFail):
(WebKit::SynchronousNetworkLoaderClient::sendDelayedReply):
* NetworkProcess/SynchronousNetworkLoaderClient.h:</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="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp">trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth">trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-07-09 Pratik Solanki <psolanki@apple.com>
+
+ Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=134732
+
+ Reviewed by Darin Adler.
+
+ No new tests because no functional changes.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-07-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the !USE(IOSURFACE) build.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -244,6 +244,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 (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-07-09 Pratik Solanki <psolanki@apple.com>
+
+ Move resource buffering from SynchronousNetworkLoaderClient to NetworkResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=134732
+
+ Reviewed by Darin Adler.
+
+ Buffer the resource in NetworkResourceLoader instead of SynchronousNetworkLoaderClient. This
+ is in preparation for bug 134560 where we will be supporting JS and CSS resource buffering
+ that uses AsynchronousNetworkLoaderClient.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+ (WebKit::NetworkResourceLoader::didReceiveBuffer):
+ (WebKit::NetworkResourceLoader::didFinishLoading):
+ * NetworkProcess/NetworkResourceLoader.h:
+ (WebKit::NetworkResourceLoader::bufferedData):
+ * NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+ (WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
+ (WebKit::SynchronousNetworkLoaderClient::didFinishLoading):
+ (WebKit::SynchronousNetworkLoaderClient::didFail):
+ (WebKit::SynchronousNetworkLoaderClient::sendDelayedReply):
+ * NetworkProcess/SynchronousNetworkLoaderClient.h:
+
</ins><span class="cx"> 2014-07-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] subviews of the unscaled view drift out during CA animations
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -99,9 +99,10 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- if (reply)
</del><ins>+ if (reply) {
</ins><span class="cx"> m_networkLoaderClient = std::make_unique<SynchronousNetworkLoaderClient>(m_request, reply);
</span><del>- else
</del><ins>+ m_bufferedData = WebCore::SharedBuffer::create();
+ } else
</ins><span class="cx"> m_networkLoaderClient = std::make_unique<AsynchronousNetworkLoaderClient>();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,13 +215,20 @@
</span><span class="cx"> // Such buffering will need to be thread safe, as this callback is happening on a background thread.
</span><span class="cx">
</span><span class="cx"> m_bytesReceived += buffer->size();
</span><del>- m_networkLoaderClient->didReceiveBuffer(this, buffer.get(), encodedDataLength);
</del><ins>+ if (m_bufferedData)
+ m_bufferedData->append(buffer.get());
+ else
+ m_networkLoaderClient->didReceiveBuffer(this, buffer.get(), encodedDataLength);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFinishLoading(ResourceHandle* handle, double finishTime)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="cx">
</span><ins>+ // Send the full resource data if we were buffering it.
+ if (m_bufferedData && m_bufferedData->size())
+ m_networkLoaderClient->didReceiveBuffer(this, m_bufferedData.get(), m_bufferedData->size());
+
</ins><span class="cx"> m_networkLoaderClient->didFinishLoading(this, finishTime);
</span><span class="cx">
</span><span class="cx"> cleanup();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -147,6 +147,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> void continueWillSendRequest(const WebCore::ResourceRequest& newRequest);
</span><span class="cx">
</span><ins>+ WebCore::SharedBuffer* bufferedData() const { return m_bufferedData.get(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> NetworkResourceLoader(const NetworkResourceLoadParameters&, NetworkConnectionToWebProcess*, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
</span><span class="cx">
</span><span class="lines">@@ -196,6 +198,7 @@
</span><span class="cx"> RefPtr<NetworkConnectionToWebProcess> m_connection;
</span><span class="cx">
</span><span class="cx"> RefPtr<HostRecord> m_hostRecord;
</span><ins>+ RefPtr<WebCore::SharedBuffer> m_bufferedData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -81,30 +81,24 @@
</span><span class="cx"> m_response = response;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SynchronousNetworkLoaderClient::didReceiveBuffer(NetworkResourceLoader*, SharedBuffer* buffer, int /* encodedDataLength */)
</del><ins>+void SynchronousNetworkLoaderClient::didReceiveBuffer(NetworkResourceLoader*, SharedBuffer*, int /* encodedDataLength */)
</ins><span class="cx"> {
</span><del>- // FIXME: There's a potential performance improvement here by preallocating a SharedMemory region
- // of the expected content length to avoid a copy when we send it to the WebProcess on completion.
- // It's unclear if the potential complexities of that approach are worth it.
-
- if (!m_responseData)
- m_responseData = std::make_unique<Vector<char>>();
-
- m_responseData->append(buffer->data(), buffer->size());
</del><ins>+ // Nothing to do here. Data is buffered in NetworkResourceLoader and we will grab it from there
+ // in sendDelayedReply().
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SynchronousNetworkLoaderClient::didFinishLoading(NetworkResourceLoader*, double /* finishTime */)
</del><ins>+void SynchronousNetworkLoaderClient::didFinishLoading(NetworkResourceLoader* loader, double /* finishTime */)
</ins><span class="cx"> {
</span><del>- sendDelayedReply();
</del><ins>+ sendDelayedReply(*loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SynchronousNetworkLoaderClient::didFail(NetworkResourceLoader*, const ResourceError& error)
</del><ins>+void SynchronousNetworkLoaderClient::didFail(NetworkResourceLoader* loader, const ResourceError& error)
</ins><span class="cx"> {
</span><span class="cx"> m_error = error;
</span><del>- sendDelayedReply();
</del><ins>+ sendDelayedReply(*loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SynchronousNetworkLoaderClient::sendDelayedReply()
</del><ins>+void SynchronousNetworkLoaderClient::sendDelayedReply(NetworkResourceLoader& loader)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_delayedReply);
</span><span class="cx">
</span><span class="lines">@@ -113,7 +107,12 @@
</span><span class="cx"> //platformSynthesizeErrorResponse();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_delayedReply->send(m_error, m_response, m_responseData ? *m_responseData : Vector<char>());
</del><ins>+ Vector<char> responseData;
+ SharedBuffer* buffer = loader.bufferedData();
+ if (buffer && buffer->size())
+ responseData.append(buffer->data(), buffer->size());
+
+ m_delayedReply->send(m_error, m_response, responseData);
</ins><span class="cx"> m_delayedReply = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h (170927 => 170928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2014-07-09 20:52:35 UTC (rev 170927)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2014-07-09 20:55:35 UTC (rev 170928)
</span><span class="lines">@@ -60,14 +60,13 @@
</span><span class="cx"> virtual void didFinishLoading(NetworkResourceLoader*, double finishTime) override;
</span><span class="cx"> virtual void didFail(NetworkResourceLoader*, const WebCore::ResourceError&) override;
</span><span class="cx">
</span><del>- void sendDelayedReply();
</del><ins>+ void sendDelayedReply(NetworkResourceLoader&);
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceRequest m_originalRequest;
</span><span class="cx"> WebCore::ResourceRequest m_currentRequest;
</span><span class="cx"> RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> m_delayedReply;
</span><span class="cx"> WebCore::ResourceResponse m_response;
</span><span class="cx"> WebCore::ResourceError m_error;
</span><del>- std::unique_ptr<Vector<char>> m_responseData;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>