<!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>[211869] 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/211869">211869</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-02-08 07:10:07 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow speculative redirects
https://bugs.webkit.org/show_bug.cgi?id=167982
Reviewed by Andreas Kling.
If speculative loader hits a redirect it will drop it on the floor. We should use it.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::continueWillSendRequest):
(WebKit::NetworkResourceLoader::dispatchWillSendRequestForCacheEntry):
Reset the m_isWaitingContinueWillSendRequestForCachedRedirect bit immediately.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::makeRedirectEntry):
Factor to a function.
(WebKit::NetworkCache::Cache::storeRedirect):
* NetworkProcess/cache/NetworkCache.h:
(WebKit::NetworkCache::Cache::speculativeLoadManager):
* NetworkProcess/cache/NetworkCacheEntry.cpp:
(WebKit::NetworkCache::Entry::Entry):
Use std::optional instead std::unique_ptr for the redirect request.
(WebKit::NetworkCache::Entry::decodeStorageRecord):
* NetworkProcess/cache/NetworkCacheEntry.h:
(WebKit::NetworkCache::Entry::redirectRequest):
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::willSendRedirectedRequest):
Make cache entry for speculative redirect.
The redirect is not actually performed, the target resource will have separate
a speculative entry.
(WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):
(WebKit::NetworkCache::SpeculativeLoad::didFailLoading):
(WebKit::NetworkCache::SpeculativeLoad::didComplete):
Protect against multiple completions.
(WebKit::NetworkCache::SpeculativeLoad::abort): Deleted.
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
(WebKit::NetworkCache::SpeculativeLoadManager::retrieve):
Make successful retrieves asynchronous to avoid re-entrancy problems.</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntryh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2017-02-08 Antti Koivisto <antti@apple.com>
+
+ Allow speculative redirects
+ https://bugs.webkit.org/show_bug.cgi?id=167982
+
+ Reviewed by Andreas Kling.
+
+ If speculative loader hits a redirect it will drop it on the floor. We should use it.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ (WebKit::NetworkResourceLoader::dispatchWillSendRequestForCacheEntry):
+
+ Reset the m_isWaitingContinueWillSendRequestForCachedRedirect bit immediately.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::makeRedirectEntry):
+
+ Factor to a function.
+
+ (WebKit::NetworkCache::Cache::storeRedirect):
+ * NetworkProcess/cache/NetworkCache.h:
+ (WebKit::NetworkCache::Cache::speculativeLoadManager):
+ * NetworkProcess/cache/NetworkCacheEntry.cpp:
+ (WebKit::NetworkCache::Entry::Entry):
+
+ Use std::optional instead std::unique_ptr for the redirect request.
+
+ (WebKit::NetworkCache::Entry::decodeStorageRecord):
+ * NetworkProcess/cache/NetworkCacheEntry.h:
+ (WebKit::NetworkCache::Entry::redirectRequest):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::willSendRedirectedRequest):
+
+ Make cache entry for speculative redirect.
+ The redirect is not actually performed, the target resource will have separate
+ a speculative entry.
+
+ (WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):
+ (WebKit::NetworkCache::SpeculativeLoad::didFailLoading):
+ (WebKit::NetworkCache::SpeculativeLoad::didComplete):
+
+ Protect against multiple completions.
+
+ (WebKit::NetworkCache::SpeculativeLoad::abort): Deleted.
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+ (WebKit::NetworkCache::SpeculativeLoadManager::retrieve):
+
+ Make successful retrieves asynchronous to avoid re-entrancy problems.
+
</ins><span class="cx"> 2017-02-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct initialization of Resource Load Statistics for use in WebKitTestRunner
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -476,6 +476,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (m_isWaitingContinueWillSendRequestForCachedRedirect) {
</span><ins>+ m_isWaitingContinueWillSendRequestForCachedRedirect = false;
+
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Retrieving cached redirect");
</span><span class="cx">
</span><span class="cx"> if (canUseCachedRedirect(newRequest))
</span><span class="lines">@@ -483,7 +485,6 @@
</span><span class="cx"> else
</span><span class="cx"> startNetworkLoad(newRequest);
</span><span class="cx">
</span><del>- m_isWaitingContinueWillSendRequestForCachedRedirect = false;
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -643,6 +644,8 @@
</span><span class="cx"> void NetworkResourceLoader::dispatchWillSendRequestForCacheEntry(std::unique_ptr<NetworkCache::Entry> entry)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(entry->redirectRequest());
</span><ins>+ ASSERT(!m_isWaitingContinueWillSendRequestForCachedRedirect);
+
</ins><span class="cx"> LOG(NetworkCache, "(NetworkProcess) Executing cached redirect");
</span><span class="cx">
</span><span class="cx"> ++m_redirectCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -395,6 +395,11 @@
</span><span class="cx"> return std::make_unique<Entry>(makeCacheKey(request), response, WTFMove(responseData), WebCore::collectVaryingRequestHeaders(request, response));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+std::unique_ptr<Entry> Cache::makeRedirectEntry(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, const WebCore::ResourceRequest& redirectRequest)
+{
+ return std::make_unique<Entry>(makeCacheKey(request), response, redirectRequest, WebCore::collectVaryingRequestHeaders(request, response));
+}
+
</ins><span class="cx"> std::unique_ptr<Entry> Cache::store(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, RefPtr<WebCore::SharedBuffer>&& responseData, Function<void (MappedBody&)>&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isEnabled());
</span><span class="lines">@@ -454,8 +459,7 @@
</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, redirectRequest, WebCore::collectVaryingRequestHeaders(request, response));
-
</del><ins>+ auto cacheEntry = makeRedirectEntry(request, response, redirectRequest);
</ins><span class="cx"> auto record = cacheEntry->encodeAsStorageRecord();
</span><span class="cx">
</span><span class="cx"> m_storage->store(record, nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -125,11 +125,16 @@
</span><span class="cx"> void storeData(const DataKey&, const uint8_t* data, size_t);
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Entry> makeEntry(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, RefPtr<WebCore::SharedBuffer>&&);
</span><ins>+ std::unique_ptr<Entry> makeRedirectEntry(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, const WebCore::ResourceRequest& redirectRequest);
</ins><span class="cx">
</span><span class="cx"> void dumpContentsToFile();
</span><span class="cx">
</span><span class="cx"> String recordsPath() const;
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+ SpeculativeLoadManager* speculativeLoadManager() { return m_speculativeLoadManager.get(); }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> Cache() = default;
</span><span class="cx"> ~Cache() = delete;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -52,12 +52,10 @@
</span><span class="cx"> , m_timeStamp(std::chrono::system_clock::now())
</span><span class="cx"> , m_response(response)
</span><span class="cx"> , m_varyingRequestHeaders(varyingRequestHeaders)
</span><ins>+ , m_redirectRequest(redirectRequest)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_key.type() == "Resource");
</span><span class="cx"> // Redirect body is not needed even if exists.
</span><del>-
- m_redirectRequest = std::make_unique<WebCore::ResourceRequest>();
- m_redirectRequest->setAsIsolatedCopy(redirectRequest);
</del><span class="cx"> m_redirectRequest->setHTTPBody(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,6 +64,7 @@
</span><span class="cx"> , m_timeStamp(other.m_timeStamp)
</span><span class="cx"> , m_response(other.m_response)
</span><span class="cx"> , m_varyingRequestHeaders(other.m_varyingRequestHeaders)
</span><ins>+ , m_redirectRequest(other.m_redirectRequest)
</ins><span class="cx"> , m_buffer(other.m_buffer)
</span><span class="cx"> , m_sourceStorageRecord(other.m_sourceStorageRecord)
</span><span class="cx"> {
</span><span class="lines">@@ -129,7 +128,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (isRedirect) {
</span><del>- entry->m_redirectRequest = std::make_unique<WebCore::ResourceRequest>();
</del><ins>+ entry->m_redirectRequest.emplace();
</ins><span class="cx"> if (!entry->m_redirectRequest->decodeWithoutPlatformData(decoder))
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.h 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> const Vector<std::pair<String, String>>& varyingRequestHeaders() const { return m_varyingRequestHeaders; }
</span><span class="cx">
</span><span class="cx"> WebCore::SharedBuffer* buffer() const;
</span><del>- const WebCore::ResourceRequest* redirectRequest() const { return m_redirectRequest.get(); }
</del><ins>+ const std::optional<WebCore::ResourceRequest>& redirectRequest() const { return m_redirectRequest; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> ShareableResource::Handle& shareableResourceHandle() const;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> WebCore::ResourceResponse m_response;
</span><span class="cx"> Vector<std::pair<String, String>> m_varyingRequestHeaders;
</span><span class="cx">
</span><del>- std::unique_ptr<WebCore::ResourceRequest> m_redirectRequest;
</del><ins>+ std::optional<WebCore::ResourceRequest> m_redirectRequest;
</ins><span class="cx"> mutable RefPtr<WebCore::SharedBuffer> m_buffer;
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> mutable ShareableResource::Handle m_shareableResourceHandle;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -67,11 +67,23 @@
</span><span class="cx"> ASSERT(!m_networkLoad);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeLoad::willSendRedirectedRequest(ResourceRequest&&, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
</del><ins>+void SpeculativeLoad::willSendRedirectedRequest(ResourceRequest&& request, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
</ins><span class="cx"> {
</span><del>- LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Speculative revalidation for %s hit a redirect, aborting the load.", redirectResponse.url().string().utf8().data());
- // We drop speculative revalidations if they redirect for now as we would need to notify WebCore of such redirects.
- abort();
</del><ins>+ LOG(NetworkCacheSpeculativePreloading, "Speculative redirect %s -> %s", request.url().string().utf8().data(), redirectRequest.url().string().utf8().data());
+
+ m_cacheEntry = NetworkCache::singleton().storeRedirect(request, redirectResponse, redirectRequest);
+ // Create a synthetic cache entry if we can't store.
+ if (!m_cacheEntry)
+ m_cacheEntry = NetworkCache::singleton().makeRedirectEntry(request, redirectResponse, redirectRequest);
+
+ auto load = WTFMove(m_networkLoad);
+
+ // Don't follow the redirect. The redirect target will be registered for speculative load when it is loaded.
+ didComplete();
+
+ // This causes call to didFailLoading().
+ if (load)
+ load->continueWillSendRequest({ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto SpeculativeLoad::didReceiveResponse(ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
</span><span class="lines">@@ -106,8 +118,10 @@
</span><span class="cx">
</span><span class="cx"> void SpeculativeLoad::didFinishLoading(double finishTime)
</span><span class="cx"> {
</span><ins>+ if (m_didComplete)
+ return;
</ins><span class="cx"> if (!m_cacheEntry && m_bufferedDataForCache) {
</span><del>- m_cacheEntry = NetworkCache::singleton().store(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache), [](auto& mappedBody) { });
</del><ins>+ m_cacheEntry = NetworkCache::singleton().store(m_originalRequest, m_response, m_bufferedDataForCache.copyRef(), [](auto& mappedBody) { });
</ins><span class="cx"> // Create a synthetic cache entry if we can't store.
</span><span class="cx"> if (!m_cacheEntry && m_response.httpStatusCode() == 200)
</span><span class="cx"> m_cacheEntry = NetworkCache::singleton().makeEntry(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache));
</span><span class="lines">@@ -125,24 +139,20 @@
</span><span class="cx">
</span><span class="cx"> void SpeculativeLoad::didFailLoading(const ResourceError&)
</span><span class="cx"> {
</span><ins>+ if (m_didComplete)
+ return;
</ins><span class="cx"> m_cacheEntry = nullptr;
</span><span class="cx">
</span><span class="cx"> didComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpeculativeLoad::abort()
-{
- if (m_networkLoad)
- m_networkLoad->cancel();
-
- m_cacheEntry = nullptr;
- didComplete();
-}
-
</del><span class="cx"> void SpeculativeLoad::didComplete()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><ins>+ if (m_didComplete)
+ return;
+ m_didComplete = true;
</ins><span class="cx"> m_networkLoad = nullptr;
</span><span class="cx">
</span><span class="cx"> // Make sure speculatively revalidated resources do not get validated by the NetworkResourceLoader again.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> void didFinishLoading(double finishTime) override;
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><span class="cx">
</span><del>- void abort();
</del><span class="cx"> void didComplete();
</span><span class="cx">
</span><span class="cx"> GlobalFrameID m_frameID;
</span><span class="lines">@@ -77,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::SharedBuffer> m_bufferedDataForCache;
</span><span class="cx"> std::unique_ptr<NetworkCache::Entry> m_cacheEntry;
</span><ins>+ bool m_didComplete { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace NetworkCache
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (211868 => 211869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-02-08 12:39:24 UTC (rev 211868)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2017-02-08 15:10:07 UTC (rev 211869)
</span><span class="lines">@@ -345,7 +345,9 @@
</span><span class="cx"> void SpeculativeLoadManager::retrieve(const Key& storageKey, RetrieveCompletionHandler&& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> if (auto preloadedEntry = m_preloadedEntries.take(storageKey)) {
</span><del>- completionHandler(preloadedEntry->takeCacheEntry());
</del><ins>+ RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler), cacheEntry = preloadedEntry->takeCacheEntry()] () mutable {
+ completionHandler(WTFMove(cacheEntry));
+ });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_pendingPreloads.contains(storageKey));
</span></span></pre>
</div>
</div>
</body>
</html>