<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181848] releases/WebKitGTK/webkit-2.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181848">181848</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-23 02:12:56 -0700 (Mon, 23 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181847">r181847</a> - [GTK] Add a configure option to build without Redirected XComposite Window
https://bugs.webkit.org/show_bug.cgi?id=142865
Reviewed by Žan Doberšek.
.:
The Redirected XComposite Window was added to support some
features like GtkOverlay, but in cases where we don't need such
features, it's more efficient to use the XID of the WebKitWebView
window as the native surface handle for the accelerated
compositing. This patch adds USE_REDIRECTED_XCOMPOSITE_WINDOW,
that is enabled by default for X11 target when OpenGL is enabled.
* Source/cmake/OptionsGTK.cmake:
Source/WebKit2:
Use USE(REDIRECTED_XCOMPOSITE_WINDOW) instead of
USE(TEXTURE_MAPPER_GL) && PLATFORM(X11).
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseRealize): Use the XID of the WebKitWebView
window as native surface handle when REDIRECTED_XCOMPOSITE_WINDOW
is disabled.
(webkitWebViewRenderAcceleratedCompositingResults):
(resizeWebKitWebViewBaseFromAllocation):
(webkitWebViewBaseEnterAcceleratedCompositingMode):
(webkitWebViewBaseExitAcceleratedCompositingMode):
* UIProcess/gtk/RedirectedXCompositeWindow.cpp:
* UIProcess/gtk/RedirectedXCompositeWindow.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28ChangeLog">releases/WebKitGTK/webkit-2.8/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessgtkRedirectedXCompositeWindowcpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessgtkRedirectedXCompositeWindowh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add a configure option to build without Redirected XComposite Window
+ https://bugs.webkit.org/show_bug.cgi?id=142865
+
+ Reviewed by Žan Doberšek.
+
+ The Redirected XComposite Window was added to support some
+ features like GtkOverlay, but in cases where we don't need such
+ features, it's more efficient to use the XID of the WebKitWebView
+ window as the native surface handle for the accelerated
+ compositing. This patch adds USE_REDIRECTED_XCOMPOSITE_WINDOW,
+ that is enabled by default for X11 target when OpenGL is enabled.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2015-03-20 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Search for the Wayland dependency when enabling Wayland target
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-03-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add a configure option to build without Redirected XComposite Window
+ https://bugs.webkit.org/show_bug.cgi?id=142865
+
+ Reviewed by Žan Doberšek.
+
+ Use USE(REDIRECTED_XCOMPOSITE_WINDOW) instead of
+ USE(TEXTURE_MAPPER_GL) && PLATFORM(X11).
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseRealize): Use the XID of the WebKitWebView
+ window as native surface handle when REDIRECTED_XCOMPOSITE_WINDOW
+ is disabled.
+ (webkitWebViewRenderAcceleratedCompositingResults):
+ (resizeWebKitWebViewBaseFromAllocation):
+ (webkitWebViewBaseEnterAcceleratedCompositingMode):
+ (webkitWebViewBaseExitAcceleratedCompositingMode):
+ * UIProcess/gtk/RedirectedXCompositeWindow.cpp:
+ * UIProcess/gtk/RedirectedXCompositeWindow.h:
+
</ins><span class="cx"> 2015-03-20 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Disable accelerated compositing on Wayland
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -67,9 +67,10 @@
</span><span class="cx"> #include "WebFullScreenManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if PLATFORM(WAYLAND)
</span><span class="cx"> #include <gdk/gdkwayland.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -184,7 +185,7 @@
</span><span class="cx"> WebFullScreenClientGtk fullScreenClient;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> std::unique_ptr<RedirectedXCompositeWindow> redirectedWindow;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -318,7 +319,7 @@
</span><span class="cx"> WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(widget);
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webView->priv;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
</span><span class="cx"> if (GDK_IS_X11_DISPLAY(display)) {
</span><span class="cx"> priv->redirectedWindow = RedirectedXCompositeWindow::create(
</span><span class="lines">@@ -369,6 +370,11 @@
</span><span class="cx"> gtk_widget_set_window(widget, window);
</span><span class="cx"> gdk_window_set_user_data(window, widget);
</span><span class="cx">
</span><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
+ DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
+ drawingArea->setNativeSurfaceHandleForCompositing(GDK_WINDOW_XID(window));
+#endif
+
</ins><span class="cx"> gtk_style_context_set_background(gtk_widget_get_style_context(widget), window);
</span><span class="cx">
</span><span class="cx"> gtk_im_context_set_client_window(priv->inputMethodFilter.context(), window);
</span><span class="lines">@@ -517,7 +523,7 @@
</span><span class="cx"> if (!drawingArea->isInAcceleratedCompositingMode())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> // To avoid flashes when initializing accelerated compositing for the first
</span><span class="cx"> // time, we wait until we know there's a frame ready before rendering.
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><span class="lines">@@ -630,7 +636,7 @@
</span><span class="cx">
</span><span class="cx"> DrawingAreaProxyImpl* drawingArea = static_cast<DrawingAreaProxyImpl*>(priv->pageProxy->drawingArea());
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> if (sizeChanged && priv->redirectedWindow && drawingArea && drawingArea->isInAcceleratedCompositingMode())
</span><span class="cx"> priv->redirectedWindow->resize(viewRect.size());
</span><span class="cx"> #endif
</span><span class="lines">@@ -1323,7 +1329,7 @@
</span><span class="cx">
</span><span class="cx"> void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase)
</span><span class="cx"> {
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="cx"> if (!priv->redirectedWindow)
</span><span class="cx"> return;
</span><span class="lines">@@ -1341,7 +1347,7 @@
</span><span class="cx">
</span><span class="cx"> void webkitWebViewBaseExitAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase)
</span><span class="cx"> {
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="cx"> if (priv->redirectedWindow)
</span><span class="cx"> priv->redirectedWindow->resize(IntSize());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessgtkRedirectedXCompositeWindowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RedirectedXCompositeWindow.h"
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx">
</span><span class="cx"> #include <X11/extensions/Xcomposite.h>
</span><span class="cx"> #include <X11/extensions/Xdamage.h>
</span><span class="lines">@@ -282,4 +282,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#endif // USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessgtkRedirectedXCompositeWindowh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.h 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef RedirectedXCompositeWindow_h
</span><span class="cx"> #define RedirectedXCompositeWindow_h
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/IntSize.h>
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="lines">@@ -64,6 +64,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</del><ins>+#endif // USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx">
</span><span class="cx"> #endif // RedirectedXCompositeWindow_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181847 => 181848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-23 08:06:02 UTC (rev 181847)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-23 09:12:56 UTC (rev 181848)
</span><span class="lines">@@ -83,10 +83,17 @@
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Whether to enable MiniBrowser compilation." OFF)
</span><ins>+WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." ON)
</ins><span class="cx">
</span><span class="cx"> if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
</span><span class="cx">
</span><ins>+ if (ENABLE_X11_TARGET)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW ON)
+ else ()
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW OFF)
+ endif ()
+
</ins><span class="cx"> if (OPENGL_FOUND)
</span><span class="cx"> if (GLX_FOUND)
</span><span class="cx"> list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
</span><span class="lines">@@ -107,6 +114,7 @@
</span><span class="cx"> else ()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
</span><ins>+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW OFF)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_ACCELERATED_2D_CANVAS AND NOT(CAIRO_GL_FOUND))
</span><span class="lines">@@ -349,6 +357,10 @@
</span><span class="cx"> add_definitions(-DWTF_USE_TEXTURE_MAPPER_GL=1)
</span><span class="cx"> add_definitions(-DENABLE_3D_RENDERING=1)
</span><span class="cx">
</span><ins>+ if (ENABLE_X11_TARGET AND USE_REDIRECTED_XCOMPOSITE_WINDOW)
+ add_definitions(-DWTF_USE_REDIRECTED_XCOMPOSITE_WINDOW=1)
+ endif ()
+
</ins><span class="cx"> if (OPENGLES2_FOUND)
</span><span class="cx"> set(WTF_USE_OPENGL_ES_2 1)
</span><span class="cx"> add_definitions(-DWTF_USE_OPENGL_ES_2=1)
</span></span></pre>
</div>
</div>
</body>
</html>