Changeset 207331 in webkit

Timestamp:

Oct 14, 2016 2:04:24 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

MediaResourceLoader should use CachedResource::ressourceError to do CORS checks
​https://bugs.webkit.org/show_bug.cgi?id=163279

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-14
Reviewed by Darin Adler.

Covered by existing tests.

• loader/MediaResourceLoader.cpp:

(WebCore::MediaResource::responseReceived): Making use of CachedResource::ressourceError to detect CORS failures.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest): Activating loader options checks
before reusing the resource.
(WebCore::isResourceSuitableForDirectReuse): Disabling direct reuse of MediaResource since reuse of raw
resources does not work yet for media resources.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MediaResourceLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-14  Youenn Fablet  <youenn@apple.com>
+
+        MediaResourceLoader should use CachedResource::ressourceError to do CORS checks
+        https://bugs.webkit.org/show_bug.cgi?id=163279
+
+        Reviewed by Darin Adler.
+
+        Covered by existing tests.
+
+        * loader/MediaResourceLoader.cpp:
+        (WebCore::MediaResource::responseReceived): Making use of CachedResource::ressourceError to detect CORS failures.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest): Activating loader options checks
+        before reusing the resource.
+        (WebCore::isResourceSuitableForDirectReuse): Disabling direct reuse of MediaResource since reuse of raw
+        resources does not work yet for media resources.
+
 2016-10-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/MediaResourceLoader.cpp

@@ -135 +135 @@
 
     RefPtr<MediaResource> protectedThis(this);
-    if (!m_loader->crossOriginMode().isNull() && !m_resource->passesSameOriginPolicyCheck(*m_loader->document()->securityOrigin())) {
+    if (m_resource->resourceError().isAccessControl()) {
         static NeverDestroyed<const String> consoleMessage("Cross-origin media resource load denied by Cross-Origin Resource Sharing policy.");
         m_loader->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get());
@@ -145 +145 @@
     }
 
-    m_didPassAccessControlCheck = !m_loader->crossOriginMode().isNull();
+    m_didPassAccessControlCheck = m_resource->options().mode == FetchOptions::Mode::Cors;
     if (m_client)
         m_client->responseReceived(*this, response);

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -562 +562 @@
     case CachedResource::SVGDocumentResource:
         return false;
-    case CachedResource::MediaResource:
-        return false;
     case CachedResource::MainResource:
         return false;
@@ -603 +601 @@
 
     // FIXME: Implement reuse of cached raw resources.
-    if (resource.type() == CachedResource::Type::RawResource)
+    if (resource.type() == CachedResource::Type::RawResource || resource.type() == CachedResource::Type::MediaResource)
         return false;