Title: [152869] trunk/Source/WebCore
- Revision
- 152869
- Author
- [email protected]
- Date
- 2013-07-18 15:12:14 -0700 (Thu, 18 Jul 2013)
Log Message
Fixed compile errors for non-Cairo platforms using EGL.
https://bugs.webkit.org/show_bug.cgi?id=118536
Reviewed by Brent Fulgham.
* platform/graphics/egl/GLContextEGL.cpp: Added #if USE(CAIRO) around cairo.h.
(WebCore::GLContextEGL::~GLContextEGL): Added #if USE(CAIRO) around cairo_device_destroy call.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152868 => 152869)
--- trunk/Source/WebCore/ChangeLog 2013-07-18 22:06:56 UTC (rev 152868)
+++ trunk/Source/WebCore/ChangeLog 2013-07-18 22:12:14 UTC (rev 152869)
@@ -1,3 +1,13 @@
+2013-07-18 Alex Christensen <[email protected]>
+
+ Fixed compile errors for non-Cairo platforms using EGL.
+ https://bugs.webkit.org/show_bug.cgi?id=118536
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/egl/GLContextEGL.cpp: Added #if USE(CAIRO) around cairo.h.
+ (WebCore::GLContextEGL::~GLContextEGL): Added #if USE(CAIRO) around cairo_device_destroy call.
+
2013-07-18 Jer Noble <[email protected]>
New PDFPlugin doesn't support WebKitOmitPDFSupport, acts as if Plug-ins are off
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (152868 => 152869)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-18 22:06:56 UTC (rev 152868)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-18 22:12:14 UTC (rev 152869)
@@ -22,9 +22,12 @@
#if USE(EGL)
#include "GraphicsContext3D.h"
-#include <cairo.h>
#include <wtf/OwnPtr.h>
+#if USE(CAIRO)
+#include <cairo.h>
+#endif
+
#if USE(OPENGL_ES_2)
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
@@ -220,8 +223,10 @@
GLContextEGL::~GLContextEGL()
{
+#if USE(CAIRO)
if (m_cairoDevice)
cairo_device_destroy(m_cairoDevice);
+#endif
EGLDisplay display = sharedEGLDisplay();
if (m_context) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes