<!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>[202154] 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/202154">202154</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 19:50:30 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>No need to ref connection in lambda inside NetworkResourceLoader::tryStoreAsCacheEntry()
https://bugs.webkit.org/show_bug.cgi?id=158862
Reviewed by Darin Adler.
Source/WebKit2:
No need to ref connection in lambda inside NetworkResourceLoader::tryStoreAsCacheEntry().
We already ref the NetworkResourceLoader which hold a ref to the connection. Also update
the lambda capture to use Ref<> for the NetworkResourceLoader instead of RefPtr<>.
Switch callback type from std::function to WTF::NoncopyableFunction so we can capture a
Ref<>.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::store):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::WriteOperation::WriteOperation):
* NetworkProcess/cache/NetworkCacheStorage.h:
Source/WTF:
Add NoncopyableFunction constructor that takes a nullptr_t in, in order
to match the std::function API and make porting from one to the other
easier.
* wtf/NoncopyableFunction.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfNoncopyableFunctionh">trunk/Source/WTF/wtf/NoncopyableFunction.h</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WTF/ChangeLog 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ No need to ref connection in lambda inside NetworkResourceLoader::tryStoreAsCacheEntry()
+ https://bugs.webkit.org/show_bug.cgi?id=158862
+
+ Reviewed by Darin Adler.
+
+ Add NoncopyableFunction constructor that takes a nullptr_t in, in order
+ to match the std::function API and make porting from one to the other
+ easier.
+
+ * wtf/NoncopyableFunction.h:
+
+2016-06-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Unreviewed, rolling out r202002 and r202111.
</span><span class="cx">
</span><span class="cx"> Ryosuke says this was a JSBench regression on iOS
</span></span></pre></div>
<a id="trunkSourceWTFwtfNoncopyableFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/NoncopyableFunction.h (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WTF/wtf/NoncopyableFunction.h 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> class NoncopyableFunction<Out(In...)> {
</span><span class="cx"> public:
</span><span class="cx"> NoncopyableFunction() = default;
</span><ins>+ NoncopyableFunction(std::nullptr_t) { }
</ins><span class="cx">
</span><span class="cx"> template<typename CallableType, class = typename std::enable_if<std::is_rvalue_reference<CallableType&&>::value>::type>
</span><span class="cx"> NoncopyableFunction(CallableType&& callable)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-06-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ No need to ref connection in lambda inside NetworkResourceLoader::tryStoreAsCacheEntry()
+ https://bugs.webkit.org/show_bug.cgi?id=158862
+
+ Reviewed by Darin Adler.
+
+ No need to ref connection in lambda inside NetworkResourceLoader::tryStoreAsCacheEntry().
+ We already ref the NetworkResourceLoader which hold a ref to the connection. Also update
+ the lambda capture to use Ref<> for the NetworkResourceLoader instead of RefPtr<>.
+ Switch callback type from std::function to WTF::NoncopyableFunction so we can capture a
+ Ref<>.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::store):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::WriteOperation::WriteOperation):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
+2016-06-16 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2] Improve serialization of SubresourcesEntry to network disk cache
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158851
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -515,10 +515,7 @@
</span><span class="cx"> if (!m_bufferedDataForCache)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Keep the connection alive.
- RefPtr<NetworkConnectionToWebProcess> connection(&connectionToWebProcess());
- RefPtr<NetworkResourceLoader> loader(this);
- NetworkCache::singleton().store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader, connection](auto& mappedBody) {
</del><ins>+ NetworkCache::singleton().store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader = Ref<NetworkResourceLoader>(*this)](auto& mappedBody) mutable {
</ins><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> if (mappedBody.shareableResourceHandle.isNull())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<Entry> Cache::store(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, RefPtr<WebCore::SharedBuffer>&& responseData, std::function<void (MappedBody&)>&& completionHandler)
</del><ins>+std::unique_ptr<Entry> Cache::store(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, RefPtr<WebCore::SharedBuffer>&& responseData, NoncopyableFunction<void (MappedBody&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx"> ASSERT(responseData);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> // Completion handler may get called back synchronously on failure.
</span><span class="cx"> void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, std::function<void (std::unique_ptr<Entry>)>&&);
</span><del>- std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, std::function<void (MappedBody&)>&&);
</del><ins>+ std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, NoncopyableFunction<void (MappedBody&)>&&);
</ins><span class="cx"> std::unique_ptr<Entry> storeRedirect(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, const WebCore::ResourceRequest& redirectRequest);
</span><span class="cx"> std::unique_ptr<Entry> update(const WebCore::ResourceRequest&, const GlobalFrameID&, const Entry&, const WebCore::ResourceResponse& validatingResponse);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> struct Storage::WriteOperation {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WriteOperation(const Record& record, const MappedBodyHandler& mappedBodyHandler)
</del><ins>+ WriteOperation(const Record& record, MappedBodyHandler&& mappedBodyHandler)
</ins><span class="cx"> : record(record)
</span><del>- , mappedBodyHandler(mappedBodyHandler)
</del><ins>+ , mappedBodyHandler(WTFMove(mappedBodyHandler))
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> const Record record;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (202153 => 202154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-06-17 02:30:43 UTC (rev 202153)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2016-06-17 02:50:30 UTC (rev 202154)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> typedef std::function<bool (std::unique_ptr<Record>)> RetrieveCompletionHandler;
</span><span class="cx"> void retrieve(const Key&, unsigned priority, RetrieveCompletionHandler&&);
</span><span class="cx">
</span><del>- typedef std::function<void (const Data& mappedBody)> MappedBodyHandler;
</del><ins>+ typedef NoncopyableFunction<void (const Data& mappedBody)> MappedBodyHandler;
</ins><span class="cx"> void store(const Record&, MappedBodyHandler&&);
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span></span></pre>
</div>
</div>
</body>
</html>