Title: [135755] trunk/Source/WebCore
- Revision
- 135755
- Author
- psola...@apple.com
- Date
- 2012-11-26 12:49:06 -0800 (Mon, 26 Nov 2012)
Log Message
Add ResourceBuffer::append(CFDataRef) to get code to compile with USE(NETWORK_CFDATA_ARRAY_CALLBACK)
https://bugs.webkit.org/show_bug.cgi?id=102706
Reviewed by Brent Fulgham.
No new tests because the flag isn't enabled. Also the functionality should be covered by
existing tests.
* loader/ResourceBuffer.cpp:
(WebCore):
(WebCore::ResourceBuffer::append):
* loader/ResourceBuffer.h:
(ResourceBuffer):
* loader/mac/ResourceLoaderMac.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135754 => 135755)
--- trunk/Source/WebCore/ChangeLog 2012-11-26 20:37:06 UTC (rev 135754)
+++ trunk/Source/WebCore/ChangeLog 2012-11-26 20:49:06 UTC (rev 135755)
@@ -1,3 +1,20 @@
+2012-11-26 Pratik Solanki <psola...@apple.com>
+
+ Add ResourceBuffer::append(CFDataRef) to get code to compile with USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ https://bugs.webkit.org/show_bug.cgi?id=102706
+
+ Reviewed by Brent Fulgham.
+
+ No new tests because the flag isn't enabled. Also the functionality should be covered by
+ existing tests.
+
+ * loader/ResourceBuffer.cpp:
+ (WebCore):
+ (WebCore::ResourceBuffer::append):
+ * loader/ResourceBuffer.h:
+ (ResourceBuffer):
+ * loader/mac/ResourceLoaderMac.mm:
+
2012-11-26 Tony Chang <t...@chromium.org>
Move more functions from internals.settings to internals
Modified: trunk/Source/WebCore/loader/ResourceBuffer.cpp (135754 => 135755)
--- trunk/Source/WebCore/loader/ResourceBuffer.cpp 2012-11-26 20:37:06 UTC (rev 135754)
+++ trunk/Source/WebCore/loader/ResourceBuffer.cpp 2012-11-26 20:49:06 UTC (rev 135755)
@@ -71,6 +71,14 @@
m_sharedBuffer->append(data, size);
}
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+void ResourceBuffer::append(CFDataRef data)
+{
+ ASSERT(m_sharedBuffer);
+ m_sharedBuffer->append(data);
+}
+#endif
+
void ResourceBuffer::clear()
{
m_sharedBuffer->clear();
Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (135754 => 135755)
--- trunk/Source/WebCore/loader/ResourceBuffer.h 2012-11-26 20:37:06 UTC (rev 135754)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2012-11-26 20:49:06 UTC (rev 135755)
@@ -55,6 +55,9 @@
virtual bool isEmpty() const;
void append(const char*, unsigned);
+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ void append(CFDataRef);
+#endif
void clear();
unsigned getSomeData(const char*& data, unsigned position = 0) const;
Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (135754 => 135755)
--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2012-11-26 20:37:06 UTC (rev 135754)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2012-11-26 20:49:06 UTC (rev 135755)
@@ -35,6 +35,7 @@
#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
#include "InspectorInstrumentation.h"
+#include "ResourceBuffer.h"
#endif
#if USE(CFNETWORK)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
