diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:23:55 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:58 +0000 |
| commit | 6140756452d66f35970067d531fbcd4391001994 (patch) | |
| tree | d14023c5676a0eb66a56846e9afb217a5f5dcf21 /WebCore/platform | |
| parent | deb3a29a9173fe7088b87fbd86ed1a754e199e4c (diff) | |
| download | external_webkit-6140756452d66f35970067d531fbcd4391001994.zip external_webkit-6140756452d66f35970067d531fbcd4391001994.tar.gz external_webkit-6140756452d66f35970067d531fbcd4391001994.tar.bz2 | |
Merge webkit.org at r54127 : Merge with additional comment in SharedBuffer.cpp
See http://trac.webkit.org/changeset/52795
Change-Id: I0ba4c6499090fa1405ab7bc50b90f278f76e916f
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/SharedBuffer.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h index 4937c73..c2db21e 100644 --- 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 |