Changeset 186508 in webkit

Timestamp:

Jul 8, 2015, 9:41:48 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r186389. rdar://problem/21708243

Location:

branches/safari-600.1.4.17-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (modified) (1 diff)

branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r186389. rdar://problem/21708243
+
+    2015-07-06  Daniel Bates  <dabates@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_hanson@apple.com>
 

branches/safari-600.1.4.17-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp

@@ -73 +73 @@
     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);