<!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>[206961] 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/206961">206961</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-08 16:12:17 -0700 (Sat, 08 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Drop redundant wl_display_flush_clients() call
https://bugs.webkit.org/show_bug.cgi?id=161904
Patch by Emanuele Aina <emanuele.aina@collabora.com> on 2016-10-08
Reviewed by Michael Catanzaro.
The Wayland GSource::prepare() function already calls
wl_display_flush_clients() at every mainloop iteration, so there's no
need to further call it on Surface::commit().
* UIProcess/gtk/WaylandCompositor.cpp:
(WebKit::WaylandCompositor::Surface::commit):
* UIProcess/gtk/WaylandCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWaylandCompositorcpp">trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWaylandCompositorh">trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206960 => 206961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-08 23:12:17 UTC (rev 206961)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-08 Emanuele Aina <emanuele.aina@collabora.com>
+
+ [GTK] Drop redundant wl_display_flush_clients() call
+ https://bugs.webkit.org/show_bug.cgi?id=161904
+
+ Reviewed by Michael Catanzaro.
+
+ The Wayland GSource::prepare() function already calls
+ wl_display_flush_clients() at every mainloop iteration, so there's no
+ need to further call it on Surface::commit().
+
+ * UIProcess/gtk/WaylandCompositor.cpp:
+ (WebKit::WaylandCompositor::Surface::commit):
+ * UIProcess/gtk/WaylandCompositor.h:
+
</ins><span class="cx"> 2016-10-06 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Next step on moving to modern way to return DOM exceptions
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWaylandCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (206960 => 206961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-10-08 23:12:17 UTC (rev 206961)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WaylandCompositor::Surface::commit()
</del><ins>+void WaylandCompositor::Surface::commit()
</ins><span class="cx"> {
</span><span class="cx"> EGLDisplay eglDisplay = PlatformDisplay::sharedDisplay().eglDisplay();
</span><span class="cx"> if (m_image != EGL_NO_IMAGE_KHR)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> eglDestroyImage(eglDisplay, m_image);
</span><span class="cx"> m_image = m_pendingBuffer->createImage();
</span><span class="cx"> if (m_image == EGL_NO_IMAGE_KHR)
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> makePendingBufferCurrent();
</span><span class="cx"> if (m_webPage)
</span><span class="lines">@@ -240,8 +240,6 @@
</span><span class="cx"> wl_callback_send_done(resource, 0);
</span><span class="cx"> wl_resource_destroy(resource);
</span><span class="cx"> }
</span><del>-
- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const struct wl_surface_interface surfaceInterface = {
</span><span class="lines">@@ -288,9 +286,7 @@
</span><span class="cx"> auto* surface = static_cast<WaylandCompositor::Surface*>(wl_resource_get_user_data(resource));
</span><span class="cx"> if (!surface)
</span><span class="cx"> return;
</span><del>-
- if (surface->commit())
- wl_display_flush_clients(wl_client_get_display(client));
</del><ins>+ surface->commit();
</ins><span class="cx"> },
</span><span class="cx"> // setBufferTransformCallback
</span><span class="cx"> [](struct wl_client*, struct wl_resource*, int32_t) { },
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWaylandCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h (206960 => 206961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-08 23:01:27 UTC (rev 206960)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.h 2016-10-08 23:12:17 UTC (rev 206961)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void attachBuffer(struct wl_resource*);
</span><span class="cx"> void requestFrame(struct wl_resource*);
</span><del>- bool commit();
</del><ins>+ void commit();
</ins><span class="cx">
</span><span class="cx"> void setWebPage(WebPageProxy* webPage) { m_webPage = webPage; }
</span><span class="cx"> bool prepareTextureForPainting(unsigned&, WebCore::IntSize&);
</span></span></pre>
</div>
</div>
</body>
</html>