Modified: tags/Safari-602.1.18.6/Source/WebCore/ChangeLog (196350 => 196351)
--- tags/Safari-602.1.18.6/Source/WebCore/ChangeLog 2016-02-10 01:21:18 UTC (rev 196350)
+++ tags/Safari-602.1.18.6/Source/WebCore/ChangeLog 2016-02-10 02:29:38 UTC (rev 196351)
@@ -1,3 +1,15 @@
+2016-02-09 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r195816.
+
+ 2016-01-29 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed Windows build fix; one more ResourceLoaderOptions call site which needs to
+ be updated after adding the CachingPolicy parameter.
+
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::startLoading):
+
2016-01-28 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: InspectorTimelineAgent doesn't need to recompile functions because it now uses the sampling profiler
Modified: tags/Safari-602.1.18.6/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (196350 => 196351)
--- tags/Safari-602.1.18.6/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-02-10 01:21:18 UTC (rev 196350)
+++ tags/Safari-602.1.18.6/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-02-10 02:29:38 UTC (rev 196351)
@@ -72,7 +72,7 @@
URL requestURL = CFURLRequestGetURL(urlRequest.get());
// 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, ClientDidNotRequestCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading));
+ CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, ClientDidNotRequestCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::DisallowCaching));
request.mutableResourceRequest().setPriority(ResourceLoadPriority::Low);
CachedResourceLoader* loader = m_parent->player()->cachedResourceLoader();
