From 839c3f480504bf44536a37733a402a82a3fed7fd Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 9 Jun 2011 13:37:56 +0100
Subject: 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
---
 Source/WebCore/platform/graphics/ImageBufferData.h |  4 +++
 .../platform/graphics/android/ImageBufferData.h    | 40 ----------------------
 .../graphics/android/ImageBufferDataAndroid.h      | 40 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 40 deletions(-)
 delete mode 100644 Source/WebCore/platform/graphics/android/ImageBufferData.h
 create mode 100644 Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h

(limited to 'Source/WebCore/platform/graphics')

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/ImageBufferData.h
deleted file mode 100644
index 269b365..0000000
--- a/Source/WebCore/platform/graphics/android/ImageBufferData.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2008, The Android Open Source Project
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ImageBufferData_h
-#define ImageBufferData_h
-
-namespace WebCore {
-
-class IntSize;
-
-class ImageBufferData {
-public:
-    ImageBufferData(const IntSize&);
-};
-
-}  // namespace WebCore
-
-#endif  // ImageBufferData_h
diff --git a/Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h b/Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h
new file mode 100644
index 0000000..80cf79f
--- /dev/null
+++ b/Source/WebCore/platform/graphics/android/ImageBufferDataAndroid.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ImageBufferDataAndroid_h
+#define ImageBufferDataAndroid_h
+
+namespace WebCore {
+
+class IntSize;
+
+class ImageBufferData {
+public:
+    ImageBufferData(const IntSize&);
+};
+
+} // namespace WebCore
+
+#endif // ImageBufferDataAndroid_h
-- 
cgit v1.1