<!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>[201922] 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/201922">201922</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-10 05:52:38 -0700 (Fri, 10 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Threaded Compositor] Make it clear that compositing thread operations are always scheduled from the main thread
https://bugs.webkit.org/show_bug.cgi?id=158562
Reviewed by Žan Doberšek.
The code is written as if the compositor thread could also call callOnCompositingRunLoop() which makes the code
confusing. This patch no longer checks if the task was scheduled in the compositing thread, and instead it adds
an ASSERT to ensure it's always called from the main thread as expected. It also adds some more ASSERTS to ensure
and clarify the methods are called from the expected thread.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
(WebKit::CompositingRunLoop::performTask):
(WebKit::CompositingRunLoop::callOnCompositingRunLoop): Deleted.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing):
(WebKit::ThreadedCompositor::setDeviceScaleFactor):
(WebKit::ThreadedCompositor::didChangeViewportSize):
(WebKit::ThreadedCompositor::didChangeViewportAttribute):
(WebKit::ThreadedCompositor::didChangeContentsSize):
(WebKit::ThreadedCompositor::scrollTo):
(WebKit::ThreadedCompositor::scrollBy):
(WebKit::ThreadedCompositor::glContext):
(WebKit::ThreadedCompositor::didChangeVisibleRect):
(WebKit::ThreadedCompositor::renderLayerTree):
(WebKit::ThreadedCompositor::updateSceneState):
(WebKit::ThreadedCompositor::callOnCompositingThread): 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="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h</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 (201921 => 201922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-10 12:50:14 UTC (rev 201921)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-10 12:52:38 UTC (rev 201922)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-06-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [Threaded Compositor] Make it clear that compositing thread operations are always scheduled from the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=158562
+
+ Reviewed by Žan Doberšek.
+
+ The code is written as if the compositor thread could also call callOnCompositingRunLoop() which makes the code
+ confusing. This patch no longer checks if the task was scheduled in the compositing thread, and instead it adds
+ an ASSERT to ensure it's always called from the main thread as expected. It also adds some more ASSERTS to ensure
+ and clarify the methods are called from the expected thread.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::CompositingRunLoop::performTask):
+ (WebKit::CompositingRunLoop::callOnCompositingRunLoop): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing):
+ (WebKit::ThreadedCompositor::setDeviceScaleFactor):
+ (WebKit::ThreadedCompositor::didChangeViewportSize):
+ (WebKit::ThreadedCompositor::didChangeViewportAttribute):
+ (WebKit::ThreadedCompositor::didChangeContentsSize):
+ (WebKit::ThreadedCompositor::scrollTo):
+ (WebKit::ThreadedCompositor::scrollBy):
+ (WebKit::ThreadedCompositor::glContext):
+ (WebKit::ThreadedCompositor::didChangeVisibleRect):
+ (WebKit::ThreadedCompositor::renderLayerTree):
+ (WebKit::ThreadedCompositor::updateSceneState):
+ (WebKit::ThreadedCompositor::callOnCompositingThread): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+
+2016-06-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Browser plugins crash under Wayland
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157605
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (201921 => 201922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2016-06-10 12:50:14 UTC (rev 201921)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2016-06-10 12:52:38 UTC (rev 201922)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx">
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/MainThread.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -40,13 +41,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingRunLoop::callOnCompositingRunLoop(std::function<void ()>&& function)
</del><ins>+void CompositingRunLoop::performTask(std::function<void ()>&& function)
</ins><span class="cx"> {
</span><del>- if (&m_runLoop == &RunLoop::current()) {
- function();
- return;
- }
-
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx"> m_runLoop.dispatch(WTFMove(function));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (201921 => 201922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-10 12:50:14 UTC (rev 201921)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-10 12:52:38 UTC (rev 201922)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> CompositingRunLoop(std::function<void ()>&&);
</span><span class="cx">
</span><del>- void callOnCompositingRunLoop(std::function<void ()>&&);
</del><ins>+ void performTask(std::function<void ()>&&);
</ins><span class="cx">
</span><span class="cx"> void setUpdateTimer(UpdateTiming timing = Immediate);
</span><span class="cx"> void stopUpdateTimer();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (201921 => 201922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-06-10 12:50:14 UTC (rev 201921)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-06-10 12:52:38 UTC (rev 201922)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void ThreadedCompositor::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, handle] {
</del><ins>+ m_compositingRunLoop->performTask([protector, handle] {
</ins><span class="cx"> protector->m_nativeSurfaceHandle = handle;
</span><span class="cx"> protector->m_scene->setActive(true);
</span><span class="cx"> });
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void ThreadedCompositor::setDeviceScaleFactor(float scale)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, scale] {
</del><ins>+ m_compositingRunLoop->performTask([protector, scale] {
</ins><span class="cx"> protector->m_deviceScaleFactor = scale;
</span><span class="cx"> protector->scheduleDisplayImmediately();
</span><span class="cx"> });
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> void ThreadedCompositor::didChangeViewportSize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, size] {
</del><ins>+ m_compositingRunLoop->performTask([protector, size] {
</ins><span class="cx"> protector->viewportController()->didChangeViewportSize(size);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> void ThreadedCompositor::didChangeViewportAttribute(const ViewportAttributes& attr)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, attr] {
</del><ins>+ m_compositingRunLoop->performTask([protector, attr] {
</ins><span class="cx"> protector->viewportController()->didChangeViewportAttribute(attr);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> void ThreadedCompositor::didChangeContentsSize(const IntSize& size)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, size] {
</del><ins>+ m_compositingRunLoop->performTask([protector, size] {
</ins><span class="cx"> protector->viewportController()->didChangeContentsSize(size);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> void ThreadedCompositor::scrollTo(const IntPoint& position)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, position] {
</del><ins>+ m_compositingRunLoop->performTask([protector, position] {
</ins><span class="cx"> protector->viewportController()->scrollTo(position);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> void ThreadedCompositor::scrollBy(const IntSize& delta)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([protector, delta] {
</del><ins>+ m_compositingRunLoop->performTask([protector, delta] {
</ins><span class="cx"> protector->viewportController()->scrollBy(delta);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -159,6 +159,8 @@
</span><span class="cx">
</span><span class="cx"> GLContext* ThreadedCompositor::glContext()
</span><span class="cx"> {
</span><ins>+ ASSERT(&RunLoop::current() == &m_compositingRunLoop->runLoop());
+
</ins><span class="cx"> if (m_context)
</span><span class="cx"> return m_context.get();
</span><span class="cx">
</span><span class="lines">@@ -176,6 +178,8 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeVisibleRect()
</span><span class="cx"> {
</span><ins>+ ASSERT(&RunLoop::current() == &m_compositingRunLoop->runLoop());
+
</ins><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><span class="cx"> FloatRect visibleRect = viewportController()->visibleContentsRect();
</span><span class="cx"> float scale = viewportController()->pageScaleFactor();
</span><span class="lines">@@ -188,6 +192,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::renderLayerTree()
</span><span class="cx"> {
</span><ins>+ ASSERT(&RunLoop::current() == &m_compositingRunLoop->runLoop());
</ins><span class="cx"> if (!m_scene)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -208,6 +213,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::updateSceneState(const CoordinatedGraphicsState& state)
</span><span class="cx"> {
</span><ins>+ ASSERT(isMainThread());
</ins><span class="cx"> RefPtr<CoordinatedGraphicsScene> scene = m_scene;
</span><span class="cx"> m_scene->appendUpdate([scene, state] {
</span><span class="cx"> scene->commitSceneState(state);
</span><span class="lines">@@ -216,11 +222,6 @@
</span><span class="cx"> scheduleDisplayImmediately();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::callOnCompositingThread(std::function<void()>&& function)
-{
- m_compositingRunLoop->callOnCompositingRunLoop(WTFMove(function));
-}
-
</del><span class="cx"> void ThreadedCompositor::compositingThreadEntry(void* coordinatedCompositor)
</span><span class="cx"> {
</span><span class="cx"> static_cast<ThreadedCompositor*>(coordinatedCompositor)->runCompositingThread();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (201921 => 201922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-06-10 12:50:14 UTC (rev 201921)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-06-10 12:52:38 UTC (rev 201922)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx"> WebCore::GLContext* glContext();
</span><span class="cx"> SimpleViewportController* viewportController() { return m_viewportController.get(); }
</span><span class="cx">
</span><del>- void callOnCompositingThread(std::function<void()>&&);
</del><span class="cx"> void createCompositingThread();
</span><span class="cx"> void runCompositingThread();
</span><span class="cx"> void terminateCompositingThread();
</span></span></pre>
</div>
</div>
</body>
</html>