Diff
Modified: trunk/Source/WebCore/ChangeLog (200577 => 200578)
--- 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)
@@ -1,3 +1,25 @@
+2016-05-09 Alex Christensen <achristen...@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:]):
+
2016-05-09 Ryosuke Niwa <rn...@webkit.org>
Refactor FocusController::findFocusableElementRecursively
Modified: trunk/Source/WebCore/loader/MediaResourceLoader.cpp (200577 => 200578)
--- 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)
@@ -64,9 +64,11 @@
DataBufferingPolicy bufferingPolicy = options & LoadOption::BufferData ? WebCore::BufferData : WebCore::DoNotBufferData;
RequestOriginPolicy corsPolicy = !m_crossOriginMode.isNull() ? PotentiallyCrossOriginEnabled : UseDefaultOriginRestrictionsForType;
+ auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching;
StoredCredentials allowCredentials = m_crossOriginMode.isNull() || equalLettersIgnoringASCIICase(m_crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
auto updatedRequest = request;
+ updatedRequest.setRequester(ResourceRequest::Requester::Media);
#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && PLATFORM(MAC)
// FIXME: Workaround for <rdar://problem/26071607>. We are not able to do CORS checking on 304 responses because they
// are usually missing the headers we need.
@@ -76,7 +78,7 @@
// FIXME: Skip Content Security Policy check if the element that inititated this request
// is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
- CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching));
+ CachedResourceRequest cacheRequest(updatedRequest, ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, allowCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, corsPolicy, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
if (!m_crossOriginMode.isNull())
updateRequestForAccessControl(cacheRequest.mutableResourceRequest(), m_document->securityOrigin(), allowCredentials);
Modified: trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h (200577 => 200578)
--- 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)
@@ -61,6 +61,7 @@
public:
enum LoadOption {
BufferData = 1 << 0,
+ DisallowCaching = 1 << 1,
};
typedef unsigned LoadOptions;
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (200577 => 200578)
--- 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)
@@ -150,7 +150,7 @@
bool hiddenFromInspector() const { return m_hiddenFromInspector; }
void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
- enum class Requester { Unspecified, Main, XHR };
+ enum class Requester { Unspecified, Main, XHR, Media };
Requester requester() const { return m_requester; }
void setRequester(Requester requester) { m_requester = requester; }
Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (200577 => 200578)
--- 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)
@@ -415,7 +415,7 @@
ASSERT(isMainThread());
[self _cancel];
- _resource = self.session.loader.requestResource(self.originalRequest, 0);
+ _resource = self.session.loader.requestResource(self.originalRequest, PlatformMediaResourceLoader::LoadOption::DisallowCaching);
if (_resource)
_resource->setClient(std::make_unique<WebCoreNSURLSessionDataTaskClient>(self));
}
@@ -526,6 +526,7 @@
- (void)resource:(PlatformMediaResource&)resource receivedResponse:(const ResourceResponse&)response
{
+ ASSERT(response.source() == ResourceResponse::Source::Network);
ASSERT_UNUSED(resource, &resource == _resource);
ASSERT(isMainThread());
[self.session task:self didReceiveCORSAccessCheckResult:resource.didPassAccessControlCheck()];
Modified: trunk/Source/WebKit2/ChangeLog (200577 => 200578)
--- 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)
@@ -1,3 +1,17 @@
+2016-05-09 Alex Christensen <achristen...@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):
+
2016-05-08 Myles C. Maxfield <mmaxfi...@apple.com>
[OS X] Migrate our Font classes entirely off of NSFont
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (200577 => 200578)
--- 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)
@@ -242,6 +242,8 @@
// FIXME: Support HEAD requests.
if (request.httpMethod() != "GET")
return RetrieveDecision::NoDueToHTTPMethod;
+ if (request.requester() == WebCore::ResourceRequest::Requester::Media)
+ return RetrieveDecision::NoDueToStreamingMedia;
if (request.cachePolicy() == WebCore::ReloadIgnoringCacheData && !request.isConditional())
return RetrieveDecision::NoDueToReloadIgnoringCache;
@@ -334,8 +336,10 @@
// Streaming media fills the cache quickly and is unlikely to be reused.
// FIXME: We should introduce a separate media cache partition that doesn't affect other resources.
// FIXME: We should also make sure make the MSE paths are copy-free so we can use mapped buffers from disk effectively.
- bool isLikelyStreamingMedia = originalRequest.requester() == WebCore::ResourceRequest::Requester::XHR && isMediaMIMEType(response.mimeType());
- if (isLikelyStreamingMedia)
+ auto requester = originalRequest.requester();
+ bool isDefinitelyStreamingMedia = requester == WebCore::ResourceRequest::Requester::Media;
+ bool isLikelyStreamingMedia = requester == WebCore::ResourceRequest::Requester::XHR && isMediaMIMEType(response.mimeType());
+ if (isLikelyStreamingMedia || isDefinitelyStreamingMedia)
return StoreDecision::NoDueToStreamingMedia;
return StoreDecision::Yes;
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (200577 => 200578)
--- 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)
@@ -60,7 +60,8 @@
Yes,
NoDueToHTTPMethod,
NoDueToConditionalRequest,
- NoDueToReloadIgnoringCache
+ NoDueToReloadIgnoringCache,
+ NoDueToStreamingMedia,
};
// FIXME: This enum is used in the Statistics code in a way that prevents removing or reordering anything.
@@ -73,7 +74,7 @@
NoDueToHTTPStatusCode,
NoDueToNoStoreRequest,
NoDueToUnlikelyToReuse,
- NoDueToStreamingMedia
+ NoDueToStreamingMedia,
};
enum class UseDecision {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatistics.cpp (200577 => 200578)
--- 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)
@@ -206,6 +206,8 @@
return WebCore::DiagnosticLoggingKeys::isConditionalRequestKey();
case RetrieveDecision::NoDueToReloadIgnoringCache:
return WebCore::DiagnosticLoggingKeys::isReloadIgnoringCacheDataKey();
+ case RetrieveDecision::NoDueToStreamingMedia:
+ return WebCore::DiagnosticLoggingKeys::streamingMedia();
case RetrieveDecision::Yes:
ASSERT_NOT_REACHED();
break;
