<!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>[210364] 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/210364">210364</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 11:10:23 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WTF::Function instead of std::function in network cache code
https://bugs.webkit.org/show_bug.cgi?id=166721
Reviewed by Andreas Kling.
Use better move-only type. Fix some unnecessary function copies.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::clear):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheData.h:
* NetworkProcess/cache/NetworkCacheDataCocoa.mm:
(WebKit::NetworkCache::Data::apply):
* NetworkProcess/cache/NetworkCacheDataSoup.cpp:
(WebKit::NetworkCache::Data::apply):
* NetworkProcess/cache/NetworkCacheFileSystem.cpp:
(WebKit::NetworkCache::traverseDirectory):
* NetworkProcess/cache/NetworkCacheFileSystem.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::SpeculativeLoadManager::canRetrieve):
(WebKit::NetworkCache::SpeculativeLoadManager::retrieve):
Split retrieve() to canRetrieve() and retrieve() functions.
This avoids the need to copy the completion handler in the caller.
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::ReadOperation::ReadOperation):
(WebKit::NetworkCache::Storage::traverse):
(WebKit::NetworkCache::Storage::clear):
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2017-01-05 Antti Koivisto <antti@apple.com>
+
+ Use WTF::Function instead of std::function in network cache code
+ https://bugs.webkit.org/show_bug.cgi?id=166721
+
+ Reviewed by Andreas Kling.
+
+ Use better move-only type. Fix some unnecessary function copies.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::retrieve):
+ (WebKit::NetworkCache::Cache::clear):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheData.h:
+ * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+ (WebKit::NetworkCache::Data::apply):
+ * NetworkProcess/cache/NetworkCacheDataSoup.cpp:
+ (WebKit::NetworkCache::Data::apply):
+ * NetworkProcess/cache/NetworkCacheFileSystem.cpp:
+ (WebKit::NetworkCache::traverseDirectory):
+ * NetworkProcess/cache/NetworkCacheFileSystem.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::SpeculativeLoadManager::canRetrieve):
+ (WebKit::NetworkCache::SpeculativeLoadManager::retrieve):
+
+ Split retrieve() to canRetrieve() and retrieve() functions.
+ This avoids the need to copy the completion handler in the caller.
+
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::ReadOperation::ReadOperation):
+ (WebKit::NetworkCache::Storage::traverse):
+ (WebKit::NetworkCache::Storage::clear):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2017-01-05 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after https://trac.webkit.org/changeset/210360
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> ASSERT(canUseCache(request));
</span><span class="cx">
</span><span class="cx"> RefPtr<NetworkResourceLoader> loader(this);
</span><del>- NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [loader, request](auto entry) {
</del><ins>+ NetworkCache::singleton().retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [loader = WTFMove(loader), request](auto entry) {
</ins><span class="cx"> if (loader->hasOneRef()) {
</span><span class="cx"> // The loader has been aborted and is only held alive by this lambda.
</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 (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -309,7 +309,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, 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">@@ -337,13 +337,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
</span><del>- if (canUseSpeculativeRevalidation && m_speculativeLoadManager->retrieve(frameID, storageKey, request, [request, completionHandler](std::unique_ptr<Entry> entry) {
- if (entry && WebCore::verifyVaryingRequestHeaders(entry->varyingRequestHeaders(), request))
- completionHandler(WTFMove(entry));
- else
- completionHandler(nullptr);
- }))
</del><ins>+ if (canUseSpeculativeRevalidation && m_speculativeLoadManager->canRetrieve(storageKey, request, frameID)) {
+ m_speculativeLoadManager->retrieve(storageKey, [request, completionHandler = WTFMove(completionHandler)](std::unique_ptr<Entry> entry) {
+ if (entry && WebCore::verifyVaryingRequestHeaders(entry->varyingRequestHeaders(), request))
+ completionHandler(WTFMove(entry));
+ else
+ completionHandler(nullptr);
+ });
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto startTime = std::chrono::system_clock::now();
</span><span class="lines">@@ -586,7 +588,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Cache::clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler)
</del><ins>+void Cache::clear(std::chrono::system_clock::time_point modifiedSince, Function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> LOG(NetworkCache, "(NetworkProcess) clearing cache");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -105,7 +105,7 @@
</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>)>&&);
</del><ins>+ void retrieve(const WebCore::ResourceRequest&, const GlobalFrameID&, Function<void (std::unique_ptr<Entry>)>&&);
</ins><span class="cx"> std::unique_ptr<Entry> store(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&, Function<void (MappedBody&)>&&);
</span><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="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> void remove(const WebCore::ResourceRequest&);
</span><span class="cx">
</span><span class="cx"> void clear();
</span><del>- void clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler);
</del><ins>+ void clear(std::chrono::system_clock::time_point modifiedSince, Function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> void dumpContentsToFile();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> Data subrange(size_t offset, size_t) const;
</span><span class="cx">
</span><del>- bool apply(const std::function<bool (const uint8_t*, size_t)>&&) const;
</del><ins>+ bool apply(const Function<bool (const uint8_t*, size_t)>&) const;
</ins><span class="cx">
</span><span class="cx"> Data mapToFile(const char* path) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return !m_dispatchData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Data::apply(const std::function<bool (const uint8_t*, size_t)>&& applier) const
</del><ins>+bool Data::apply(const Function<bool (const uint8_t*, size_t)>& applier) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_size)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> return !m_buffer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Data::apply(const std::function<bool (const uint8_t*, size_t)>&& applier) const
</del><ins>+bool Data::apply(const Function<bool (const uint8_t*, size_t)>& applier) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_size)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <dirent.h>
</span><span class="cx"> #include <sys/stat.h>
</span><span class="cx"> #include <sys/time.h>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="lines">@@ -55,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void traverseDirectory(const String& path, const std::function<void (const String&, DirectoryEntryType)>& function)
</del><ins>+void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
</ins><span class="cx"> {
</span><span class="cx"> DIR* dir = opendir(WebCore::fileSystemRepresentation(path).data());
</span><span class="cx"> if (!dir)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheFileSystem.h 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> namespace NetworkCache {
</span><span class="cx">
</span><span class="cx"> enum class DirectoryEntryType { Directory, File };
</span><del>-void traverseDirectory(const String& path, const std::function<void (const String& fileName, DirectoryEntryType)>&);
</del><ins>+void traverseDirectory(const String& path, const Function<void (const String& fileName, DirectoryEntryType)>&);
</ins><span class="cx">
</span><span class="cx"> void deleteDirectoryRecursively(const String& path);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -301,10 +301,10 @@
</span><span class="cx"> return requestsHeadersMatch(load.originalRequest(), actualRequest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SpeculativeLoadManager::retrieve(const GlobalFrameID& frameID, const Key& storageKey, const WebCore::ResourceRequest& request, RetrieveCompletionHandler&& completionHandler)
</del><ins>+bool SpeculativeLoadManager::canRetrieve(const Key& storageKey, const WebCore::ResourceRequest& request, const GlobalFrameID& frameID) const
</ins><span class="cx"> {
</span><span class="cx"> // Check already preloaded entries.
</span><del>- if (auto preloadedEntry = m_preloadedEntries.take(storageKey)) {
</del><ins>+ if (auto preloadedEntry = m_preloadedEntries.get(storageKey)) {
</ins><span class="cx"> if (!canUsePreloadedEntry(*preloadedEntry, request)) {
</span><span class="cx"> LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: Could not use preloaded entry to satisfy request for '%s' due to HTTP headers mismatch:", storageKey.identifier().utf8().data());
</span><span class="cx"> logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey() : DiagnosticLoggingKeys::wastedSpeculativeWarmupWithoutRevalidationKey());
</span><span class="lines">@@ -313,8 +313,6 @@
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: Using preloaded entry to satisfy request for '%s':", storageKey.identifier().utf8().data());
</span><span class="cx"> logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? DiagnosticLoggingKeys::successfulSpeculativeWarmupWithRevalidationKey() : DiagnosticLoggingKeys::successfulSpeculativeWarmupWithoutRevalidationKey());
</span><del>-
- completionHandler(preloadedEntry->takeCacheEntry());
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -321,7 +319,7 @@
</span><span class="cx"> // Check pending speculative revalidations.
</span><span class="cx"> auto* pendingPreload = m_pendingPreloads.get(storageKey);
</span><span class="cx"> if (!pendingPreload) {
</span><del>- if (m_notPreloadedEntries.remove(storageKey))
</del><ins>+ if (m_notPreloadedEntries.get(storageKey))
</ins><span class="cx"> logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::entryWronglyNotWarmedUpKey());
</span><span class="cx"> else
</span><span class="cx"> logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::unknownEntryRequestKey());
</span><span class="lines">@@ -337,10 +335,21 @@
</span><span class="cx">
</span><span class="cx"> LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: revalidation already in progress for '%s':", storageKey.identifier().utf8().data());
</span><span class="cx">
</span><ins>+ return true;
+}
+
+void SpeculativeLoadManager::retrieve(const Key& storageKey, RetrieveCompletionHandler&& completionHandler)
+{
+ if (auto preloadedEntry = m_preloadedEntries.take(storageKey)) {
+ completionHandler(preloadedEntry->takeCacheEntry());
+ return;
+ }
+ ASSERT(m_pendingPreloads.contains(storageKey));
</ins><span class="cx"> // FIXME: This breaks incremental loading when the revalidation is not successful.
</span><del>- auto addResult = m_pendingRetrieveRequests.ensure(storageKey, [] { return std::make_unique<Vector<RetrieveCompletionHandler>>(); });
</del><ins>+ auto addResult = m_pendingRetrieveRequests.ensure(storageKey, [] {
+ return std::make_unique<Vector<RetrieveCompletionHandler>>();
+ });
</ins><span class="cx"> addResult.iterator->value->append(WTFMove(completionHandler));
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SpeculativeLoadManager::registerLoad(const GlobalFrameID& frameID, const ResourceRequest& request, const Key& resourceKey)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.h 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -51,9 +51,11 @@
</span><span class="cx">
</span><span class="cx"> void registerLoad(const GlobalFrameID&, const WebCore::ResourceRequest&, const Key& resourceKey);
</span><span class="cx">
</span><del>- typedef std::function<void (std::unique_ptr<Entry>)> RetrieveCompletionHandler;
- bool retrieve(const GlobalFrameID&, const Key& storageKey, const WebCore::ResourceRequest&, RetrieveCompletionHandler&&);
</del><ins>+ typedef Function<void (std::unique_ptr<Entry>)> RetrieveCompletionHandler;
</ins><span class="cx">
</span><ins>+ bool canRetrieve(const Key& storageKey, const WebCore::ResourceRequest&, const GlobalFrameID&) const;
+ void retrieve(const Key& storageKey, RetrieveCompletionHandler&&);
+
</ins><span class="cx"> private:
</span><span class="cx"> class PreloadedEntry;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> struct Storage::ReadOperation {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- ReadOperation(const Key& key, const RetrieveCompletionHandler& completionHandler)
</del><ins>+ ReadOperation(const Key& key, RetrieveCompletionHandler&& completionHandler)
</ins><span class="cx"> : key(key)
</span><del>- , completionHandler(completionHandler)
</del><ins>+ , completionHandler(WTFMove(completionHandler))
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> void cancel();
</span><span class="lines">@@ -804,7 +804,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> ASSERT(traverseHandler);
</span><del>- // Avoid non-thread safe std::function copies.
</del><ins>+ // Avoid non-thread safe Function copies.
</ins><span class="cx">
</span><span class="cx"> auto traverseOperationPtr = std::make_unique<TraverseOperation>(type, flags, WTFMove(traverseHandler));
</span><span class="cx"> auto& traverseOperation = *traverseOperationPtr;
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> shrinkIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Storage::clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler)
</del><ins>+void Storage::clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, Function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> LOG(NetworkCacheStorage, "(NetworkProcess) clearing cache");
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (210363 => 210364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2017-01-05 18:54:47 UTC (rev 210363)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2017-01-05 19:10:23 UTC (rev 210364)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> Data body;
</span><span class="cx"> };
</span><span class="cx"> // This may call completion handler synchronously on failure.
</span><del>- typedef std::function<bool (std::unique_ptr<Record>)> RetrieveCompletionHandler;
</del><ins>+ typedef Function<bool (std::unique_ptr<Record>)> RetrieveCompletionHandler;
</ins><span class="cx"> void retrieve(const Key&, unsigned priority, RetrieveCompletionHandler&&);
</span><span class="cx">
</span><span class="cx"> typedef Function<void (const Data& mappedBody)> MappedBodyHandler;
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void store(const Record&, MappedBodyHandler&&);
</span><span class="cx">
</span><span class="cx"> void remove(const Key&);
</span><del>- void clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, std::function<void ()>&& completionHandler);
</del><ins>+ void clear(const String& type, std::chrono::system_clock::time_point modifiedSinceTime, Function<void ()>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> struct RecordInfo {
</span><span class="cx"> size_t bodySize;
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove, used by NetworkCacheStatistics only.
</span><del>-using RecordFileTraverseFunction = std::function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>;
</del><ins>+using RecordFileTraverseFunction = Function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>;
</ins><span class="cx"> void traverseRecordsFiles(const String& recordsPath, const String& type, const RecordFileTraverseFunction&);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>