Changeset 207331 in webkit
- Timestamp:
- Oct 14, 2016 2:04:24 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207330 r207331 1 2016-10-14 Youenn Fablet <youenn@apple.com> 2 3 MediaResourceLoader should use CachedResource::ressourceError to do CORS checks 4 https://bugs.webkit.org/show_bug.cgi?id=163279 5 6 Reviewed by Darin Adler. 7 8 Covered by existing tests. 9 10 * loader/MediaResourceLoader.cpp: 11 (WebCore::MediaResource::responseReceived): Making use of CachedResource::ressourceError to detect CORS failures. 12 * loader/cache/CachedResourceLoader.cpp: 13 (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest): Activating loader options checks 14 before reusing the resource. 15 (WebCore::isResourceSuitableForDirectReuse): Disabling direct reuse of MediaResource since reuse of raw 16 resources does not work yet for media resources. 17 1 18 2016-10-14 Youenn Fablet <youenn@apple.com> 2 19 -
trunk/Source/WebCore/loader/MediaResourceLoader.cpp
r207281 r207331 135 135 136 136 RefPtr<MediaResource> protectedThis(this); 137 if ( !m_loader->crossOriginMode().isNull() && !m_resource->passesSameOriginPolicyCheck(*m_loader->document()->securityOrigin())) {137 if (m_resource->resourceError().isAccessControl()) { 138 138 static NeverDestroyed<const String> consoleMessage("Cross-origin media resource load denied by Cross-Origin Resource Sharing policy."); 139 139 m_loader->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage.get()); … … 145 145 } 146 146 147 m_didPassAccessControlCheck = !m_loader->crossOriginMode().isNull();147 m_didPassAccessControlCheck = m_resource->options().mode == FetchOptions::Mode::Cors; 148 148 if (m_client) 149 149 m_client->responseReceived(*this, response); -
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp
r207330 r207331 562 562 case CachedResource::SVGDocumentResource: 563 563 return false; 564 case CachedResource::MediaResource:565 return false;566 564 case CachedResource::MainResource: 567 565 return false; … … 603 601 604 602 // FIXME: Implement reuse of cached raw resources. 605 if (resource.type() == CachedResource::Type::RawResource )603 if (resource.type() == CachedResource::Type::RawResource || resource.type() == CachedResource::Type::MediaResource) 606 604 return false; 607 605
Note: See TracChangeset
for help on using the changeset viewer.