<!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>[211963] 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/211963">211963</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 09:36:58 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use all cacheable speculatively loaded responses
https://bugs.webkit.org/show_bug.cgi?id=168052
Reviewed by Andreas Kling.
Source/WebCore:
* platform/network/CacheValidation.cpp:
(WebCore::isStatusCodeCacheableByDefault):
(WebCore::isStatusCodePotentiallyCacheable):
Moved here from WebKit2.
* platform/network/CacheValidation.h:
Source/WebKit2:
We currently only allow 200 responses. There is no reason not to use speculative responses
that have other cacheable status codes. This is helpful for 204s and 404s.
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::makeStoreDecision):
(WebKit::NetworkCache::isStatusCodeCacheableByDefault): Deleted.
(WebKit::NetworkCache::isStatusCodePotentiallyCacheable): Deleted.
Move to CacheValidation.h/cpp
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):
Allow all cacheable-by-default responses.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationh">trunk/Source/WebCore/platform/network/CacheValidation.h</a></li>
<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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Use all cacheable speculatively loaded responses
+ https://bugs.webkit.org/show_bug.cgi?id=168052
+
+ Reviewed by Andreas Kling.
+
+ * platform/network/CacheValidation.cpp:
+ (WebCore::isStatusCodeCacheableByDefault):
+ (WebCore::isStatusCodePotentiallyCacheable):
+
+ Moved here from WebKit2.
+
+ * platform/network/CacheValidation.h:
+
</ins><span class="cx"> 2017-02-09 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Remove legacy Navigator.webkitGetUserMedia
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -380,4 +380,43 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// http://tools.ietf.org/html/rfc7231#page-48
+bool isStatusCodeCacheableByDefault(int statusCode)
+{
+ switch (statusCode) {
+ case 200: // OK
+ case 203: // Non-Authoritative Information
+ case 204: // No Content
+ case 206: // Partial Content
+ case 300: // Multiple Choices
+ case 301: // Moved Permanently
+ case 404: // Not Found
+ case 405: // Method Not Allowed
+ case 410: // Gone
+ case 414: // URI Too Long
+ case 501: // Not Implemented
+ return true;
+ default:
+ return false;
+ }
</ins><span class="cx"> }
</span><ins>+
+bool isStatusCodePotentiallyCacheable(int statusCode)
+{
+ switch (statusCode) {
+ case 201: // Created
+ case 202: // Accepted
+ case 205: // Reset Content
+ case 302: // Found
+ case 303: // See Other
+ case 307: // Temporary redirect
+ case 403: // Forbidden
+ case 406: // Not Acceptable
+ case 415: // Unsupported Media Type
+ return true;
+ default:
+ return false;
+ }
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.h (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.h 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebCore/platform/network/CacheValidation.h 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -73,6 +73,9 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<std::pair<String, String>> collectVaryingRequestHeaders(const ResourceRequest&, const ResourceResponse&, SessionID = SessionID::defaultSessionID());
</span><span class="cx"> WEBCORE_EXPORT bool verifyVaryingRequestHeaders(const Vector<std::pair<String, String>>& varyingRequestHeaders, const ResourceRequest&, SessionID = SessionID::defaultSessionID());
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT bool isStatusCodeCacheableByDefault(int statusCode);
+WEBCORE_EXPORT bool isStatusCodePotentiallyCacheable(int statusCode);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-09 Antti Koivisto <antti@apple.com>
+
+ Use all cacheable speculatively loaded responses
+ https://bugs.webkit.org/show_bug.cgi?id=168052
+
+ Reviewed by Andreas Kling.
+
+ We currently only allow 200 responses. There is no reason not to use speculative responses
+ that have other cacheable status codes. This is helpful for 204s and 404s.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeStoreDecision):
+ (WebKit::NetworkCache::isStatusCodeCacheableByDefault): Deleted.
+ (WebKit::NetworkCache::isStatusCodePotentiallyCacheable): Deleted.
+
+ Move to CacheValidation.h/cpp
+
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::didFinishLoading):
+
+ Allow all cacheable-by-default responses.
+
</ins><span class="cx"> 2017-02-09 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix gtk-doc warning
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -208,45 +208,6 @@
</span><span class="cx"> return RetrieveDecision::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// http://tools.ietf.org/html/rfc7231#page-48
-static bool isStatusCodeCacheableByDefault(int statusCode)
-{
- switch (statusCode) {
- case 200: // OK
- case 203: // Non-Authoritative Information
- case 204: // No Content
- case 206: // Partial Content
- case 300: // Multiple Choices
- case 301: // Moved Permanently
- case 404: // Not Found
- case 405: // Method Not Allowed
- case 410: // Gone
- case 414: // URI Too Long
- case 501: // Not Implemented
- return true;
- default:
- return false;
- }
-}
-
-static bool isStatusCodePotentiallyCacheable(int statusCode)
-{
- switch (statusCode) {
- case 201: // Created
- case 202: // Accepted
- case 205: // Reset Content
- case 302: // Found
- case 303: // See Other
- case 307: // Temporary redirect
- case 403: // Forbidden
- case 406: // Not Acceptable
- case 415: // Unsupported Media Type
- return true;
- default:
- return false;
- }
-}
-
</del><span class="cx"> static bool isMediaMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> if (mimeType.startsWith("video/", /*caseSensitive*/ false))
</span><span class="lines">@@ -271,10 +232,10 @@
</span><span class="cx"> if (response.cacheControlContainsNoStore())
</span><span class="cx"> return StoreDecision::NoDueToNoStoreResponse;
</span><span class="cx">
</span><del>- if (!isStatusCodeCacheableByDefault(response.httpStatusCode())) {
</del><ins>+ if (!WebCore::isStatusCodeCacheableByDefault(response.httpStatusCode())) {
</ins><span class="cx"> // http://tools.ietf.org/html/rfc7234#section-4.3.2
</span><span class="cx"> bool hasExpirationHeaders = response.expires() || response.cacheControlMaxAge();
</span><del>- bool expirationHeadersAllowCaching = isStatusCodePotentiallyCacheable(response.httpStatusCode()) && hasExpirationHeaders;
</del><ins>+ bool expirationHeadersAllowCaching = WebCore::isStatusCodePotentiallyCacheable(response.httpStatusCode()) && hasExpirationHeaders;
</ins><span class="cx"> if (!expirationHeadersAllowCaching)
</span><span class="cx"> return StoreDecision::NoDueToHTTPStatusCode;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (211962 => 211963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-02-09 17:29:58 UTC (rev 211962)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-02-09 17:36:58 UTC (rev 211963)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> if (!m_cacheEntry && m_bufferedDataForCache) {
</span><span class="cx"> m_cacheEntry = NetworkCache::singleton().store(m_originalRequest, m_response, m_bufferedDataForCache.copyRef(), [](auto& mappedBody) { });
</span><span class="cx"> // Create a synthetic cache entry if we can't store.
</span><del>- if (!m_cacheEntry && m_response.httpStatusCode() == 200)
</del><ins>+ if (!m_cacheEntry && isStatusCodeCacheableByDefault(m_response.httpStatusCode()))
</ins><span class="cx"> m_cacheEntry = NetworkCache::singleton().makeEntry(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>