Merge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp

See http://trac.webkit.org/changeset/52795

Change-Id: I0ba4c6499090fa1405ab7bc50b90f278f76e916f

diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h
index 4937c73..c2db21e 100644 (file)
--- a/WebCore/platform/SharedBuffer.h
+++ b/WebCore/platform/SharedBuffer.h
@@ -77,21 +77,16 @@ public:
     static PassRefPtr<SharedBuffer> 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