<!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>[206425] releases/WebKitGTK/webkit-2.14/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/206425">206425</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2016-09-27 02:10:30 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 206424 - [GTK] Should check whether GDK can use GL before asking it to
https://bugs.webkit.org/show_bug.cgi?id=162598
Reviewed by Michael Catanzaro.
gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
Unfortunately it does not have any error reporting other than a warning printed to
stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
by trying to create a context.
See https://bugzilla.redhat.com/show_bug.cgi?id=1378987
* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
(WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
trying to create a context for a GdkWindow.
(WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
use GL.
* UIProcess/gtk/AcceleratedBackingStoreWayland.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (206424 => 206425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-27 09:06:41 UTC (rev 206424)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-09-27 09:10:30 UTC (rev 206425)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-09-27 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
+
+ [GTK] Should check whether GDK can use GL before asking it to
+ https://bugs.webkit.org/show_bug.cgi?id=162598
+
+ Reviewed by Michael Catanzaro.
+
+ gdk_cairo_draw_from_gl can fail even when WebKit itself has been able to use GL (its
+ context creation code might be buggy, GL may have been disabled using GDK_GL=disable, …).
+ Unfortunately it does not have any error reporting other than a warning printed to
+ stderr, so we cannot fallback from it. We have to first check if GL can be used by GDK
+ by trying to create a context.
+
+ See https://bugzilla.redhat.com/show_bug.cgi?id=1378987
+
+ * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+ (WebKit::AcceleratedBackingStoreWayland::canGdkUseGL): decide whether GDK can use GL by
+ trying to create a context for a GdkWindow.
+ (WebKit::AcceleratedBackingStoreWayland::paint): fallback to glReadPixels if GDK cannot
+ use GL.
+ * UIProcess/gtk/AcceleratedBackingStoreWayland.h:
+
</ins><span class="cx"> 2016-09-21 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
</span><span class="cx">
</span><span class="cx"> Unreviewed, build fix.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (206424 => 206425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-09-27 09:06:41 UTC (rev 206424)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp 2016-09-27 09:10:30 UTC (rev 206425)
</span><span class="lines">@@ -61,6 +61,31 @@
</span><span class="cx"> WaylandCompositor::singleton().unregisterWebPage(m_webPage);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
+bool AcceleratedBackingStoreWayland::canGdkUseGL() const
+{
+ static bool initialized = false;
+ static bool canCreateGLContext = false;
+
+ if (initialized)
+ return canCreateGLContext;
+
+ initialized = true;
+
+ GUniqueOutPtr<GError> error;
+ GdkWindow* gdkWindow = gtk_widget_get_window(m_webPage.viewWidget());
+ GRefPtr<GdkGLContext> gdkContext(gdk_window_create_gl_context(gdkWindow, &error.outPtr()));
+ if (!gdkContext) {
+ g_warning("GDK is not able to create a GL context, falling back to glReadPixels (slow!): %s", error->message);
+ return false;
+ }
+
+ canCreateGLContext = true;
+
+ return true;
+}
+#endif
+
</ins><span class="cx"> bool AcceleratedBackingStoreWayland::paint(cairo_t* cr, const IntRect& clipRect)
</span><span class="cx"> {
</span><span class="cx"> GLuint texture;
</span><span class="lines">@@ -72,8 +97,13 @@
</span><span class="cx"> AcceleratedBackingStore::paint(cr, clipRect);
</span><span class="cx">
</span><span class="cx"> #if GTK_CHECK_VERSION(3, 16, 0)
</span><del>- gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
-#else
</del><ins>+ if (canGdkUseGL()) {
+ gdk_cairo_draw_from_gl(cr, gtk_widget_get_window(m_webPage.viewWidget()), texture, GL_TEXTURE, m_webPage.deviceScaleFactor(), 0, 0, textureSize.width(), textureSize.height());
+ cairo_restore(cr);
+ return true;
+ }
+#endif
+
</ins><span class="cx"> if (!m_surface || cairo_image_surface_get_width(m_surface.get()) != textureSize.width() || cairo_image_surface_get_height(m_surface.get()) != textureSize.height())
</span><span class="cx"> m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), textureSize.height()));
</span><span class="cx">
</span><span class="lines">@@ -124,7 +154,6 @@
</span><span class="cx"> cairo_set_source_surface(cr, m_surface.get(), 0, 0);
</span><span class="cx"> cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
</span><span class="cx"> cairo_fill(cr);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2UIProcessgtkAcceleratedBackingStoreWaylandh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h (206424 => 206425)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h 2016-09-27 09:06:41 UTC (rev 206424)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/UIProcess/gtk/AcceleratedBackingStoreWayland.h 2016-09-27 09:10:30 UTC (rev 206425)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if PLATFORM(WAYLAND)
</span><span class="cx">
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><ins>+#include <gtk/gtk.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -41,6 +42,10 @@
</span><span class="cx"> static std::unique_ptr<AcceleratedBackingStoreWayland> create(WebPageProxy&);
</span><span class="cx"> ~AcceleratedBackingStoreWayland();
</span><span class="cx">
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
+ bool canGdkUseGL() const;
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> AcceleratedBackingStoreWayland(WebPageProxy&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>