[GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has built with OpenGLESv...
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Sep 2015 21:50:18 +0000 (21:50 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Sep 2015 21:50:18 +0000 (21:50 +0000)
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):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

index 53c7a3e..8b7f582 100644 (file)
@@ -1,3 +1,15 @@
+2015-09-15  Carlos Alberto Lopez Perez  <clopez@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  <cdumez@apple.com>
 
         Element.getAttributeNS() should return null if the attribute does not exist
index f05b6cf..a0a0c16 100644 (file)
@@ -226,7 +226,7 @@ cairo_device_t* GLContextGLX::cairoDevice()
     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