<!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>[213070] releases/WebKitGTK/webkit-2.16/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/213070">213070</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 09:03:22 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213061">r213061</a> - [GTK] Rendering artifacts when resizing the window in X11 with AC mode enabled
https://bugs.webkit.org/show_bug.cgi?id=168728
Reviewed by Žan Doberšek.
This happens because the pixmap we create from the redirected window is uninitialized until the threaded
compositor renders into it. We should always initialize the pixmap right after it's created.
* WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp:
(WebKit::defaultVisual): Helper static method to get the default GdkVisual.
(WebKit::AcceleratedSurfaceX11::AcceleratedSurfaceX11): Use createPixmap().
(WebKit::AcceleratedSurfaceX11::createPixmap): Create and initialize the pixmap.
(WebKit::AcceleratedSurfaceX11::resize): Use createPixmap().
* WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2WebProcessWebPagegtkAcceleratedSurfaceX11cpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2WebProcessWebPagegtkAcceleratedSurfaceX11h">releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (213069 => 213070)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-27 16:59:53 UTC (rev 213069)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-27 17:03:22 UTC (rev 213070)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Rendering artifacts when resizing the window in X11 with AC mode enabled
+ https://bugs.webkit.org/show_bug.cgi?id=168728
+
+ Reviewed by Žan Doberšek.
+
+ This happens because the pixmap we create from the redirected window is uninitialized until the threaded
+ compositor renders into it. We should always initialize the pixmap right after it's created.
+
+ * WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp:
+ (WebKit::defaultVisual): Helper static method to get the default GdkVisual.
+ (WebKit::AcceleratedSurfaceX11::AcceleratedSurfaceX11): Use createPixmap().
+ (WebKit::AcceleratedSurfaceX11::createPixmap): Create and initialize the pixmap.
+ (WebKit::AcceleratedSurfaceX11::resize): Use createPixmap().
+ * WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h:
+
</ins><span class="cx"> 2017-02-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkProcess: Stop disabling buffering when NETWORK_CACHE is disabled in build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2WebProcessWebPagegtkAcceleratedSurfaceX11cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp (213069 => 213070)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp 2017-02-27 16:59:53 UTC (rev 213069)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp 2017-02-27 17:03:22 UTC (rev 213070)
</span><span class="lines">@@ -30,8 +30,10 @@
</span><span class="cx">
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include <WebCore/PlatformDisplayX11.h>
</span><ins>+#include <WebCore/RefPtrCairo.h>
</ins><span class="cx"> #include <X11/Xlib.h>
</span><span class="cx"> #include <X11/extensions/Xcomposite.h>
</span><ins>+#include <cairo-xlib.h>
</ins><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="lines">@@ -46,6 +48,13 @@
</span><span class="cx"> return std::unique_ptr<AcceleratedSurfaceX11>(new AcceleratedSurfaceX11(webPage));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static GdkVisual* defaultVisual()
+{
+ if (GdkVisual* visual = gdk_screen_get_rgba_visual(gdk_screen_get_default()))
+ return visual;
+ return gdk_screen_get_system_visual(gdk_screen_get_default());
+}
+
</ins><span class="cx"> AcceleratedSurfaceX11::AcceleratedSurfaceX11(WebPage& webPage)
</span><span class="cx"> : AcceleratedSurface(webPage)
</span><span class="cx"> , m_display(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native())
</span><span class="lines">@@ -53,10 +62,8 @@
</span><span class="cx"> Screen* screen = DefaultScreenOfDisplay(m_display);
</span><span class="cx">
</span><span class="cx"> ASSERT(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay()).native() == m_display);
</span><del>- GdkVisual* visual = gdk_screen_get_rgba_visual(gdk_screen_get_default());
- if (!visual)
- visual = gdk_screen_get_system_visual(gdk_screen_get_default());
</del><span class="cx">
</span><ins>+ GdkVisual* visual = defaultVisual();
</ins><span class="cx"> XUniqueColormap colormap(XCreateColormap(m_display, RootWindowOfScreen(screen), GDK_VISUAL_XVISUAL(visual), AllocNone));
</span><span class="cx">
</span><span class="cx"> XSetWindowAttributes windowAttributes;
</span><span class="lines">@@ -103,8 +110,7 @@
</span><span class="cx"> }
</span><span class="cx"> XSelectInput(m_display, m_window.get(), NoEventMask);
</span><span class="cx"> XCompositeRedirectWindow(m_display, m_window.get(), CompositeRedirectManual);
</span><del>- m_pixmap = XCompositeNameWindowPixmap(m_display, m_window.get());
- XSync(m_display, False);
</del><ins>+ createPixmap();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AcceleratedSurfaceX11::~AcceleratedSurfaceX11()
</span><span class="lines">@@ -118,6 +124,16 @@
</span><span class="cx"> m_parentWindow.reset();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AcceleratedSurfaceX11::createPixmap()
+{
+ m_pixmap = XCompositeNameWindowPixmap(m_display, m_window.get());
+ RefPtr<cairo_surface_t> surface = adoptRef(cairo_xlib_surface_create(m_display, m_pixmap.get(), GDK_VISUAL_XVISUAL(defaultVisual()), m_size.width(), m_size.height()));
+ RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get()));
+ cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
+ cairo_paint(cr.get());
+ XSync(m_display, False);
+}
+
</ins><span class="cx"> bool AcceleratedSurfaceX11::resize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> if (!AcceleratedSurface::resize(size))
</span><span class="lines">@@ -129,8 +145,7 @@
</span><span class="cx">
</span><span class="cx"> // Release the previous pixmap later to give some time to the UI process to update.
</span><span class="cx"> RunLoop::main().dispatchAfter(std::chrono::seconds(5), [pixmap = WTFMove(m_pixmap)] { });
</span><del>- m_pixmap = XCompositeNameWindowPixmap(m_display, m_window.get());
- XSync(m_display, False);
</del><ins>+ createPixmap();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2WebProcessWebPagegtkAcceleratedSurfaceX11h"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h (213069 => 213070)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h 2017-02-27 16:59:53 UTC (rev 213069)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/WebPage/gtk/AcceleratedSurfaceX11.h 2017-02-27 17:03:22 UTC (rev 213070)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> private:
</span><span class="cx"> AcceleratedSurfaceX11(WebPage&);
</span><span class="cx">
</span><ins>+ void createPixmap();
+
</ins><span class="cx"> Display* m_display { nullptr };
</span><span class="cx"> WebCore::XUniqueWindow m_window;
</span><span class="cx"> WebCore::XUniqueWindow m_parentWindow;
</span></span></pre>
</div>
</div>
</body>
</html>