Title: [148862] trunk/Source/WebCore
- Revision
- 148862
- Author
- [email protected]
- Date
- 2013-04-22 00:57:46 -0700 (Mon, 22 Apr 2013)
Log Message
Fix multiple definition of ImageBuffer::platformLayer() in the BlackBerry port
https://bugs.webkit.org/show_bug.cgi?id=114936
Patch by Alberto Garcia <[email protected]> on 2013-04-22
Reviewed by Carlos Garcia Campos.
We already have a definition in ImageBufferBlackBerry.cpp.
* platform/graphics/ImageBuffer.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148861 => 148862)
--- trunk/Source/WebCore/ChangeLog 2013-04-22 07:49:47 UTC (rev 148861)
+++ trunk/Source/WebCore/ChangeLog 2013-04-22 07:57:46 UTC (rev 148862)
@@ -1,3 +1,15 @@
+2013-04-22 Alberto Garcia <[email protected]>
+
+ 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 <[email protected]>
Division by zero in CSSGradientValue::addStops()
Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (148861 => 148862)
--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2013-04-22 07:49:47 UTC (rev 148861)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp 2013-04-22 07:57:46 UTC (rev 148862)
@@ -99,7 +99,7 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
