Modified: trunk/Source/WebCore/ChangeLog (196088 => 196089)
--- trunk/Source/WebCore/ChangeLog 2016-02-03 23:53:31 UTC (rev 196088)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 00:00:24 UTC (rev 196089)
@@ -1,5 +1,18 @@
2016-02-03 Jer Noble <[email protected]>
+ [Win] Pass entire request (rather than just URL) to clients of WebCoreAVCFResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=153653
+
+ Reviewed by Brent Fulgham.
+
+ This will allow those clients to see the byte-range request ("Range:") header and respond
+ appropriately.
+
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::startLoading):
+
+2016-02-03 Jer Noble <[email protected]>
+
Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
* platform/network/cocoa/WebCoreNSURLSession.h:
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (196088 => 196089)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-02-03 23:53:31 UTC (rev 196088)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp 2016-02-04 00:00:24 UTC (rev 196089)
@@ -69,10 +69,9 @@
return;
RetainPtr<CFURLRequestRef> urlRequest = AVCFAssetResourceLoadingRequestGetURLRequest(m_avRequest.get());
- 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, CachingPolicy::DisallowCaching));
+ CachedResourceRequest request(ResourceRequest(urlRequest.get()), 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();
@@ -80,7 +79,7 @@
if (m_resource)
m_resource->addClient(this);
else {
- LOG_ERROR("Failed to start load for media at url %s", requestURL.string().ascii().data());
+ LOG_ERROR("Failed to start load for media at url %s", URL(CFURLRequestGetURL(urlRequest.get())).string().ascii().data());
RetainPtr<CFErrorRef> error = adoptCF(CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainCFNetwork, kCFURLErrorUnknown, nullptr));
AVCFAssetResourceLoadingRequestFinishLoadingWithError(m_avRequest.get(), error.get());
}
