Title: [189826] trunk/Source/WebCore
- Revision
- 189826
- Author
- clo...@igalia.com
- Date
- 2015-09-15 14:50:18 -0700 (Tue, 15 Sep 2015)
Log Message
[GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has built with OpenGLESv2 support only.
https://bugs.webkit.org/show_bug.cgi?id=149172
Reviewed by Martin Robinson.
No new tests, no behavior change.
* platform/graphics/glx/GLContextGLX.cpp:
(WebCore::GLContextGLX::cairoDevice):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (189825 => 189826)
--- trunk/Source/WebCore/ChangeLog 2015-09-15 21:39:02 UTC (rev 189825)
+++ trunk/Source/WebCore/ChangeLog 2015-09-15 21:50:18 UTC (rev 189826)
@@ -1,3 +1,15 @@
+2015-09-15 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has built with OpenGLESv2 support only.
+ https://bugs.webkit.org/show_bug.cgi?id=149172
+
+ Reviewed by Martin Robinson.
+
+ No new tests, no behavior change.
+
+ * platform/graphics/glx/GLContextGLX.cpp:
+ (WebCore::GLContextGLX::cairoDevice):
+
2015-09-15 Chris Dumez <cdu...@apple.com>
Element.getAttributeNS() should return null if the attribute does not exist
Modified: trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (189825 => 189826)
--- trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2015-09-15 21:39:02 UTC (rev 189825)
+++ trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2015-09-15 21:50:18 UTC (rev 189826)
@@ -226,7 +226,7 @@
if (m_cairoDevice)
return m_cairoDevice;
-#if ENABLE(ACCELERATED_2D_CANVAS)
+#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS
m_cairoDevice = cairo_glx_device_create(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native(), m_context.get());
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
