Commit 6119f4bd authored by psolanki@apple.com's avatar psolanki@apple.com

WebKit1 fails to compile with USE(CFNETWORK) and HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)

https://bugs.webkit.org/show_bug.cgi?id=75675

Reviewed by Oliver Hunt.

* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::willCacheResponse):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104320 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3c2f9b71
2012-01-06 Pratik Solanki <psolanki@apple.com>
WebKit1 fails to compile with USE(CFNETWORK) and HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
https://bugs.webkit.org/show_bug.cgi?id=75675
Reviewed by Oliver Hunt.
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::willCacheResponse):
2012-01-06 Abhishek Arya <inferno@chromium.org>
Crash with range selection across different documents.
......@@ -333,11 +333,20 @@ static CFCachedURLResponseRef willCacheResponse(CFURLConnectionRef, CFCachedURLR
handle->client()->willCacheResponse(handle, policy);
if (static_cast<CFURLCacheStoragePolicy>(policy) != CFCachedURLResponseGetStoragePolicy(cachedResponse)) {
#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
RetainPtr<CFArrayRef> receiverData(AdoptCF, CFCachedURLResponseCopyReceiverDataArray(cachedResponse));
cachedResponse = CFCachedURLResponseCreateWithDataArray(kCFAllocatorDefault,
CFCachedURLResponseGetWrappedResponse(cachedResponse),
receiverData.get(),
CFCachedURLResponseGetUserInfo(cachedResponse),
static_cast<CFURLCacheStoragePolicy>(policy));
#else
cachedResponse = CFCachedURLResponseCreateWithUserInfo(kCFAllocatorDefault,
CFCachedURLResponseGetWrappedResponse(cachedResponse),
CFCachedURLResponseGetReceiverData(cachedResponse),
CFCachedURLResponseGetUserInfo(cachedResponse),
static_cast<CFURLCacheStoragePolicy>(policy));
#endif
} else
CFRetain(cachedResponse);
......@@ -1001,7 +1010,7 @@ void ResourceHandle::setPrivateBrowsingStorageSessionIdentifierBase(const String
privateBrowsingStorageSessionIdentifierBase() = identifier;
}
#if PLATFORM(WIN)
#if PLATFORM(WIN) || USE(CFNETWORK)
String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment