Title: [138319] trunk/Source
- Revision
- 138319
- Author
- [email protected]
- Date
- 2012-12-20 16:21:04 -0800 (Thu, 20 Dec 2012)
Log Message
Rename HAVE(NETWORK_CFDATA_ARRAY_CALLBACK) to USE(NETWORK_CFDATA_ARRAY_CALLBACK)
https://bugs.webkit.org/show_bug.cgi?id=105578
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* loader/ResourceBuffer.cpp: Remove duplicate append() call that was under the wrong ifdef.
* loader/ResourceBuffer.h:
Source/WebKit2:
* NetworkProcess/NetworkResourceLoader.cpp:
* NetworkProcess/NetworkResourceLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138318 => 138319)
--- trunk/Source/WebCore/ChangeLog 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebCore/ChangeLog 2012-12-21 00:21:04 UTC (rev 138319)
@@ -1,3 +1,13 @@
+2012-12-20 Pratik Solanki <[email protected]>
+
+ Rename HAVE(NETWORK_CFDATA_ARRAY_CALLBACK) to USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ https://bugs.webkit.org/show_bug.cgi?id=105578
+
+ Reviewed by Alexey Proskuryakov.
+
+ * loader/ResourceBuffer.cpp: Remove duplicate append() call that was under the wrong ifdef.
+ * loader/ResourceBuffer.h:
+
2012-12-20 Elliott Sprehn <[email protected]>
RenderBlock hit testing should ignore PseudoElements
Modified: trunk/Source/WebCore/loader/ResourceBuffer.cpp (138318 => 138319)
--- trunk/Source/WebCore/loader/ResourceBuffer.cpp 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebCore/loader/ResourceBuffer.cpp 2012-12-21 00:21:04 UTC (rev 138319)
@@ -126,13 +126,6 @@
}
#endif
-#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
-void ResourceBuffer::append(CFDataRef dataRef)
-{
- m_sharedBuffer->append(dataRef);
-}
-#endif
-
void ResourceBuffer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this);
Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (138318 => 138319)
--- trunk/Source/WebCore/loader/ResourceBuffer.h 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2012-12-21 00:21:04 UTC (rev 138319)
@@ -77,9 +77,6 @@
#if USE(CF)
CFDataRef createCFData();
#endif
-#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
- void append(CFDataRef);
-#endif
void reportMemoryUsage(MemoryObjectInfo*) const;
Modified: trunk/Source/WebKit2/ChangeLog (138318 => 138319)
--- trunk/Source/WebKit2/ChangeLog 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-21 00:21:04 UTC (rev 138319)
@@ -1,3 +1,13 @@
+2012-12-20 Pratik Solanki <[email protected]>
+
+ Rename HAVE(NETWORK_CFDATA_ARRAY_CALLBACK) to USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ https://bugs.webkit.org/show_bug.cgi?id=105578
+
+ Reviewed by Alexey Proskuryakov.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * NetworkProcess/NetworkResourceLoader.h:
+
2012-12-20 Alexey Proskuryakov <[email protected]>
LocalTerminationDisabler is not needed in WebCookieManager.cpp
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (138318 => 138319)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2012-12-21 00:21:04 UTC (rev 138319)
@@ -324,7 +324,7 @@
}
#endif
-#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
bool NetworkResourceLoader::supportsDataArray()
{
notImplemented();
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (138318 => 138319)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2012-12-21 00:20:14 UTC (rev 138318)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2012-12-21 00:21:04 UTC (rev 138319)
@@ -89,7 +89,7 @@
virtual bool canAuthenticateAgainstProtectionSpace(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&) OVERRIDE;
#endif
-#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
virtual bool supportsDataArray() OVERRIDE;
virtual void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) OVERRIDE;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
