<!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>[201484] 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/201484">201484</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-28 09:54:36 -0700 (Sat, 28 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize lambda captures in the network disk cache implementation
https://bugs.webkit.org/show_bug.cgi?id=158179
Reviewed by Darin Adler.
Modernize lambda captures in the network disk cache implementation.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::store):
(WebKit::NetworkCache::Cache::traverse):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::inputStreamReadReadyCallback):
(WebKit::NetworkCache::outputStreamWriteReadyCallback):
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
(WebKit::NetworkCache::Statistics::initialize):
(WebKit::NetworkCache::Statistics::shrinkIfNeeded):
(WebKit::NetworkCache::Statistics::queryWasEverRequested):
* NetworkProcess/cache/NetworkCacheStatistics.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::updateFileModificationTime):
(WebKit::NetworkCache::Storage::clear):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticsh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-28 Chris Dumez <cdumez@apple.com>
+
+ Modernize lambda captures in the network disk cache implementation
+ https://bugs.webkit.org/show_bug.cgi?id=158179
+
+ Reviewed by Darin Adler.
+
+ Modernize lambda captures in the network disk cache implementation.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::retrieve):
+ (WebKit::NetworkCache::Cache::store):
+ (WebKit::NetworkCache::Cache::traverse):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::inputStreamReadReadyCallback):
+ (WebKit::NetworkCache::outputStreamWriteReadyCallback):
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ (WebKit::NetworkCache::Statistics::initialize):
+ (WebKit::NetworkCache::Statistics::shrinkIfNeeded):
+ (WebKit::NetworkCache::Statistics::queryWasEverRequested):
+ * NetworkProcess/cache/NetworkCacheStatistics.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::updateFileModificationTime):
+ (WebKit::NetworkCache::Storage::clear):
+
</ins><span class="cx"> 2016-05-27 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] implement async functions proposal
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> return StoreDecision::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Cache::retrieve(const WebCore::ResourceRequest& request, const GlobalFrameID& frameID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
</del><ins>+void Cache::retrieve(const WebCore::ResourceRequest& request, const GlobalFrameID& frameID, std::function<void (std::unique_ptr<Entry>)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx"> ASSERT(request.url().protocolIsInHTTPFamily());
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> auto startTime = std::chrono::system_clock::now();
</span><span class="cx"> auto priority = static_cast<unsigned>(request.priority());
</span><span class="cx">
</span><del>- m_storage->retrieve(storageKey, priority, [this, request, completionHandler, startTime, storageKey, frameID](std::unique_ptr<Storage::Record> record) {
</del><ins>+ m_storage->retrieve(storageKey, priority, [this, request, completionHandler = WTFMove(completionHandler), startTime, storageKey, frameID](std::unique_ptr<Storage::Record> record) {
</ins><span class="cx"> if (!record) {
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) not found in storage");
</span><span class="cx">
</span><span class="lines">@@ -422,7 +422,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, std::function<void (MappedBody&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx"> ASSERT(responseData);
</span><span class="lines">@@ -446,11 +446,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::unique_ptr<Entry> cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, WTFMove(responseData), collectVaryingRequestHeaders(request, response));
-
</del><ins>+ auto cacheEntry = std::make_unique<Entry>(makeCacheKey(request), response, WTFMove(responseData), collectVaryingRequestHeaders(request, response));
</ins><span class="cx"> auto record = cacheEntry->encodeAsStorageRecord();
</span><span class="cx">
</span><del>- m_storage->store(record, [completionHandler](const Data& bodyData) {
</del><ins>+ m_storage->store(record, [completionHandler = WTFMove(completionHandler)](const Data& bodyData) {
</ins><span class="cx"> MappedBody mappedBody;
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> if (RefPtr<SharedMemory> sharedMemory = bodyData.tryCreateSharedMemory()) {
</span><span class="lines">@@ -521,7 +520,7 @@
</span><span class="cx"> remove(makeCacheKey(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Cache::traverse(const std::function<void (const TraversalEntry*)>& traverseHandler)
</del><ins>+void Cache::traverse(std::function<void (const TraversalEntry*)>&& traverseHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="cx">
</span><span class="lines">@@ -530,7 +529,7 @@
</span><span class="cx"> if (m_traverseCount >= maximumTraverseCount) {
</span><span class="cx"> WTFLogAlways("Maximum parallel cache traverse count exceeded. Ignoring traversal request.");
</span><span class="cx">
</span><del>- RunLoop::main().dispatch([traverseHandler] {
</del><ins>+ RunLoop::main().dispatch([traverseHandler = WTFMove(traverseHandler)] {
</ins><span class="cx"> traverseHandler(nullptr);
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="lines">@@ -538,7 +537,7 @@
</span><span class="cx">
</span><span class="cx"> ++m_traverseCount;
</span><span class="cx">
</span><del>- m_storage->traverse(resourceType(), 0, [this, traverseHandler](const Storage::Record* record, const Storage::RecordInfo& recordInfo) {
</del><ins>+ m_storage->traverse(resourceType(), 0, [this, traverseHandler = WTFMove(traverseHandler)](const Storage::Record* record, const Storage::RecordInfo& recordInfo) {
</ins><span class="cx"> if (!record) {
</span><span class="cx"> --m_traverseCount;
</span><span class="cx"> traverseHandler(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> bool isEnabled() const { return !!m_storage; }
</span><span class="cx">
</span><span class="cx"> // Completion handler may get called back synchronously on failure.
</span><del>- void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, std::function<void (std::unique_ptr<Entry>)>);
- std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, std::function<void (MappedBody&)>);
</del><ins>+ void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, std::function<void (std::unique_ptr<Entry>)>&&);
+ std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, std::function<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 class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> const Entry& entry;
</span><span class="cx"> const Storage::RecordInfo& recordInfo;
</span><span class="cx"> };
</span><del>- void traverse(const std::function<void (const TraversalEntry*)>&);
</del><ins>+ void traverse(std::function<void (const TraversalEntry*)>&&);
</ins><span class="cx"> void remove(const Key&);
</span><span class="cx"> void remove(const WebCore::ResourceRequest&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -114,9 +114,7 @@
</span><span class="cx"> gssize bytesRead = g_input_stream_read_finish(stream, result, nullptr);
</span><span class="cx"> if (bytesRead == -1) {
</span><span class="cx"> WorkQueue* queue = asyncData->queue.get();
</span><del>- auto* asyncDataPtr = asyncData.release();
- runTaskInQueue([asyncDataPtr] {
- std::unique_ptr<ReadAsyncData> asyncData(asyncDataPtr);
</del><ins>+ runTaskInQueue([asyncData = WTFMove(asyncData)] {
</ins><span class="cx"> asyncData->completionHandler(asyncData->data, -1);
</span><span class="cx"> }, queue);
</span><span class="cx"> return;
</span><span class="lines">@@ -124,9 +122,7 @@
</span><span class="cx">
</span><span class="cx"> if (!bytesRead) {
</span><span class="cx"> WorkQueue* queue = asyncData->queue.get();
</span><del>- auto* asyncDataPtr = asyncData.release();
- runTaskInQueue([asyncDataPtr] {
- std::unique_ptr<ReadAsyncData> asyncData(asyncDataPtr);
</del><ins>+ runTaskInQueue([asyncData = WTFMove(asyncData)] {
</ins><span class="cx"> asyncData->completionHandler(asyncData->data, 0);
</span><span class="cx"> }, queue);
</span><span class="cx"> return;
</span><span class="lines">@@ -138,9 +134,7 @@
</span><span class="cx"> size_t pendingBytesToRead = asyncData->bytesToRead - asyncData->data.size();
</span><span class="cx"> if (!pendingBytesToRead) {
</span><span class="cx"> WorkQueue* queue = asyncData->queue.get();
</span><del>- auto* asyncDataPtr = asyncData.release();
- runTaskInQueue([asyncDataPtr] {
- std::unique_ptr<ReadAsyncData> asyncData(asyncDataPtr);
</del><ins>+ runTaskInQueue([asyncData = WTFMove(asyncData)] {
</ins><span class="cx"> asyncData->completionHandler(asyncData->data, 0);
</span><span class="cx"> }, queue);
</span><span class="cx"> return;
</span><span class="lines">@@ -234,9 +228,7 @@
</span><span class="cx"> gssize bytesWritten = g_output_stream_write_finish(stream, result, nullptr);
</span><span class="cx"> if (bytesWritten == -1) {
</span><span class="cx"> WorkQueue* queue = asyncData->queue.get();
</span><del>- auto* asyncDataPtr = asyncData.release();
- runTaskInQueue([asyncDataPtr] {
- std::unique_ptr<WriteAsyncData> asyncData(asyncDataPtr);
</del><ins>+ runTaskInQueue([asyncData = WTFMove(asyncData)] {
</ins><span class="cx"> asyncData->completionHandler(-1);
</span><span class="cx"> }, queue);
</span><span class="cx"> return;
</span><span class="lines">@@ -245,9 +237,7 @@
</span><span class="cx"> gssize pendingBytesToWrite = asyncData->buffer->length - bytesWritten;
</span><span class="cx"> if (!pendingBytesToWrite) {
</span><span class="cx"> WorkQueue* queue = asyncData->queue.get();
</span><del>- auto* asyncDataPtr = asyncData.release();
- runTaskInQueue([asyncDataPtr] {
- std::unique_ptr<WriteAsyncData> asyncData(asyncDataPtr);
</del><ins>+ runTaskInQueue([asyncData = WTFMove(asyncData)] {
</ins><span class="cx"> asyncData->completionHandler(0);
</span><span class="cx"> }, queue);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -94,12 +94,9 @@
</span><span class="cx">
</span><span class="cx"> auto startTime = std::chrono::system_clock::now();
</span><span class="cx">
</span><del>- StringCapture databasePathCapture(databasePath);
- StringCapture networkCachePathCapture(singleton().recordsPath());
- serialBackgroundIOQueue().dispatch([this, databasePathCapture, networkCachePathCapture, startTime] {
</del><ins>+ serialBackgroundIOQueue().dispatch([this, databasePath = databasePath.isolatedCopy(), networkCachePath = singleton().recordsPath().isolatedCopy(), startTime] {
</ins><span class="cx"> WebCore::SQLiteTransactionInProgressAutoCounter transactionCounter;
</span><span class="cx">
</span><del>- String databasePath = databasePathCapture.string();
</del><span class="cx"> if (!WebCore::makeAllDirectories(WebCore::directoryName(databasePath)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -128,7 +125,7 @@
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Network cache statistics database load complete, entries=%lu time=%" PRIi64 "ms", static_cast<size_t>(m_approximateEntryCount), elapsedMS);
</span><span class="cx">
</span><span class="cx"> if (!m_approximateEntryCount) {
</span><del>- bootstrapFromNetworkCache(networkCachePathCapture.string());
</del><ins>+ bootstrapFromNetworkCache(networkCachePath);
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> elapsedMS = static_cast<int64_t>(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - startTime).count());
</span><span class="cx"> #endif
</span><span class="lines">@@ -176,9 +173,8 @@
</span><span class="cx">
</span><span class="cx"> clear();
</span><span class="cx">
</span><del>- StringCapture networkCachePathCapture(singleton().recordsPath());
- serialBackgroundIOQueue().dispatch([this, networkCachePathCapture] {
- bootstrapFromNetworkCache(networkCachePathCapture.string());
</del><ins>+ serialBackgroundIOQueue().dispatch([this, networkCachePath = singleton().recordsPath().isolatedCopy()] {
+ bootstrapFromNetworkCache(networkCachePath);
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) statistics cache shrink completed m_approximateEntryCount=%lu", static_cast<size_t>(m_approximateEntryCount));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -348,7 +344,7 @@
</span><span class="cx"> shrinkIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Statistics::queryWasEverRequested(const String& hash, NeedUncachedReason needUncachedReason, const RequestedCompletionHandler& completionHandler)
</del><ins>+void Statistics::queryWasEverRequested(const String& hash, NeedUncachedReason needUncachedReason, RequestedCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -364,7 +360,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Query the database.
</span><del>- auto everRequestedQuery = std::make_unique<EverRequestedQuery>(EverRequestedQuery { hash, needUncachedReason == NeedUncachedReason::Yes, completionHandler });
</del><ins>+ auto everRequestedQuery = std::make_unique<EverRequestedQuery>(EverRequestedQuery { hash, needUncachedReason == NeedUncachedReason::Yes, WTFMove(completionHandler) });
</ins><span class="cx"> auto& query = *everRequestedQuery;
</span><span class="cx"> m_activeQueries.add(WTFMove(everRequestedQuery));
</span><span class="cx"> serialBackgroundIOQueue().dispatch([this, wasAlreadyRequested, &query] () mutable {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.h 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> typedef std::function<void (bool wasEverRequested, const Optional<StoreDecision>&)> RequestedCompletionHandler;
</span><span class="cx"> enum class NeedUncachedReason { No, Yes };
</span><del>- void queryWasEverRequested(const String&, NeedUncachedReason, const RequestedCompletionHandler&);
</del><ins>+ void queryWasEverRequested(const String&, NeedUncachedReason, RequestedCompletionHandler&&);
</ins><span class="cx"> void markAsRequested(const String& hash);
</span><span class="cx">
</span><span class="cx"> struct EverRequestedQuery {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (201483 => 201484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-05-28 16:33:00 UTC (rev 201483)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2016-05-28 16:54:36 UTC (rev 201484)
</span><span class="lines">@@ -553,9 +553,8 @@
</span><span class="cx">
</span><span class="cx"> void Storage::updateFileModificationTime(const String& path)
</span><span class="cx"> {
</span><del>- StringCapture filePathCapture(path);
- serialBackgroundIOQueue().dispatch([filePathCapture] {
- updateFileModificationTimeIfNeeded(filePathCapture.string());
</del><ins>+ serialBackgroundIOQueue().dispatch([path = path.isolatedCopy()] {
+ updateFileModificationTimeIfNeeded(path);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -893,10 +892,9 @@
</span><span class="cx"> m_blobFilter->clear();
</span><span class="cx"> m_approximateRecordsSize = 0;
</span><span class="cx">
</span><del>- StringCapture typeCapture(type);
- ioQueue().dispatch([this, modifiedSinceTime, completionHandler = WTFMove(completionHandler), typeCapture] () mutable {
</del><ins>+ ioQueue().dispatch([this, modifiedSinceTime, completionHandler = WTFMove(completionHandler), type = type.isolatedCopy()] () mutable {
</ins><span class="cx"> auto recordsPath = this->recordsPath();
</span><del>- traverseRecordsFiles(recordsPath, typeCapture.string(), [modifiedSinceTime](const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath) {
</del><ins>+ traverseRecordsFiles(recordsPath, type, [modifiedSinceTime](const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath) {
</ins><span class="cx"> auto filePath = WebCore::pathByAppendingComponent(recordDirectoryPath, fileName);
</span><span class="cx"> if (modifiedSinceTime > std::chrono::system_clock::time_point::min()) {
</span><span class="cx"> auto times = fileTimes(filePath);
</span></span></pre>
</div>
</div>
</body>
</html>