Diff
Modified: trunk/Source/WebKit2/ChangeLog (205430 => 205431)
--- trunk/Source/WebKit2/ChangeLog 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-05 07:57:57 UTC (rev 205431)
@@ -1,3 +1,28 @@
+2016-09-05 Carlos Garcia Campos <[email protected]>
+
+ [GTK] SetNativeSurfaceHandleForCompositing should not be compiled in for wayland build
+ https://bugs.webkit.org/show_bug.cgi?id=161483
+
+ Reviewed by Žan Doberšek.
+
+ SetNativeSurfaceHandleForCompositing and DestroyNativeSurfaceHandleForCompositing messages should only be used
+ for GTK+ port when compiled with OpenGL and X11 enabled and redirected XComposite window disabled. So, we should
+ use USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW) consistently.
+ This fixes the build when building the GTK+ port with Wayland enabled and X11 disabled.
+
+ * UIProcess/AcceleratedDrawingAreaProxy.cpp:
+ (WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState):
+ * UIProcess/AcceleratedDrawingAreaProxy.h:
+ * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+ (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):
+ * WebProcess/WebPage/AcceleratedDrawingArea.h:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+ * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+
2016-09-05 Zan Dobersek <[email protected]>
[GObject bindings] override handleEvent() method in GObjectEventListener
Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp (205430 => 205431)
--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp 2016-09-05 07:57:57 UTC (rev 205431)
@@ -139,7 +139,7 @@
else {
m_hasReceivedFirstUpdate = true;
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (m_pendingNativeSurfaceHandleForCompositing) {
setNativeSurfaceHandleForCompositing(m_pendingNativeSurfaceHandleForCompositing);
m_pendingNativeSurfaceHandleForCompositing = 0;
@@ -261,7 +261,7 @@
m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
}
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void AcceleratedDrawingAreaProxy::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
if (!m_hasReceivedFirstUpdate) {
Modified: trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h (205430 => 205431)
--- trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h 2016-09-05 07:57:57 UTC (rev 205431)
@@ -46,7 +46,7 @@
CoordinatedLayerTreeHostProxy& coordinatedLayerTreeHostProxy() const { return *m_coordinatedLayerTreeHostProxy.get(); }
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && 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) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
uint64_t m_pendingNativeSurfaceHandleForCompositing { 0 };
#endif
};
Modified: trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp 2016-09-05 07:57:57 UTC (rev 205431)
@@ -320,7 +320,7 @@
ASSERT(!m_layerTreeHost);
m_layerTreeHost = LayerTreeHost::create(m_webPage);
-#if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
if (m_nativeSurfaceHandleForCompositing)
m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
#endif
@@ -352,7 +352,7 @@
}
#endif
-#if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && 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 (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h 2016-09-05 07:57:57 UTC (rev 205431)
@@ -63,7 +63,7 @@
void didReceiveCoordinatedLayerTreeHostMessage(IPC::Connection&, IPC::Decoder&) override;
#endif
-#if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void setNativeSurfaceHandleForCompositing(uint64_t) override;
void destroyNativeSurfaceHandleForCompositing(bool&) override;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp 2016-09-05 07:57:57 UTC (rev 205431)
@@ -123,7 +123,7 @@
didChangeViewport();
}
-#if PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void ThreadedCoordinatedLayerTreeHost::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
m_layerTreeContext.contextID = handle;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h 2016-09-05 07:57:57 UTC (rev 205431)
@@ -66,7 +66,7 @@
void forceRepaint() override;
bool forceRepaintAsync(uint64_t callbackID) override { return false; }
-#if PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void setNativeSurfaceHandleForCompositing(uint64_t) override;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-09-05 07:57:57 UTC (rev 205431)
@@ -146,7 +146,7 @@
DrawingAreaType m_type;
WebPage& m_webPage;
-#if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && 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) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && 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 (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2016-09-05 07:57:57 UTC (rev 205431)
@@ -40,7 +40,7 @@
AddTransactionCallbackID(uint64_t callbackID)
#endif
-#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
SetNativeSurfaceHandleForCompositing(uint64_t handle)
DestroyNativeSurfaceHandleForCompositing() -> (bool handled)
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2016-09-05 07:57:57 UTC (rev 205431)
@@ -408,7 +408,7 @@
downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
}
-#if !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void LayerTreeHostGtk::setNativeSurfaceHandleForCompositing(uint64_t handle)
{
cancelPendingLayerFlush();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (205430 => 205431)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-09-05 07:15:50 UTC (rev 205430)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2016-09-05 07:57:57 UTC (rev 205431)
@@ -67,7 +67,7 @@
void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) override;
void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
-#if !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+#if PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
void setNativeSurfaceHandleForCompositing(uint64_t) override;
#endif
