Diff
Modified: releases/WebKitGTK/webkit-2.10/ChangeLog (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
@@ -1,3 +1,13 @@
+2015-10-06 Emanuele Aina <[email protected]>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * Source/cmake/OptionsGTK.cmake: Make ENABLE_WAYLAND_TARGET depend on
+ ENABLE_OPENGL due to EGL usage.
+
2015-09-21 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.0 release.
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
@@ -1,3 +1,19 @@
+2015-10-06 Emanuele Aina <[email protected]>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/texmap/BitmapTextureGL.h:
+ * platform/graphics/texmap/BitmapTextureGL.cpp:
+ * platform/graphics/texmap/TextureMapperGL.h:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ * platform/graphics/texmap/TextureMapperShaderProgram.h:
+ * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+ Fix TEXTURE_MAPPER_GL vs. TEXTURE_MAPPER guards to make sure that
+ ENABLE_OPENGL=OFF only disables the GL-related parts.
+
2015-10-05 Chris Dumez <[email protected]>
data: URLs should not be preloaded
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -22,6 +22,8 @@
#include "config.h"
#include "BitmapTextureGL.h"
+#if USE(TEXTURE_MAPPER_GL)
+
#include "Extensions3D.h"
#include "FilterOperations.h"
#include "GraphicsContext.h"
@@ -377,3 +379,5 @@
}
}; // namespace WebCore
+
+#endif // USE(TEXTURE_MAPPER_GL)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -21,6 +21,8 @@
#ifndef BitmapTextureGL_h
#define BitmapTextureGL_h
+#if USE(TEXTURE_MAPPER_GL)
+
#include "BitmapTexture.h"
#include "FilterOperation.h"
#include "GraphicsContext3D.h"
@@ -92,4 +94,6 @@
}
+#endif // USE(TEXTURE_MAPPER_GL)
+
#endif // BitmapTextureGL_h
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -22,6 +22,8 @@
#include "config.h"
#include "TextureMapperGL.h"
+#if USE(TEXTURE_MAPPER_GL)
+
#include "BitmapTextureGL.h"
#include "BitmapTexturePool.h"
#include "Extensions3D.h"
@@ -52,8 +54,6 @@
#define GL_UNPACK_SKIP_ROWS 0x0CF3
#endif
-#if USE(TEXTURE_MAPPER)
-
namespace WebCore {
struct TextureMapperGLData {
WTF_MAKE_FAST_ALLOCATED;
@@ -798,12 +798,11 @@
return adoptRef(texture);
}
-#if USE(TEXTURE_MAPPER_GL)
std::unique_ptr<TextureMapper> TextureMapper::platformCreateAccelerated()
{
return std::make_unique<TextureMapperGL>();
}
-#endif
};
-#endif
+
+#endif // USE(TEXTURE_MAPPER_GL)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -21,7 +21,7 @@
#ifndef TextureMapperGL_h
#define TextureMapperGL_h
-#if USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER_GL)
#include "FilterOperation.h"
#include "FloatQuad.h"
@@ -138,6 +138,6 @@
} // namespace WebCore
-#endif // USE(TEXTURE_MAPPER)
+#endif // USE(TEXTURE_MAPPER_GL)
#endif // TextureMapperGL_h
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -22,7 +22,8 @@
#include "config.h"
#include "TextureMapperShaderProgram.h"
-#if USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER_GL)
+
#include "LengthFunctions.h"
#include "Logging.h"
#include "TextureMapperGL.h"
@@ -412,4 +413,4 @@
}
}
-#endif
+#endif // USE(TEXTURE_MAPPER_GL)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -21,7 +21,7 @@
#ifndef TextureMapperShaderProgram_h
#define TextureMapperShaderProgram_h
-#if USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER_GL)
#include "GraphicsContext3D.h"
#include "TransformationMatrix.h"
#include <wtf/HashMap.h>
@@ -96,6 +96,6 @@
};
}
-#endif
+#endif // USE(TEXTURE_MAPPER_GL)
#endif // TextureMapperShaderProgram_h
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 11:00:43 UTC (rev 190964)
@@ -1,3 +1,40 @@
+2015-10-06 Emanuele Aina <[email protected]>
+
+ Fix ENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=146511
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize):
+ (webkitWebViewBaseDraw):
+ (webkitWebViewBaseDidRelaunchWebProcess):
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ webkitWebViewRenderAcceleratedCompositingResults()
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ * UIProcess/DrawingAreaProxyImpl.h:
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::DrawingArea):
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/LayerTreeHost.h:
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ setNativeSurfaceHandleForCompositing().
+ * UIProcess/gtk/WebPreferencesGtk.cpp:
+ (WebKit::WebPreferences::platformInitializeStore):
+ Default to no AC if no GL support has been built.
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ SetNativeSurfaceHandleForCompositing.
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
+ Replace USE(TEXTURE_MAPPER_GL) with USE(TEXTURE_MAPPER) around
+ setNativeSurfaceHandleForCompositing().
+ (WebKit::DrawingAreaImpl::setNativeSurfaceHandleForCompositing):
+ Force setAcceleratedCompositingEnabled() only if a LayerTreeHost
+ implementation is available, to avoid crashing when building without
+ any GL support.
+
2015-10-02 Antoine Quint <[email protected]>
popstate is fired at the wrong time on load
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -326,7 +326,7 @@
gtk_widget_set_window(widget, window);
gdk_window_set_user_data(window, widget);
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
#endif
@@ -472,7 +472,7 @@
priv->authenticationDialog = 0;
}
-#if USE(TEXTURE_MAPPER_GL)
+#if USE(TEXTURE_MAPPER)
static bool webkitWebViewRenderAcceleratedCompositingResults(WebKitWebViewBase* webViewBase, DrawingAreaProxyImpl* drawingArea, cairo_t* cr, GdkRectangle* clipRect)
{
ASSERT(drawingArea);
@@ -518,7 +518,7 @@
if (!gdk_cairo_get_clip_rectangle(cr, &clipRect))
return FALSE;
-#if USE(TEXTURE_MAPPER_GL)
+#if USE(TEXTURE_MAPPER)
if (webkitWebViewRenderAcceleratedCompositingResults(webViewBase, drawingArea, cr, &clipRect))
return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->draw(widget, cr);
#endif
@@ -1374,7 +1374,7 @@
// Queue a resize to ensure the new DrawingAreaProxy is resized.
gtk_widget_queue_resize_no_redraw(GTK_WIDGET(webkitWebViewBase));
-#if PLATFORM(X11)
+#if PLATFORM(X11) && USE(TEXTURE_MAPPER)
if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
return;
@@ -1384,12 +1384,13 @@
#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (!priv->redirectedWindow)
return;
- drawingArea->setNativeSurfaceHandleForCompositing(priv->redirectedWindow->windowID());
+ uint64_t windowID = priv->redirectedWindow->windowID();
#else
if (!gtk_widget_get_realized(GTK_WIDGET(webkitWebViewBase)))
return;
- drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(webkitWebViewBase))));
+ uint64_t windowID = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(webkitWebViewBase)));
#endif
+ drawingArea->setNativeSurfaceHandleForCompositing(windowID);
#else
UNUSED_PARAM(webkitWebViewBase);
#endif
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -300,7 +300,7 @@
m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
}
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
void DrawingAreaProxyImpl::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
m_webPageProxy.process().send(Messages::DrawingArea::SetNativeSurfaceHandleForCompositing(handle), m_webPageProxy.pageID());
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -48,7 +48,7 @@
bool hasReceivedFirstUpdate() const { return m_hasReceivedFirstUpdate; }
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
void setNativeSurfaceHandleForCompositing(uint64_t);
#endif
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/WebPreferencesGtk.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -43,6 +43,9 @@
setPluginsEnabled(false);
}
#endif
+#if !ENABLE(OPEN_GL)
+ setAcceleratedCompositingEnabled(false);
+#endif
}
void WebPreferences::platformUpdateStringValueForKey(const String&, const String&)
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -76,7 +76,7 @@
DrawingArea::DrawingArea(DrawingAreaType type, WebPage& webPage)
: m_type(type)
, m_webPage(webPage)
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
, m_nativeSurfaceHandleForCompositing(0)
#endif
{
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -142,7 +142,7 @@
DrawingAreaType m_type;
WebPage& m_webPage;
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
uint64_t m_nativeSurfaceHandleForCompositing;
#endif
@@ -167,7 +167,7 @@
virtual void addTransactionCallbackID(uint64_t callbackID) { ASSERT_NOT_REACHED(); }
#endif
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
#endif
};
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2015-10-13 11:00:43 UTC (rev 190964)
@@ -40,7 +40,7 @@
AddTransactionCallbackID(uint64_t callbackID)
#endif
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
SetNativeSurfaceHandleForCompositing(uint64_t handle)
#endif
}
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2015-10-13 11:00:43 UTC (rev 190964)
@@ -468,7 +468,7 @@
ASSERT(!m_layerTreeHost);
m_layerTreeHost = LayerTreeHost::create(&m_webPage);
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
if (m_nativeSurfaceHandleForCompositing)
m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
#endif
@@ -687,14 +687,15 @@
m_layerTreeHost->setViewOverlayRootLayer(viewOverlayRootLayer);
}
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
void DrawingAreaImpl::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
m_nativeSurfaceHandleForCompositing = handle;
- m_webPage.corePage()->settings().setAcceleratedCompositingEnabled(true);
- if (m_layerTreeHost)
+ if (m_layerTreeHost) {
+ m_webPage.corePage()->settings().setAcceleratedCompositingEnabled(true);
m_layerTreeHost->setNativeSurfaceHandleForCompositing(handle);
+ }
}
#endif
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -70,7 +70,7 @@
virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) override;
#endif
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2015-10-13 11:00:43 UTC (rev 190964)
@@ -92,7 +92,7 @@
virtual void scheduleAnimation() = 0;
#endif
-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
#endif
Modified: releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake (190963 => 190964)
--- releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake 2015-10-13 10:57:32 UTC (rev 190963)
+++ releases/WebKitGTK/webkit-2.10/Source/cmake/OptionsGTK.cmake 2015-10-13 11:00:43 UTC (rev 190964)
@@ -95,6 +95,7 @@
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
+WEBKIT_OPTION_DEPEND(ENABLE_WAYLAND_TARGET ENABLE_OPENGL)
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
if (DEVELOPER_MODE)
