Diff
Modified: trunk/Source/WebCore/ChangeLog (94357 => 94358)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 23:22:03 UTC (rev 94358)
@@ -1,3 +1,25 @@
+2011-09-01 Pratik Solanki <[email protected]>
+
+ Rename CFNETWORK_DATA_ARRAY_CALLBACK to NETWORK_CFDATA_ARRAY_CALLBACK
+ https://bugs.webkit.org/show_bug.cgi?id=67348
+
+ Reviewed by Alexey Proskuryakov.
+
+ * loader/ResourceLoader.h:
+ * loader/SubresourceLoader.h:
+ * loader/cf/SubresourceLoaderCF.cpp:
+ * loader/mac/ResourceLoaderMac.mm:
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::clear):
+ (WebCore::SharedBuffer::buffer):
+ * platform/SharedBuffer.h:
+ * platform/cf/SharedBufferCF.cpp:
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleClient.h:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+ * platform/network/mac/ResourceHandleMac.mm:
+
2011-09-01 Kentaro Hara <[email protected]>
TypeError should be thrown when a constructor is called as a normal function.
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (94357 => 94358)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2011-09-01 23:22:03 UTC (rev 94358)
@@ -84,7 +84,7 @@
void willStopBufferingData(const char*, int);
virtual void didFinishLoading(double finishTime);
virtual void didFail(const ResourceError&);
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
virtual void didReceiveDataArray(CFArrayRef dataArray);
#endif
@@ -110,7 +110,7 @@
virtual bool shouldUseCredentialStorage(ResourceHandle*) { return shouldUseCredentialStorage(); }
virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didReceiveAuthenticationChallenge(challenge); }
virtual void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) { didCancelAuthenticationChallenge(challenge); }
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
virtual void didReceiveDataArray(ResourceHandle*, CFArrayRef dataArray);
#endif
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
Modified: trunk/Source/WebCore/loader/SubresourceLoader.h (94357 => 94358)
--- trunk/Source/WebCore/loader/SubresourceLoader.h 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/loader/SubresourceLoader.h 2011-09-01 23:22:03 UTC (rev 94358)
@@ -60,7 +60,7 @@
virtual void willCancel(const ResourceError&);
virtual void didCancel(const ResourceError&);
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
virtual bool supportsDataArray() { return true; }
virtual void didReceiveDataArray(CFArrayRef);
#endif
Modified: trunk/Source/WebCore/loader/cf/SubresourceLoaderCF.cpp (94357 => 94358)
--- trunk/Source/WebCore/loader/cf/SubresourceLoaderCF.cpp 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/loader/cf/SubresourceLoaderCF.cpp 2011-09-01 23:22:03 UTC (rev 94358)
@@ -29,7 +29,7 @@
namespace WebCore {
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void SubresourceLoader::didReceiveDataArray(CFArrayRef dataArray)
{
// Reference the object in this method since the additional processing can do
Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (94357 => 94358)
--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2011-09-01 23:22:03 UTC (rev 94358)
@@ -33,7 +33,7 @@
#include "FrameLoaderClient.h"
#include "ResourceHandle.h"
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
#include "InspectorInstrumentation.h"
#endif
@@ -68,7 +68,7 @@
#endif
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void ResourceLoader::didReceiveDataArray(CFArrayRef dataArray)
{
Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (94357 => 94358)
--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2011-09-01 23:22:03 UTC (rev 94358)
@@ -182,7 +182,7 @@
m_buffer.clear();
m_purgeableBuffer.clear();
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
m_dataArray.clear();
#endif
}
@@ -224,7 +224,7 @@
freeSegment(m_segments[i]);
}
m_segments.clear();
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
copyDataArrayAndClear(destination, bytesLeft);
#endif
}
Modified: trunk/Source/WebCore/platform/SharedBuffer.h (94357 => 94358)
--- trunk/Source/WebCore/platform/SharedBuffer.h 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2011-09-01 23:22:03 UTC (rev 94358)
@@ -92,7 +92,7 @@
const char* platformData() const;
unsigned platformDataSize() const;
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void append(CFDataRef);
#endif
@@ -137,7 +137,7 @@
mutable Vector<char> m_buffer;
mutable Vector<char*> m_segments;
OwnPtr<PurgeableBuffer> m_purgeableBuffer;
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
mutable Vector<RetainPtr<CFDataRef> > m_dataArray;
void copyDataArrayAndClear(char *destination, unsigned bytesToCopy) const;
#endif
Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (94357 => 94358)
--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2011-09-01 23:22:03 UTC (rev 94358)
@@ -91,7 +91,7 @@
m_cfData = 0;
}
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void SharedBuffer::append(CFDataRef data)
{
ASSERT(data);
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (94357 => 94358)
--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-09-01 23:22:03 UTC (rev 94358)
@@ -217,7 +217,7 @@
static CFStringRef synchronousLoadRunLoopMode();
#endif
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void handleDataArray(CFArrayRef dataArray);
#endif
Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (94357 => 94358)
--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2011-09-01 23:22:03 UTC (rev 94358)
@@ -81,7 +81,7 @@
virtual void wasBlocked(ResourceHandle*) { }
virtual void cannotShowURL(ResourceHandle*) { }
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
virtual bool supportsDataArray() { return false; }
virtual void didReceiveDataArray(ResourceHandle*, CFArrayRef) { }
#endif
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (94357 => 94358)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-01 23:22:03 UTC (rev 94358)
@@ -234,7 +234,7 @@
handle->client()->didReceiveResponse(handle, cfResponse);
}
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
static void didReceiveDataArray(CFURLConnectionRef conn, CFArrayRef dataArray, const void* clientInfo)
{
#if LOG_DISABLED
@@ -481,7 +481,7 @@
RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(firstRequest(), shouldContentSniff));
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK) && USE(PROTECTION_SPACE_AUTH_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK) && USE(PROTECTION_SPACE_AUTH_CALLBACK)
CFURLConnectionClient_V6 client = { 6, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0, canRespondToProtectionSpace, 0, didReceiveDataArray};
#else
CFURLConnectionClient_V3 client = { 3, this, 0, 0, 0, WebCore::willSendRequest, didReceiveResponse, didReceiveData, 0, didFinishLoading, didFail, willCacheResponse, didReceiveChallenge, didSendBodyData, shouldUseCredentialStorageCallback, 0};
@@ -897,7 +897,7 @@
#endif // USE(CFNETWORK)
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
void ResourceHandle::handleDataArray(CFArrayRef dataArray)
{
ASSERT(client());
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (94357 => 94358)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2011-09-01 23:06:49 UTC (rev 94357)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2011-09-01 23:22:03 UTC (rev 94358)
@@ -814,7 +814,7 @@
m_handle->client()->didReceiveResponse(m_handle, r);
}
-#if HAVE(CFNETWORK_DATA_ARRAY_CALLBACK)
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
- (void)connection:(NSURLConnection *)connection didReceiveDataArray:(NSArray *)dataArray
{
UNUSED_PARAM(connection);
