<!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>[178238] 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/178238">178238</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2015-01-10 04:07:26 -0800 (Sat, 10 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ThreadedCompositor] Prevent excessive rendering call.
https://bugs.webkit.org/show_bug.cgi?id=140297
Reviewed by Žan Doberšek.
Not to waste CPU time on waiting V-Sync interval, the update timer of
compositing thread should be throttled.
In case of updating scene state, this update timer should be called as
soon as possible. However, when CoordinatedGraphicsScene requests update
viewport to advance the animations, this call should be scheduled for
a next frame.
No new tests. No change in functionality.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::CompositingRunLoop::CompositingRunLoop):
(WebKit::CompositingRunLoop::setUpdateTimer):
(WebKit::CompositingRunLoop::updateTimerFired):
(WebKit::ThreadedCompositor::setNeedsDisplay):
(WebKit::ThreadedCompositor::updateViewport):
(WebKit::ThreadedCompositor::scheduleDisplayImmediately):
(WebKit::ThreadedCompositor::didChangeVisibleRect):
(WebKit::ThreadedCompositor::scheduleDisplayIfNeeded): Deleted.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178237 => 178238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-10 08:49:32 UTC (rev 178237)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-10 12:07:26 UTC (rev 178238)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-01-10 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [ThreadedCompositor] Prevent excessive rendering call.
+ https://bugs.webkit.org/show_bug.cgi?id=140297
+
+ Reviewed by Žan Doberšek.
+
+ Not to waste CPU time on waiting V-Sync interval, the update timer of
+ compositing thread should be throttled.
+
+ In case of updating scene state, this update timer should be called as
+ soon as possible. However, when CoordinatedGraphicsScene requests update
+ viewport to advance the animations, this call should be scheduled for
+ a next frame.
+
+ No new tests. No change in functionality.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::CompositingRunLoop::CompositingRunLoop):
+ (WebKit::CompositingRunLoop::setUpdateTimer):
+ (WebKit::CompositingRunLoop::updateTimerFired):
+ (WebKit::ThreadedCompositor::setNeedsDisplay):
+ (WebKit::ThreadedCompositor::updateViewport):
+ (WebKit::ThreadedCompositor::scheduleDisplayImmediately):
+ (WebKit::ThreadedCompositor::didChangeVisibleRect):
+ (WebKit::ThreadedCompositor::scheduleDisplayIfNeeded): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+
</ins><span class="cx"> 2015-01-09 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Try to fix the GTK and EFL builds.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (178237 => 178238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-01-10 08:49:32 UTC (rev 178237)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-01-10 12:07:26 UTC (rev 178238)
</span><span class="lines">@@ -47,10 +47,16 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CompositingRunLoop);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+ enum UpdateTiming {
+ Immediate,
+ WaitUntilNextFrame,
+ };
+
</ins><span class="cx"> CompositingRunLoop(std::function<void()> updateFunction)
</span><span class="cx"> : m_runLoop(RunLoop::current())
</span><span class="cx"> , m_updateTimer(m_runLoop, this, &CompositingRunLoop::updateTimerFired)
</span><span class="cx"> , m_updateFunction(WTF::move(updateFunction))
</span><ins>+ , m_lastUpdateTime(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,12 +70,17 @@
</span><span class="cx"> m_runLoop.dispatch(WTF::move(function));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setUpdateTimer(double interval = 0)
</del><ins>+ void setUpdateTimer(UpdateTiming timing = Immediate)
</ins><span class="cx"> {
</span><span class="cx"> if (m_updateTimer.isActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_updateTimer.startOneShot(interval);
</del><ins>+ const static double targetFPS = 60;
+ double nextUpdateTime = 0;
+ if (timing == WaitUntilNextFrame)
+ nextUpdateTime = std::max((1 / targetFPS) - (monotonicallyIncreasingTime() - m_lastUpdateTime), 0.0);
+
+ m_updateTimer.startOneShot(nextUpdateTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void stopUpdateTimer()
</span><span class="lines">@@ -88,11 +99,14 @@
</span><span class="cx"> void updateTimerFired()
</span><span class="cx"> {
</span><span class="cx"> m_updateFunction();
</span><ins>+ m_lastUpdateTime = monotonicallyIncreasingTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunLoop& m_runLoop;
</span><span class="cx"> RunLoop::Timer<CompositingRunLoop> m_updateTimer;
</span><span class="cx"> std::function<void()> m_updateFunction;
</span><ins>+
+ double m_lastUpdateTime;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ThreadedCompositor> ThreadedCompositor::create(Client* client)
</span><span class="lines">@@ -116,7 +130,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><span class="cx"> callOnCompositingThread([=] {
</span><del>- protector->scheduleDisplayIfNeeded();
</del><ins>+ protector->scheduleDisplayImmediately();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::updateViewport()
</span><span class="cx"> {
</span><del>- setNeedsDisplay();
</del><ins>+ m_compositingRunLoop->setUpdateTimer(CompositingRunLoop::WaitUntilNextFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="lines">@@ -220,9 +234,9 @@
</span><span class="cx"> return m_context.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::scheduleDisplayIfNeeded(double interval)
</del><ins>+void ThreadedCompositor::scheduleDisplayImmediately()
</ins><span class="cx"> {
</span><del>- m_compositingRunLoop->setUpdateTimer(interval);
</del><ins>+ m_compositingRunLoop->setUpdateTimer(CompositingRunLoop::Immediate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeVisibleRect()
</span><span class="lines">@@ -233,7 +247,7 @@
</span><span class="cx"> m_client->setVisibleContentsRect(visibleRect, FloatPoint::zero(), scale);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- setNeedsDisplay();
</del><ins>+ scheduleDisplayImmediately();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::renderLayerTree()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (178237 => 178238)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2015-01-10 08:49:32 UTC (rev 178237)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2015-01-10 12:07:26 UTC (rev 178238)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> virtual void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset) override;
</span><span class="cx">
</span><span class="cx"> void renderLayerTree();
</span><del>- void scheduleDisplayIfNeeded(double interval = 0);
</del><ins>+ void scheduleDisplayImmediately();
</ins><span class="cx"> virtual void didChangeVisibleRect() override;
</span><span class="cx">
</span><span class="cx"> bool ensureGLContext();
</span></span></pre>
</div>
</div>
</body>
</html>