Diff
Modified: trunk/ChangeLog (207657 => 207658)
--- trunk/ChangeLog 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/ChangeLog 2016-10-21 05:30:53 UTC (rev 207658)
@@ -1,3 +1,15 @@
+2016-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ Remove wrong dependency of Wayland on OpenGL introduced in r190615, it should be possible to build for Wayland
+ without GL.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2016-10-20 Fujii Hironori <hironori.fu...@sony.com>
[CMake] CMake does not support the dep files for implicit dependency
Modified: trunk/Source/WebCore/ChangeLog (207657 => 207658)
--- trunk/Source/WebCore/ChangeLog 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 05:30:53 UTC (rev 207658)
@@ -1,3 +1,19 @@
+2016-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ Only define sharingGLContext in PlatformDisplay if EGL or GLX are enabled.
+
+ * platform/graphics/PlatformDisplay.cpp:
+ * platform/graphics/PlatformDisplay.h:
+ * platform/graphics/wayland/PlatformDisplayWayland.cpp:
+ (WebCore::PlatformDisplayWayland::initialize):
+ * platform/graphics/x11/PlatformDisplayX11.cpp:
+ (WebCore::PlatformDisplayX11::~PlatformDisplayX11):
+
2016-10-20 Filip Pizlo <fpi...@apple.com>
The tracking of the coarse-grain Heap state (allocating or not, collector or not, eden vs full) should respect the orthogonality between allocating and collecting
Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (207657 => 207658)
--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -132,7 +132,7 @@
#endif
}
-#if !PLATFORM(EFL)
+#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
GLContext* PlatformDisplay::sharingGLContext()
{
if (!m_sharingGLContext)
Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.h (207657 => 207658)
--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -58,7 +58,7 @@
virtual Type type() const = 0;
-#if !PLATFORM(EFL)
+#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
// FIXME: This should not have any platform ifdef, but EFL has its own EGLContext class
// instead of using the GLContext common API.
GLContext* sharingGLContext();
@@ -80,7 +80,9 @@
EGLDisplay m_eglDisplay;
#endif
+#if USE(EGL) || USE(GLX)
std::unique_ptr<GLContext> m_sharingGLContext;
+#endif
private:
static std::unique_ptr<PlatformDisplay> createPlatformDisplay();
Modified: trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp (207657 => 207658)
--- trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -66,6 +66,7 @@
wl_registry_add_listener(m_registry.get(), &s_registryListener, this);
wl_display_roundtrip(m_display);
+#if USE(EGL)
#if defined(EGL_KHR_platform_wayland)
const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
@@ -79,6 +80,7 @@
m_eglDisplay = eglGetDisplay(m_display);
PlatformDisplay::initializeEGLDisplay();
+#endif
}
void PlatformDisplayWayland::registryGlobal(const char* interface, uint32_t name)
Modified: trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (207657 => 207658)
--- trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -56,8 +56,10 @@
PlatformDisplayX11::~PlatformDisplayX11()
{
+#if USE(EGL) || USE(GLX)
// Clear the sharing context before releasing the display.
m_sharingGLContext = nullptr;
+#endif
if (m_ownedDisplay)
XCloseDisplay(m_display);
}
Modified: trunk/Source/WebKit2/ChangeLog (207657 => 207658)
--- trunk/Source/WebKit2/ChangeLog 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-21 05:30:53 UTC (rev 207658)
@@ -1,3 +1,35 @@
+2016-10-20 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Configures but fails to link with ENABLE_OPENGL=OFF
+ https://bugs.webkit.org/show_bug.cgi?id=163449
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER and also ensure the current
+ display is X11.
+ (webkitWebViewBaseUnrealize): Ditto.
+ (webkitWebViewBaseDidRelaunchWebProcess): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
+ (webkitWebViewBasePageClosed): Ditto.
+ * UIProcess/AcceleratedDrawingAreaProxy.cpp:
+ (WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState): Ditto.
+ (WebKit::AcceleratedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState): Check EGL is enabled before
+ trying to use the WaylandCompositor.
+ * UIProcess/AcceleratedDrawingAreaProxy.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess): Ditto.
+ * UIProcess/gtk/AcceleratedBackingStore.cpp:
+ (WebKit::AcceleratedBackingStore::create): Ditto.
+ * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+ * UIProcess/gtk/WaylandCompositor.cpp:
+ * UIProcess/gtk/WaylandCompositor.h:
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode): Check TEXTURE_MAPPER_GL instead of TEXTURE_MAPPER.
+ * WebProcess/WebPage/AcceleratedDrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/LayerTreeHost.h:
+
2016-10-20 Chris Dumez <cdu...@apple.com>
"Download Linked File" context menu action should use 'download' attribute as suggested filename
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -377,9 +377,11 @@
gtk_widget_set_window(widget, window);
gdk_window_set_user_data(window, widget);
-#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
- if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()))
- drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
+ if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea()))
+ drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
+ }
#endif
gtk_style_context_set_background(gtk_widget_get_style_context(widget), window);
@@ -390,9 +392,11 @@
static void webkitWebViewBaseUnrealize(GtkWidget* widget)
{
WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(widget);
-#if USE(TEXTURE_MAPPER) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
- if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webView->priv->pageProxy->drawingArea()))
- drawingArea->destroyNativeSurfaceHandleForCompositing();
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11) {
+ if (DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(webView->priv->pageProxy->drawingArea()))
+ drawingArea->destroyNativeSurfaceHandleForCompositing();
+ }
#endif
gtk_im_context_set_client_window(webView->priv->inputMethodFilter.context(), nullptr);
@@ -1476,7 +1480,7 @@
// Queue a resize to ensure the new DrawingAreaProxy is resized.
gtk_widget_queue_resize_no_redraw(GTK_WIDGET(webkitWebViewBase));
-#if PLATFORM(X11) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
return;
@@ -1498,7 +1502,7 @@
{
if (webkitWebViewBase->priv->acceleratedBackingStore)
webkitWebViewBase->priv->acceleratedBackingStore->update(LayerTreeContext());
-#if PLATFORM(X11) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
return;
Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -139,7 +139,7 @@
else {
m_hasReceivedFirstUpdate = true;
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (m_pendingNativeSurfaceHandleForCompositing) {
setNativeSurfaceHandleForCompositing(m_pendingNativeSurfaceHandleForCompositing);
m_pendingNativeSurfaceHandleForCompositing = 0;
@@ -223,7 +223,7 @@
if (!m_webPageProxy.isViewVisible())
return;
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
// Never block the UI process in Wayland when waiting for DidUpdateBackingStoreState after a resize,
// because the nested compositor needs to handle the web process requests that happens while resizing.
if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland && WaylandCompositor::singleton().isRunning())
@@ -263,7 +263,7 @@
m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
}
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void AcceleratedDrawingAreaProxy::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
if (!m_hasReceivedFirstUpdate) {
Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -46,7 +46,7 @@
CoordinatedLayerTreeHostProxy& coordinatedLayerTreeHostProxy() const { return *m_coordinatedLayerTreeHostProxy.get(); }
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void setNativeSurfaceHandleForCompositing(uint64_t);
void destroyNativeSurfaceHandleForCompositing();
#endif
@@ -99,7 +99,7 @@
// For a new Drawing Area don't draw anything until the WebProcess has sent over the first content.
bool m_hasReceivedFirstUpdate { false };
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
uint64_t m_pendingNativeSurfaceHandleForCompositing { 0 };
#endif
};
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -647,7 +647,7 @@
parameters.memoryPressureMonitorHandle = MemoryPressureMonitor::singleton().createHandle();
#endif
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
#endif
Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStore.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -44,7 +44,7 @@
std::unique_ptr<AcceleratedBackingStore> AcceleratedBackingStore::create(WebPageProxy& webPage)
{
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
return AcceleratedBackingStoreWayland::create(webPage);
#endif
Modified: trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -26,7 +26,7 @@
#include "config.h"
#include "AcceleratedBackingStoreWayland.h"
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
#include "WaylandCompositor.h"
#include "WebPageProxy.h"
@@ -162,4 +162,4 @@
} // namespace WebKit
-#endif // PLATFORM(WAYLAND)
+#endif // PLATFORM(WAYLAND) && USE(EGL)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -26,7 +26,7 @@
#include "config.h"
#include "WaylandCompositor.h"
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
#include "WebKit2WaylandServerProtocol.h"
#include <EGL/egl.h>
@@ -516,4 +516,4 @@
} // namespace WebKit
-#endif // PLATFORM(WAYLAND)
+#endif // PLATFORM(WAYLAND) && USE(EGL)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h (207657 => 207658)
--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -25,7 +25,7 @@
#pragma once
-#if PLATFORM(WAYLAND)
+#if PLATFORM(WAYLAND) && USE(EGL)
#include "WebPageProxy.h"
#include <WebCore/RefPtrCairo.h>
@@ -126,4 +126,4 @@
} // namespace WebKit
-#endif // PLATFORM(WAYLAND)
+#endif // PLATFORM(WAYLAND) && USE(EGL)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (207657 => 207658)
--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-10-21 05:30:53 UTC (rev 207658)
@@ -320,7 +320,7 @@
ASSERT(!m_layerTreeHost);
m_layerTreeHost = LayerTreeHost::create(m_webPage);
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (m_nativeSurfaceHandleForCompositing)
m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
#endif
@@ -352,7 +352,7 @@
}
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void AcceleratedDrawingArea::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
m_nativeSurfaceHandleForCompositing = handle;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h (207657 => 207658)
--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -63,7 +63,7 @@
void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) override;
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void setNativeSurfaceHandleForCompositing(uint64_t) override;
void destroyNativeSurfaceHandleForCompositing(bool&) override;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (207657 => 207658)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -146,7 +146,7 @@
DrawingAreaType m_type;
WebPage& m_webPage;
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
uint64_t m_nativeSurfaceHandleForCompositing { 0 };
#endif
@@ -172,7 +172,7 @@
virtual void addTransactionCallbackID(uint64_t callbackID) { ASSERT_NOT_REACHED(); }
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
virtual void destroyNativeSurfaceHandleForCompositing(bool&) = 0;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (207657 => 207658)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-10-21 05:30:53 UTC (rev 207658)
@@ -40,7 +40,7 @@
AddTransactionCallbackID(uint64_t callbackID)
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
SetNativeSurfaceHandleForCompositing(uint64_t handle)
DestroyNativeSurfaceHandleForCompositing() -> (bool handled)
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (207657 => 207658)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2016-10-21 05:30:53 UTC (rev 207658)
@@ -92,7 +92,7 @@
virtual void scheduleAnimation() = 0;
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(GTK)
virtual void setNativeSurfaceHandleForCompositing(uint64_t) { };
#endif
Modified: trunk/Source/cmake/OptionsGTK.cmake (207657 => 207658)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-10-21 05:07:43 UTC (rev 207657)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-10-21 05:30:53 UTC (rev 207658)
@@ -110,7 +110,6 @@
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)
