<!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>[211789] 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/211789">211789</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-07 01:33:12 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211281">r211281</a> - [Threaded Compositor] Stop creating the GLContext on demand the first time makeContextCurrent is called
https://bugs.webkit.org/show_bug.cgi?id=167496
Reviewed by Žan Doberšek.
This is causing problems with animations when entering AC mode on demand. What happens is that the threaded
compositor is created, then the animation is scheduled and during the first animation iteration the GLContext is
created, making the first frame of the animation quite slow. In my computer creating the GLContext takes 0.8
seconds. If the animation duration is less than the time it takes to create the GLContext, the animation ends
without iterating. This causing timeouts in the bots in tests like
animations/animation-iteration-event-destroy-renderer.html that expect webkitAnimationIteration events that
never fire.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::ThreadedCompositor): Create the GLContext right after the compositing thread is
created if we already have a native surface handle.
(WebKit::ThreadedCompositor::createGLContext): Helper to create the GLContext.
(WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing): Create the GLContext when a native surface
handle is given.
(WebKit::ThreadedCompositor::makeContextCurrent): Deleted.
(WebKit::ThreadedCompositor::renderLayerTree): Make the context cunrrent directly here.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.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 (211788 => 211789)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:33:06 UTC (rev 211788)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:33:12 UTC (rev 211789)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Threaded Compositor] Stop creating the GLContext on demand the first time makeContextCurrent is called
+ https://bugs.webkit.org/show_bug.cgi?id=167496
+
+ Reviewed by Žan Doberšek.
+
+ This is causing problems with animations when entering AC mode on demand. What happens is that the threaded
+ compositor is created, then the animation is scheduled and during the first animation iteration the GLContext is
+ created, making the first frame of the animation quite slow. In my computer creating the GLContext takes 0.8
+ seconds. If the animation duration is less than the time it takes to create the GLContext, the animation ends
+ without iterating. This causing timeouts in the bots in tests like
+ animations/animation-iteration-event-destroy-renderer.html that expect webkitAnimationIteration events that
+ never fire.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::ThreadedCompositor): Create the GLContext right after the compositing thread is
+ created if we already have a native surface handle.
+ (WebKit::ThreadedCompositor::createGLContext): Helper to create the GLContext.
+ (WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing): Create the GLContext when a native surface
+ handle is given.
+ (WebKit::ThreadedCompositor::makeContextCurrent): Deleted.
+ (WebKit::ThreadedCompositor::renderLayerTree): Make the context cunrrent directly here.
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+
</ins><span class="cx"> 2017-01-26 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Threaded Compositor] Update also the contents size when creating the threaded compositor
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (211788 => 211789)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-02-07 09:33:06 UTC (rev 211788)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2017-02-07 09:33:12 UTC (rev 211789)
</span><span class="lines">@@ -59,7 +59,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
</span><span class="cx"> m_scene = adoptRef(new CoordinatedGraphicsScene(this));
</span><del>- m_scene->setActive(!!m_nativeSurfaceHandle);
</del><ins>+ if (m_nativeSurfaceHandle) {
+ createGLContext();
+ m_scene->setActive(true);
+ } else
+ m_scene->setActive(false);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,6 +71,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ThreadedCompositor::createGLContext()
+{
+ ASSERT(!isMainThread());
+ ASSERT(m_nativeSurfaceHandle);
+
+ m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_nativeSurfaceHandle), &PlatformDisplay::sharedDisplayForCompositing());
+ if (!m_context)
+ return;
+
+ if (m_doFrameSync == ShouldDoFrameSync::No) {
+ if (m_context->makeContextCurrent())
+ m_context->swapInterval(0);
+ }
+}
+
</ins><span class="cx"> void ThreadedCompositor::invalidate()
</span><span class="cx"> {
</span><span class="cx"> m_scene->detach();
</span><span class="lines">@@ -83,13 +102,16 @@
</span><span class="cx"> {
</span><span class="cx"> m_compositingRunLoop->stopUpdateTimer();
</span><span class="cx"> m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this), handle] {
</span><del>- m_scene->setActive(!!handle);
-
</del><span class="cx"> // A new native handle can't be set without destroying the previous one first if any.
</span><span class="cx"> ASSERT(!!handle ^ !!m_nativeSurfaceHandle);
</span><span class="cx"> m_nativeSurfaceHandle = handle;
</span><del>- if (!m_nativeSurfaceHandle)
</del><ins>+ if (m_nativeSurfaceHandle) {
+ createGLContext();
+ m_scene->setActive(true);
+ } else {
+ m_scene->setActive(false);
</ins><span class="cx"> m_context = nullptr;
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,27 +172,6 @@
</span><span class="cx"> m_compositingRunLoop->startUpdateTimer(CompositingRunLoop::Immediate);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ThreadedCompositor::makeContextCurrent()
-{
- if (m_context)
- return m_context->makeContextCurrent();
-
- if (!m_nativeSurfaceHandle)
- return false;
-
- m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_nativeSurfaceHandle), &PlatformDisplay::sharedDisplayForCompositing());
- if (!m_context)
- return false;
-
- if (!m_context->makeContextCurrent())
- return false;
-
- if (m_doFrameSync == ShouldDoFrameSync::No)
- m_context->swapInterval(0);
-
- return true;
-}
-
</del><span class="cx"> void ThreadedCompositor::forceRepaint()
</span><span class="cx"> {
</span><span class="cx"> m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
</span><span class="lines">@@ -183,7 +184,7 @@
</span><span class="cx"> if (!m_scene || !m_scene->isActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!makeContextCurrent())
</del><ins>+ if (!m_context || !m_context->makeContextCurrent())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_needsResize) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (211788 => 211789)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2017-02-07 09:33:06 UTC (rev 211788)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2017-02-07 09:33:12 UTC (rev 211789)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> void renderLayerTree();
</span><span class="cx"> void scheduleDisplayImmediately();
</span><span class="cx">
</span><del>- bool makeContextCurrent();
</del><ins>+ void createGLContext();
</ins><span class="cx">
</span><span class="cx"> Client& m_client;
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> m_scene;
</span></span></pre>
</div>
</div>
</body>
</html>