Title: [153429] trunk/Source/WebCore
- Revision
- 153429
- Author
- [email protected]
- Date
- 2013-07-29 09:34:47 -0700 (Mon, 29 Jul 2013)
Log Message
Made EGL useable by non-cairo ports.
https://bugs.webkit.org/show_bug.cgi?id=119177
Reviewed by Brent Fulgham.
* platform/graphics/cairo/GLContext.h:
* platform/graphics/egl/GLContextEGL.cpp:
(WebCore::GLContextEGL::GLContextEGL):
* platform/graphics/egl/GLContextEGL.h:
Protected Cairo-specific code with #if USE(CAIRO)
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153428 => 153429)
--- trunk/Source/WebCore/ChangeLog 2013-07-29 16:25:08 UTC (rev 153428)
+++ trunk/Source/WebCore/ChangeLog 2013-07-29 16:34:47 UTC (rev 153429)
@@ -1,3 +1,16 @@
+2013-07-29 Alex Christensen <[email protected]>
+
+ Made EGL useable by non-cairo ports.
+ https://bugs.webkit.org/show_bug.cgi?id=119177
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/cairo/GLContext.h:
+ * platform/graphics/egl/GLContextEGL.cpp:
+ (WebCore::GLContextEGL::GLContextEGL):
+ * platform/graphics/egl/GLContextEGL.h:
+ Protected Cairo-specific code with #if USE(CAIRO)
+
2013-07-29 Sergio Correia <[email protected]>
CoordinatedGraphics: Add API to get and set the active state of a WebView
Modified: trunk/Source/WebCore/platform/graphics/cairo/GLContext.h (153428 => 153429)
--- trunk/Source/WebCore/platform/graphics/cairo/GLContext.h 2013-07-29 16:25:08 UTC (rev 153428)
+++ trunk/Source/WebCore/platform/graphics/cairo/GLContext.h 2013-07-29 16:34:47 UTC (rev 153429)
@@ -25,7 +25,9 @@
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
+#if USE(CAIRO)
typedef struct _cairo_device cairo_device_t;
+#endif
#if PLATFORM(X11)
typedef struct _XDisplay Display;
@@ -48,7 +50,10 @@
virtual void waitNative() = 0;
virtual bool canRenderToDefaultFramebuffer() = 0;
virtual IntSize defaultFrameBufferSize() = 0;
+
+#if USE(CAIRO)
virtual cairo_device_t* cairoDevice() = 0;
+#endif
#if PLATFORM(X11)
static Display* sharedX11Display();
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (153428 => 153429)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-29 16:25:08 UTC (rev 153428)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-29 16:34:47 UTC (rev 153429)
@@ -217,7 +217,9 @@
: m_context(context)
, m_surface(surface)
, m_type(type)
+#if USE(CAIRO)
, m_cairoDevice(0)
+#endif
{
}
@@ -279,6 +281,7 @@
eglWaitNative(EGL_CORE_NATIVE_ENGINE);
}
+#if USE(CAIRO)
cairo_device_t* GLContextEGL::cairoDevice()
{
if (m_cairoDevice)
@@ -290,6 +293,7 @@
return m_cairoDevice;
}
+#endif
#if ENABLE(WEBGL)
PlatformGraphicsContext3D GLContextEGL::platformContext()
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h (153428 => 153429)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2013-07-29 16:25:08 UTC (rev 153428)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2013-07-29 16:34:47 UTC (rev 153429)
@@ -41,7 +41,9 @@
virtual void waitNative();
virtual bool canRenderToDefaultFramebuffer();
virtual IntSize defaultFrameBufferSize();
+#if USE(CAIRO)
virtual cairo_device_t* cairoDevice();
+#endif
#if ENABLE(WEBGL)
virtual PlatformGraphicsContext3D platformContext();
@@ -59,7 +61,9 @@
EGLContext m_context;
EGLSurface m_surface;
EGLSurfaceType m_type;
+#if USE(CAIRO)
cairo_device_t* m_cairoDevice;
+#endif
};
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes