Fix multiple definition of ImageBuffer::platformLayer() in the BlackBerry port
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Apr 2013 07:57:46 +0000 (07:57 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Apr 2013 07:57:46 +0000 (07:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114936

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-04-22
Reviewed by Carlos Garcia Campos.

We already have a definition in ImageBufferBlackBerry.cpp.

* platform/graphics/ImageBuffer.cpp:
(WebCore):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ImageBuffer.cpp

index 6924ede..26a7bff 100644 (file)
@@ -1,3 +1,15 @@
+2013-04-22  Alberto Garcia  <agarcia@igalia.com>
+
+        Fix multiple definition of ImageBuffer::platformLayer() in the BlackBerry port
+        https://bugs.webkit.org/show_bug.cgi?id=114936
+
+        Reviewed by Carlos Garcia Campos.
+
+        We already have a definition in ImageBufferBlackBerry.cpp.
+
+        * platform/graphics/ImageBuffer.cpp:
+        (WebCore):
+
 2013-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Division by zero in CSSGradientValue::addStops()
index 25e7365..fd02986 100644 (file)
@@ -99,7 +99,7 @@ void ImageBuffer::convertToLuminanceMask()
     genericConvertToLuminanceMask();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) && !USE(CAIRO)
+#if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) && !USE(CAIRO) && !PLATFORM(BLACKBERRY)
 PlatformLayer* ImageBuffer::platformLayer() const
 {
     return 0;