<!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>[178120] 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/178120">178120</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2015-01-08 10:11:19 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ThreadedCompositor] Update active animations without interrupting the main-thread
https://bugs.webkit.org/show_bug.cgi?id=140245
Reviewed by Martin Robinson.
In the Threaded Compositor, CoordinatedGraphicsScene can directly
request updateViewport to the compositing thread if it has any active
animation.
To keep current behavior of CoordinatedGraphics, this patch modifies
CoordinatedGraphicsScene to remember the constructed thread as a
clientRunLoop, and dispatch updateViewport calls to clientRunLoop.
No new tests. No change in functionality.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
(WebKit::CoordinatedGraphicsScene::CoordinatedGraphicsScene):
(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebKit::CoordinatedGraphicsScene::updateViewport):
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::ThreadedCompositor):
(WebKit::ThreadedCompositor::runCompositingThread):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178119 => 178120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-08 18:03:21 UTC (rev 178119)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-08 18:11:19 UTC (rev 178120)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><ins>+ [ThreadedCompositor] Update active animations without interrupting the main-thread
+ https://bugs.webkit.org/show_bug.cgi?id=140245
+
+ Reviewed by Martin Robinson.
+
+ In the Threaded Compositor, CoordinatedGraphicsScene can directly
+ request updateViewport to the compositing thread if it has any active
+ animation.
+
+ To keep current behavior of CoordinatedGraphics, this patch modifies
+ CoordinatedGraphicsScene to remember the constructed thread as a
+ clientRunLoop, and dispatch updateViewport calls to clientRunLoop.
+
+ No new tests. No change in functionality.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
+ (WebKit::CoordinatedGraphicsScene::CoordinatedGraphicsScene):
+ (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+ (WebKit::CoordinatedGraphicsScene::updateViewport):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::ThreadedCompositor):
+ (WebKit::ThreadedCompositor::runCompositingThread):
+
+2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
+
</ins><span class="cx"> [GTK] Seperate updateBackingStore from flushCompositingState.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136887
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (178119 => 178120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2015-01-08 18:03:21 UTC (rev 178119)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2015-01-08 18:11:19 UTC (rev 178120)
</span><span class="lines">@@ -43,6 +43,14 @@
</span><span class="cx"> callOnMainThread(WTF::move(function));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CoordinatedGraphicsScene::dispatchOnClientRunLoop(std::function<void()> function)
+{
+ if (&m_clientRunLoop == &RunLoop::current())
+ function();
+ else
+ m_clientRunLoop.dispatch(WTF::move(function));
+}
+
</ins><span class="cx"> static bool layerShouldHaveBackingStore(TextureMapperLayer* layer)
</span><span class="cx"> {
</span><span class="cx"> return layer->drawsContent() && layer->contentsAreVisible() && !layer->size().isEmpty();
</span><span class="lines">@@ -53,6 +61,7 @@
</span><span class="cx"> , m_isActive(false)
</span><span class="cx"> , m_rootLayerID(InvalidCoordinatedLayerID)
</span><span class="cx"> , m_viewBackgroundColor(Color::white)
</span><ins>+ , m_clientRunLoop(RunLoop::current())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> if (currentRootLayer->descendantsOrSelfHaveRunningAnimations()) {
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnMainThread([=] {
</del><ins>+ dispatchOnClientRunLoop([=] {
</ins><span class="cx"> protector->updateViewport();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -138,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::updateViewport()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(&m_clientRunLoop == &RunLoop::current());
</ins><span class="cx"> if (m_client)
</span><span class="cx"> m_client->updateViewport();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (178119 => 178120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2015-01-08 18:03:21 UTC (rev 178119)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2015-01-08 18:11:19 UTC (rev 178120)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -123,6 +124,7 @@
</span><span class="cx"> void adjustPositionForFixedLayers(const WebCore::FloatPoint& contentPosition);
</span><span class="cx">
</span><span class="cx"> void dispatchOnMainThread(std::function<void()>);
</span><ins>+ void dispatchOnClientRunLoop(std::function<void()>);
</ins><span class="cx"> void updateViewport();
</span><span class="cx"> void renderNextFrame();
</span><span class="cx"> void purgeBackingStores();
</span><span class="lines">@@ -181,6 +183,8 @@
</span><span class="cx"> WebCore::Color m_viewBackgroundColor;
</span><span class="cx">
</span><span class="cx"> WebCore::TextureMapperFPSCounter m_fpsCounter;
</span><ins>+
+ RunLoop& m_clientRunLoop;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (178119 => 178120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-01-08 18:03:21 UTC (rev 178119)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2015-01-08 18:11:19 UTC (rev 178120)
</span><span class="lines">@@ -102,8 +102,6 @@
</span><span class="cx">
</span><span class="cx"> ThreadedCompositor::ThreadedCompositor(Client* client)
</span><span class="cx"> : m_client(client)
</span><del>- , m_scene(adoptRef(new CoordinatedGraphicsScene(this)))
- , m_viewportController(std::make_unique<SimpleViewportController>(this))
</del><span class="cx"> , m_threadIdentifier(0)
</span><span class="cx"> {
</span><span class="cx"> createCompositingThread();
</span><span class="lines">@@ -293,6 +291,8 @@
</span><span class="cx"> m_compositingRunLoop = std::make_unique<CompositingRunLoop>([&] {
</span><span class="cx"> renderLayerTree();
</span><span class="cx"> });
</span><ins>+ m_scene = adoptRef(new CoordinatedGraphicsScene(this));
+ m_viewportController = std::make_unique<SimpleViewportController>(this);
</ins><span class="cx">
</span><span class="cx"> m_initializeRunLoopCondition.signal();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>