From 6140756452d66f35970067d531fbcd4391001994 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:23:55 +0000 Subject: [PATCH] Merge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp See http://trac.webkit.org/changeset/52795 Change-Id: I0ba4c6499090fa1405ab7bc50b90f278f76e916f --- WebCore/platform/SharedBuffer.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h index 4937c737f..c2db21ef6 100644 --- a/WebCore/platform/SharedBuffer.h +++ b/WebCore/platform/SharedBuffer.h @@ -77,21 +77,16 @@ public: static PassRefPtr wrapCFData(CFDataRef); #endif -<<<<<<< HEAD #if PLATFORM(ANDROID) virtual #endif - const char* data() const; -#if PLATFORM(ANDROID) - virtual -#endif -======= // Calling this function will force internal segmented buffers // to be merged into a flat buffer. Use getSomeData() whenever possible // for better performance. const char* data() const; - ->>>>>>> webkit.org at r54127 +#if PLATFORM(ANDROID) + virtual +#endif unsigned size() const; // Calling this function will force internal segmented buffers -- 2.11.0