<!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>[200578] 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/200578">200578</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-09 09:54:37 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use DiskCache for media resource loads
https://bugs.webkit.org/show_bug.cgi?id=157405
Patch by Alex Christensen <achristensen@webkit.org> on 2016-05-09
Reviewed by Darin Adler.
Source/WebCore:
http/tests/security/video-cross-origin-caching.html was loading from the disk cache.
This patch adds an assertion that fires in that test without this fix.
* loader/MediaResourceLoader.cpp:
(WebCore::MediaResourceLoader::requestResource):
* platform/graphics/PlatformMediaResourceLoader.h:
* platform/network/ResourceRequestBase.h:
(WebCore::ResourceRequestBase::hiddenFromInspector):
(WebCore::ResourceRequestBase::setHiddenFromInspector):
(WebCore::ResourceRequestBase::requester):
(WebCore::ResourceRequestBase::setRequester):
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSessionDataTask _restart]):
(-[WebCoreNSURLSessionDataTask resource:receivedResponse:]):
Source/WebKit2:
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::makeRetrieveDecision):
(WebKit::NetworkCache::makeStoreDecision):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStatistics.cpp:
(WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderMediaResourceLoadercpp">trunk/Source/WebCore/loader/MediaResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformMediaResourceLoaderh">trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebCore/ChangeLog 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-09 Alex Christensen <achristensen@webkit.org>
+
+ Don't use DiskCache for media resource loads
+ https://bugs.webkit.org/show_bug.cgi?id=157405
+
+ Reviewed by Darin Adler.
+
+ http/tests/security/video-cross-origin-caching.html was loading from the disk cache.
+ This patch adds an assertion that fires in that test without this fix.
+
+ * loader/MediaResourceLoader.cpp:
+ (WebCore::MediaResourceLoader::requestResource):
+ * platform/graphics/PlatformMediaResourceLoader.h:
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::hiddenFromInspector):
+ (WebCore::ResourceRequestBase::setHiddenFromInspector):
+ (WebCore::ResourceRequestBase::requester):
+ (WebCore::ResourceRequestBase::setRequester):
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSessionDataTask _restart]):
+ (-[WebCoreNSURLSessionDataTask resource:receivedResponse:]):
+
</ins><span class="cx"> 2016-05-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Refactor FocusController::findFocusableElementRecursively
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMediaResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebCore/loader/MediaResourceLoader.cpp 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -64,9 +64,11 @@
</span><span class="cx">
</span><span class="cx"> DataBufferingPolicy bufferingPolicy = options & LoadOption::BufferData ? WebCore::BufferData : WebCore::DoNotBufferData;
</span><span class="cx"> RequestOriginPolicy corsPolicy = !m_crossOriginMode.isNull() ? PotentiallyCrossOriginEnabled : UseDefaultOriginRestrictionsForType;
</span><ins>+ auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching;
</ins><span class="cx"> StoredCredentials allowCredentials = m_crossOriginMode.isNull() || equalLettersIgnoringASCIICase(m_crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</span><span class="cx">
</span><span class="cx"> auto updatedRequest = request;
</span><ins>+ updatedRequest.setRequester(ResourceRequest::Requester::Media);
</ins><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE) && PLATFORM(MAC)
</span><span class="cx"> // FIXME: Workaround for <rdar://problem/26071607>. We are not able to do CORS checking on 304 responses because they
</span><span class="cx"> // are usually missing the headers we need.
</span><span class="lines">@@ -76,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Skip Content Security Policy check if the element that inititated this request
</span><span class="cx"> // is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
</span><del>- CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching));
</del><ins>+ CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
</ins><span class="cx">
</span><span class="cx"> if (!m_crossOriginMode.isNull())
</span><span class="cx"> updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document->securityOrigin(), allowCredentials);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformMediaResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum LoadOption {
</span><span class="cx"> BufferData = 1 << 0,
</span><ins>+ DisallowCaching = 1 << 1,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned LoadOptions;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> bool hiddenFromInspector() const { return m_hiddenFromInspector; }
</span><span class="cx"> void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
</span><span class="cx">
</span><del>- enum class Requester { Unspecified, Main, XHR };
</del><ins>+ enum class Requester { Unspecified, Main, XHR, Media };
</ins><span class="cx"> Requester requester() const { return m_requester; }
</span><span class="cx"> void setRequester(Requester requester) { m_requester = requester; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> [self _cancel];
</span><span class="cx">
</span><del>- _resource = self.session.loader.requestResource(self.originalRequest, 0);
</del><ins>+ _resource = self.session.loader.requestResource(self.originalRequest, PlatformMediaResourceLoader::LoadOption::DisallowCaching);
</ins><span class="cx"> if (_resource)
</span><span class="cx"> _resource->setClient(std::make_unique<WebCoreNSURLSessionDataTaskClient>(self));
</span><span class="cx"> }
</span><span class="lines">@@ -526,6 +526,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)resource:(PlatformMediaResource&)resource receivedResponse:(const ResourceResponse&)response
</span><span class="cx"> {
</span><ins>+ ASSERT(response.source() == ResourceResponse::Source::Network);
</ins><span class="cx"> ASSERT_UNUSED(resource, &resource == _resource);
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> [self.session task:self didReceiveCORSAccessCheckResult:resource.didPassAccessControlCheck()];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-09 Alex Christensen <achristensen@webkit.org>
+
+ Don't use DiskCache for media resource loads
+ https://bugs.webkit.org/show_bug.cgi?id=157405
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeRetrieveDecision):
+ (WebKit::NetworkCache::makeStoreDecision):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStatistics.cpp:
+ (WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):
+
</ins><span class="cx"> 2016-05-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Migrate our Font classes entirely off of NSFont
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -242,6 +242,8 @@
</span><span class="cx"> // FIXME: Support HEAD requests.
</span><span class="cx"> if (request.httpMethod() != "GET")
</span><span class="cx"> return RetrieveDecision::NoDueToHTTPMethod;
</span><ins>+ if (request.requester() == WebCore::ResourceRequest::Requester::Media)
+ return RetrieveDecision::NoDueToStreamingMedia;
</ins><span class="cx"> if (request.cachePolicy() == WebCore::ReloadIgnoringCacheData && !request.isConditional())
</span><span class="cx"> return RetrieveDecision::NoDueToReloadIgnoringCache;
</span><span class="cx">
</span><span class="lines">@@ -334,8 +336,10 @@
</span><span class="cx"> // Streaming media fills the cache quickly and is unlikely to be reused.
</span><span class="cx"> // FIXME: We should introduce a separate media cache partition that doesn't affect other resources.
</span><span class="cx"> // FIXME: We should also make sure make the MSE paths are copy-free so we can use mapped buffers from disk effectively.
</span><del>- bool isLikelyStreamingMedia = originalRequest.requester() == WebCore::ResourceRequest::Requester::XHR && isMediaMIMEType(response.mimeType());
- if (isLikelyStreamingMedia)
</del><ins>+ auto requester = originalRequest.requester();
+ bool isDefinitelyStreamingMedia = requester == WebCore::ResourceRequest::Requester::Media;
+ bool isLikelyStreamingMedia = requester == WebCore::ResourceRequest::Requester::XHR && isMediaMIMEType(response.mimeType());
+ if (isLikelyStreamingMedia || isDefinitelyStreamingMedia)
</ins><span class="cx"> return StoreDecision::NoDueToStreamingMedia;
</span><span class="cx">
</span><span class="cx"> return StoreDecision::Yes;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -60,7 +60,8 @@
</span><span class="cx"> Yes,
</span><span class="cx"> NoDueToHTTPMethod,
</span><span class="cx"> NoDueToConditionalRequest,
</span><del>- NoDueToReloadIgnoringCache
</del><ins>+ NoDueToReloadIgnoringCache,
+ NoDueToStreamingMedia,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // FIXME: This enum is used in the Statistics code in a way that prevents removing or reordering anything.
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> NoDueToHTTPStatusCode,
</span><span class="cx"> NoDueToNoStoreRequest,
</span><span class="cx"> NoDueToUnlikelyToReuse,
</span><del>- NoDueToStreamingMedia
</del><ins>+ NoDueToStreamingMedia,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum class UseDecision {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (200577 => 200578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-09 16:28:38 UTC (rev 200577)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp 2016-05-09 16:54:37 UTC (rev 200578)
</span><span class="lines">@@ -206,6 +206,8 @@
</span><span class="cx"> return WebCore::DiagnosticLoggingKeys::isConditionalRequestKey();
</span><span class="cx"> case RetrieveDecision::NoDueToReloadIgnoringCache:
</span><span class="cx"> return WebCore::DiagnosticLoggingKeys::isReloadIgnoringCacheDataKey();
</span><ins>+ case RetrieveDecision::NoDueToStreamingMedia:
+ return WebCore::DiagnosticLoggingKeys::streamingMedia();
</ins><span class="cx"> case RetrieveDecision::Yes:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>