<!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>[205075] 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/205075">205075</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-27 02:18:54 -0700 (Sat, 27 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][Threaded Compositor] Several flaky tests
https://bugs.webkit.org/show_bug.cgi?id=161242
Reviewed by Michael Catanzaro.
We still have a lot of flaky tests since we switched to the threaded compositor. The UI process might
take the screenshot too early, before everything is actually painted. I can't reproduce the problem, so this is
actually a speculative fix or workaround. Our implementation of DrawingArea::dispatchAfterEnsuringDrawing() is
quite simple, we just dispatch the callback in the next run loop iteration, which doesn't really ensures any
drawing at all. So, we can wait for draw events before dispatching the given callback. Since we don't really
know if draw events were already processed before dispatchAfterEnsuringDrawing() is called, or if there will be
more than one damage event in a short time, this patch waits up to 1 second for draw events, and if a draw
happens it stops if there isn't another draw event in the next 100ms. This should ensure a drawing if it was
really needed.
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::DrawingMonitor):
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::~DrawingMonitor):
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::webViewDrawCallback):
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::start):
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::stop):
(WebKit::DrawingAreaProxyImpl::DrawingMonitor::didDraw):
(WebKit::DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing):
* UIProcess/DrawingAreaProxyImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205074 => 205075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-27 05:47:44 UTC (rev 205074)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-27 09:18:54 UTC (rev 205075)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-08-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK][Threaded Compositor] Several flaky tests
+ https://bugs.webkit.org/show_bug.cgi?id=161242
+
+ Reviewed by Michael Catanzaro.
+
+ We still have a lot of flaky tests since we switched to the threaded compositor. The UI process might
+ take the screenshot too early, before everything is actually painted. I can't reproduce the problem, so this is
+ actually a speculative fix or workaround. Our implementation of DrawingArea::dispatchAfterEnsuringDrawing() is
+ quite simple, we just dispatch the callback in the next run loop iteration, which doesn't really ensures any
+ drawing at all. So, we can wait for draw events before dispatching the given callback. Since we don't really
+ know if draw events were already processed before dispatchAfterEnsuringDrawing() is called, or if there will be
+ more than one damage event in a short time, this patch waits up to 1 second for draw events, and if a draw
+ happens it stops if there isn't another draw event in the next 100ms. This should ensure a drawing if it was
+ really needed.
+
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::DrawingMonitor):
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::~DrawingMonitor):
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::webViewDrawCallback):
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::start):
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::stop):
+ (WebKit::DrawingAreaProxyImpl::DrawingMonitor::didDraw):
+ (WebKit::DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing):
+ * UIProcess/DrawingAreaProxyImpl.h:
+
</ins><span class="cx"> 2016-08-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove support for ENABLE_LEGACY_WEB_AUDIO
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (205074 => 205075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-08-27 05:47:44 UTC (rev 205074)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-08-27 09:18:54 UTC (rev 205075)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include <WebCore/Region.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include <gtk/gtk.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -187,4 +191,70 @@
</span><span class="cx"> backingStoreStateDidChange(DoNotRespondImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+DrawingAreaProxyImpl::DrawingMonitor::DrawingMonitor(WebPageProxy& webPage)
+ : m_webPage(webPage)
+ , m_timer(RunLoop::main(), this, &DrawingMonitor::stop)
+{
+}
+
+DrawingAreaProxyImpl::DrawingMonitor::~DrawingMonitor()
+{
+ m_callback = nullptr;
+ stop();
+}
+
+int DrawingAreaProxyImpl::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyImpl::DrawingMonitor* monitor)
+{
+ monitor->didDraw();
+ return FALSE;
+}
+
+void DrawingAreaProxyImpl::DrawingMonitor::start(std::function<void (CallbackBase::Error)> callback)
+{
+ m_startTime = monotonicallyIncreasingTimeMS();
+ m_callback = callback;
+#if PLATFORM(GTK)
+ g_signal_connect_swapped(m_webPage.viewWidget(), "draw", reinterpret_cast<GCallback>(webViewDrawCallback), this);
+ m_timer.startOneShot(1);
+#else
+ m_timer.startOneShot(0);
+#endif
+}
+
+void DrawingAreaProxyImpl::DrawingMonitor::stop()
+{
+ m_timer.stop();
+#if PLATFORM(GTK)
+ g_signal_handlers_disconnect_by_func(m_webPage.viewWidget(), reinterpret_cast<gpointer>(webViewDrawCallback), this);
+#endif
+ m_startTime = 0;
+ if (m_callback) {
+ m_callback(CallbackBase::Error::None);
+ m_callback = nullptr;
+ }
+}
+
+void DrawingAreaProxyImpl::DrawingMonitor::didDraw()
+{
+ // We wait up to 1 second for draw events. If there are several draw events queued quickly,
+ // we want to wait until all of them have been processed, so after receiving a draw, we wait
+ // up to 100ms for the next one or stop.
+ if (monotonicallyIncreasingTimeMS() - m_startTime > 1000)
+ stop();
+ else
+ m_timer.startOneShot(0.100);
+}
+
+void DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing(std::function<void(CallbackBase::Error)> callbackFunction)
+{
+ if (!m_webPageProxy.isValid()) {
+ callbackFunction(CallbackBase::Error::OwnerWasInvalidated);
+ return;
+ }
+
+ if (!m_drawingMonitor)
+ m_drawingMonitor = std::make_unique<DrawingAreaProxyImpl::DrawingMonitor>(m_webPageProxy);
+ m_drawingMonitor->start(callbackFunction);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (205074 => 205075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-08-27 05:47:44 UTC (rev 205074)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-08-27 09:18:54 UTC (rev 205075)
</span><span class="lines">@@ -60,9 +60,32 @@
</span><span class="cx"> void discardBackingStoreSoon();
</span><span class="cx"> void discardBackingStore();
</span><span class="cx">
</span><ins>+ void dispatchAfterEnsuringDrawing(std::function<void(CallbackBase::Error)>) override;
+
+ class DrawingMonitor {
+ WTF_MAKE_NONCOPYABLE(DrawingMonitor); WTF_MAKE_FAST_ALLOCATED;
+ public:
+ DrawingMonitor(WebPageProxy&);
+ ~DrawingMonitor();
+
+ void start(std::function<void (CallbackBase::Error)>);
+
+ private:
+ static int webViewDrawCallback(DrawingMonitor*);
+
+ void stop();
+ void didDraw();
+
+ WebPageProxy& m_webPage;
+ double m_startTime { 0 };
+ std::function<void (CallbackBase::Error)> m_callback;
+ RunLoop::Timer<DrawingMonitor> m_timer;
+ };
+
</ins><span class="cx"> bool m_isBackingStoreDiscardable { true };
</span><span class="cx"> std::unique_ptr<BackingStore> m_backingStore;
</span><span class="cx"> RunLoop::Timer<DrawingAreaProxyImpl> m_discardBackingStoreTimer;
</span><ins>+ std::unique_ptr<DrawingMonitor> m_drawingMonitor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>