diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-09 13:37:56 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:57:11 +0100 |
| commit | 839c3f480504bf44536a37733a402a82a3fed7fd (patch) | |
| tree | 317db277d5d2c3bf71929c83fd0ced4ae7776c9e | |
| parent | 808efddb145d485fdb8202437578f218340124b2 (diff) | |
| download | external_webkit-839c3f480504bf44536a37733a402a82a3fed7fd.zip external_webkit-839c3f480504bf44536a37733a402a82a3fed7fd.tar.gz external_webkit-839c3f480504bf44536a37733a402a82a3fed7fd.tar.bz2 | |
Merge WebKit at r84325: Fix ImageBufferData.h
Need to include the Android ImageBufferData header. To avoid recursive
includes, rename android/ImageBufferData.h to
android/ImageBufferDataAndroid.h
See http://trac.webkit.org/changeset/83786
Change-Id: Ica2d0c5350810b918d034d0ac227eb6255939584
| -rw-r--r-- | Source/WebCore/platform/graphics/ImageBufferData.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h (renamed from Source/WebCore/platform/graphics/android/ImageBufferData.h) | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/ImageBufferData.h b/Source/WebCore/platform/graphics/ImageBufferData.h index 670a10f..554aaf2 100644 --- a/Source/WebCore/platform/graphics/ImageBufferData.h +++ b/Source/WebCore/platform/graphics/ImageBufferData.h @@ -30,7 +30,11 @@ #elif PLATFORM(QT) #include "ImageBufferDataQt.h" #elif USE(SKIA) +#if PLATFORM(ANDROID) +#include "ImageBufferDataAndroid.h" +#else #include "ImageBufferDataSkia.h" +#endif #elif PLATFORM(HAIKU) #include "ImageBufferDataHaiku.h" #elif OS(WINCE) diff --git a/Source/WebCore/platform/graphics/android/ImageBufferData.h b/Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h index 269b365..80cf79f 100644 --- a/Source/WebCore/platform/graphics/android/ImageBufferData.h +++ b/Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ImageBufferData_h -#define ImageBufferData_h +#ifndef ImageBufferDataAndroid_h +#define ImageBufferDataAndroid_h namespace WebCore { @@ -35,6 +35,6 @@ public: ImageBufferData(const IntSize&); }; -} // namespace WebCore +} // namespace WebCore -#endif // ImageBufferData_h +#endif // ImageBufferDataAndroid_h |