Changeset 104320 in webkit

Timestamp:

Jan 6, 2012 12:22:53 PM (12 years ago)

Author:

psolanki@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -334 +334 @@
 
     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),
@@ -339 +347 @@
                                                                CFCachedURLResponseGetUserInfo(cachedResponse), 
                                                                static_cast<CFURLCacheStoragePolicy>(policy));
+#endif
     } else
         CFRetain(cachedResponse);
@@ -1002 +1011 @@
 }
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) || USE(CFNETWORK)
 
 String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()