Title: [104320] trunk/Source/WebCore
- Revision
- 104320
- Author
- psola...@apple.com
- Date
- 2012-01-06 12:22:53 -0800 (Fri, 06 Jan 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104319 => 104320)
--- trunk/Source/WebCore/ChangeLog 2012-01-06 20:21:23 UTC (rev 104319)
+++ trunk/Source/WebCore/ChangeLog 2012-01-06 20:22:53 UTC (rev 104320)
@@ -1,3 +1,13 @@
+2012-01-06 Pratik Solanki <psola...@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 <infe...@chromium.org>
Crash with range selection across different documents.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (104319 => 104320)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2012-01-06 20:21:23 UTC (rev 104319)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2012-01-06 20:22:53 UTC (rev 104320)
@@ -333,11 +333,20 @@
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 @@
privateBrowsingStorageSessionIdentifierBase() = identifier;
}
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) || USE(CFNETWORK)
String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
