<!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>[170887] trunk/Source/WebKit2</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/170887">170887</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-07-08 09:34:38 -0700 (Tue, 08 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Guard uses of RedirectedXCompositeWindow in WebKitWebViewBase with PLATFORM(X11)
https://bugs.webkit.org/show_bug.cgi?id=133871
Reviewed by Martin Robinson.
Guard uses of the RedirectedXCompositeWindow object in WebKitWebViewBase with the
PLATFORM(X11) build guard. This is required to properly support building the GTK
port only for the Wayland target.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseConstructed):
(webkitWebViewRenderAcceleratedCompositingResults):
(resizeWebKitWebViewBaseFromAllocation):
(webkitWebViewBaseUpdatePreferences):
(webkitWebViewBaseCreateWebPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170886 => 170887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-08 15:26:48 UTC (rev 170886)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-08 16:34:38 UTC (rev 170887)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-08 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Guard uses of RedirectedXCompositeWindow in WebKitWebViewBase with PLATFORM(X11)
+ https://bugs.webkit.org/show_bug.cgi?id=133871
+
+ Reviewed by Martin Robinson.
+
+ Guard uses of the RedirectedXCompositeWindow object in WebKitWebViewBase with the
+ PLATFORM(X11) build guard. This is required to properly support building the GTK
+ port only for the Wayland target.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseConstructed):
+ (webkitWebViewRenderAcceleratedCompositingResults):
+ (resizeWebKitWebViewBaseFromAllocation):
+ (webkitWebViewBaseUpdatePreferences):
+ (webkitWebViewBaseCreateWebPage):
+
</ins><span class="cx"> 2014-07-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn on accelerated drawing for WebKit2 by default
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (170886 => 170887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-07-08 15:26:48 UTC (rev 170886)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-07-08 16:34:38 UTC (rev 170887)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #include <WebCore/Region.h>
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><del>-#ifdef GDK_WINDOWING_X11
</del><ins>+#if defined(GDK_WINDOWING_X11)
</ins><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><span class="cx"> #include <memory>
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #include "WebFullScreenManagerProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && defined(GDK_WINDOWING_X11)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> #include <WebCore/RedirectedXCompositeWindow.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<GtkWidget*, IntRect> WebKitWebViewChildrenMap;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> void redirectedWindowDamagedCallback(void* data);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> WebFullScreenClientGtk fullScreenClient;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> OwnPtr<RedirectedXCompositeWindow> redirectedWindow;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> priv->pageClient = PageClientImpl::create(viewWidget);
</span><span class="cx"> priv->dragAndDropHelper.setWidget(viewWidget);
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL) && defined(GDK_WINDOWING_X11)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</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(IntSize(1, 1), RedirectedXCompositeWindow::DoNotCreateGLContext);
</span><span class="lines">@@ -432,6 +432,7 @@
</span><span class="cx"> if (!drawingArea->isInAcceleratedCompositingMode())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+#if PLATFORM(X11)
</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">@@ -443,6 +444,9 @@
</span><span class="cx"> cairo_set_source_surface(cr, surface, 0, 0);
</span><span class="cx"> cairo_fill(cr);
</span><span class="cx"> return true;
</span><ins>+#else
+ return false;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -534,7 +538,7 @@
</span><span class="cx"> gtk_widget_size_allocate(priv->authenticationDialog, &childAllocation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> if (sizeChanged && webViewBase->priv->redirectedWindow)
</span><span class="cx"> webViewBase->priv->redirectedWindow->resize(viewRect.size());
</span><span class="cx"> #endif
</span><span class="lines">@@ -962,7 +966,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> if (priv->redirectedWindow)
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="lines">@@ -987,7 +991,7 @@
</span><span class="cx"> priv->pageProxy = context->createWebPage(*priv->pageClient, WTF::move(webPageConfiguration));
</span><span class="cx"> priv->pageProxy->initializeWebPage();
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> if (priv->redirectedWindow)
</span><span class="cx"> priv->pageProxy->setAcceleratedCompositingWindowId(priv->redirectedWindow->windowId());
</span><span class="cx"> #endif
</span><span class="lines">@@ -1129,7 +1133,7 @@
</span><span class="cx"> return webkitWebViewBase->priv->contextMenuEvent.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER_GL)
</del><ins>+#if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</ins><span class="cx"> void redirectedWindowDamagedCallback(void* data)
</span><span class="cx"> {
</span><span class="cx"> gtk_widget_queue_draw(GTK_WIDGET(data));
</span></span></pre>
</div>
</div>
</body>
</html>