Title: [186508] branches/safari-600.1.4.17-branch/Source/WebCore
- Revision
- 186508
- Author
- matthew_han...@apple.com
- Date
- 2015-07-08 09:41:48 -0700 (Wed, 08 Jul 2015)
Log Message
Merge r186389. rdar://problem/21708243
Modified Paths
Diff
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186507 => 186508)
--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 16:41:44 UTC (rev 186507)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 16:41:48 UTC (rev 186508)
@@ -1,5 +1,20 @@
2015-07-08 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186389. rdar://problem/21708243
+
+ 2015-07-06 Daniel Bates <daba...@apple.com>
+
+ Fix the Windows build following <https://trac.webkit.org/changeset/186388>
+ (https://bugs.webkit.org/show_bug.cgi?id=144830)
+
+ As we for for Mac in WebCoreAVFResourceLoader::startLoading(), instantiate ResourceLoaderOptions
+ with ContentSecurityPolicyImposition::DoPolicyCheck.
+
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::startLoading):
+
+2015-07-08 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186384. rdar://problem/21708281
2015-07-06 Dean Jackson <d...@apple.com>
Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (186507 => 186508)
--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2015-07-08 16:41:44 UTC (rev 186507)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2015-07-08 16:41:48 UTC (rev 186508)
@@ -72,7 +72,8 @@
RetainPtr<CFURLRequestRef> urlRequest = AVCFAssetResourceLoadingRequestGetURLRequest(m_avRequest.get());
URL requestURL = CFURLRequestGetURL(urlRequest.get());
- CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType));
+ // ContentSecurityPolicyImposition::DoPolicyCheck is a placeholder value. It does not affect the request since Content Security Policy does not apply to raw resources.
+ CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, ContentSecurityPolicyImposition::DoPolicyCheck));
request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow);
CachedResourceLoader* loader = m_parent->player()->cachedResourceLoader();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
