<!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>[202038] 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/202038">202038</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-14 00:52:25 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Threaded Compositor] Modernize and simplify threaded compositor code
https://bugs.webkit.org/show_bug.cgi?id=158615
Reviewed by Žan Doberšek.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
(WebKit::CompositingRunLoop::performTask): Use NoncopyableFunction.
(WebKit::CompositingRunLoop::performTaskSync): Ditto.
(WebKit::CompositingRunLoop::startUpdateTimer): Just renamed to start instead of set.
(WebKit::CompositingRunLoop::run): Expose run/stop methods instead of the internal RunLoop object.
(WebKit::CompositingRunLoop::stop): Also stop the update timer instead of relying on the caller to do it.
(WebKit::CompositingRunLoop::setUpdateTimer): Deleted.
(WebKit::CompositingRunLoop::stopUpdateTimer): Deleted.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing): Protects this directly in lambda capture.
(WebKit::ThreadedCompositor::setDeviceScaleFactor): Ditto.
(WebKit::ThreadedCompositor::didChangeViewportSize): Ditto.
(WebKit::ThreadedCompositor::didChangeViewportAttribute): Ditto.
(WebKit::ThreadedCompositor::didChangeContentsSize): Ditto.
(WebKit::ThreadedCompositor::scrollTo): Ditto.
(WebKit::ThreadedCompositor::scrollBy): Ditto.
(WebKit::ThreadedCompositor::updateViewport): Use startUpdateTimer().
(WebKit::ThreadedCompositor::scheduleDisplayImmediately): Ditto.
(WebKit::ThreadedCompositor::didChangeVisibleRect): Improve lambda captures.
(WebKit::ThreadedCompositor::renderLayerTree): Use m_viewportController directly.
(WebKit::ThreadedCompositor::createCompositingThread): Use createThread() version that receives a function.
(WebKit::ThreadedCompositor::runCompositingThread): Use run method and don't stop the update timer when the run
loop finishes.
(WebKit::ThreadedCompositor::terminateCompositingThread): Use stop method.
(WebKit::ThreadedCompositor::ThreadedCompositor): Deleted.
(WebKit::ThreadedCompositor::compositingThreadEntry): Deleted.
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
(WebKit::ThreadedCompositor::viewportController): Deleted.</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 (202037 => 202038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-06-14 07:48:54 UTC (rev 202037)
+++ trunk/Source/WebKit2/ChangeLog        2016-06-14 07:52:25 UTC (rev 202038)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-06-14 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [Threaded Compositor] Modernize and simplify threaded compositor code
+ https://bugs.webkit.org/show_bug.cgi?id=158615
+
+ Reviewed by Žan Doberšek.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::CompositingRunLoop::performTask): Use NoncopyableFunction.
+ (WebKit::CompositingRunLoop::performTaskSync): Ditto.
+ (WebKit::CompositingRunLoop::startUpdateTimer): Just renamed to start instead of set.
+ (WebKit::CompositingRunLoop::run): Expose run/stop methods instead of the internal RunLoop object.
+ (WebKit::CompositingRunLoop::stop): Also stop the update timer instead of relying on the caller to do it.
+ (WebKit::CompositingRunLoop::setUpdateTimer): Deleted.
+ (WebKit::CompositingRunLoop::stopUpdateTimer): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing): Protects this directly in lambda capture.
+ (WebKit::ThreadedCompositor::setDeviceScaleFactor): Ditto.
+ (WebKit::ThreadedCompositor::didChangeViewportSize): Ditto.
+ (WebKit::ThreadedCompositor::didChangeViewportAttribute): Ditto.
+ (WebKit::ThreadedCompositor::didChangeContentsSize): Ditto.
+ (WebKit::ThreadedCompositor::scrollTo): Ditto.
+ (WebKit::ThreadedCompositor::scrollBy): Ditto.
+ (WebKit::ThreadedCompositor::updateViewport): Use startUpdateTimer().
+ (WebKit::ThreadedCompositor::scheduleDisplayImmediately): Ditto.
+ (WebKit::ThreadedCompositor::didChangeVisibleRect): Improve lambda captures.
+ (WebKit::ThreadedCompositor::renderLayerTree): Use m_viewportController directly.
+ (WebKit::ThreadedCompositor::createCompositingThread): Use createThread() version that receives a function.
+ (WebKit::ThreadedCompositor::runCompositingThread): Use run method and don't stop the update timer when the run
+ loop finishes.
+ (WebKit::ThreadedCompositor::terminateCompositingThread): Use stop method.
+ (WebKit::ThreadedCompositor::ThreadedCompositor): Deleted.
+ (WebKit::ThreadedCompositor::compositingThreadEntry): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+ (WebKit::ThreadedCompositor::viewportController): Deleted.
+
+2016-06-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [Threaded Compositor] Flickering and rendering artifacts when resizing the web view
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154070
</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 (202037 => 202038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp        2016-06-14 07:48:54 UTC (rev 202037)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp        2016-06-14 07:52:25 UTC (rev 202038)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingRunLoop::performTask(std::function<void ()>&& function)
</del><ins>+void CompositingRunLoop::performTask(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_runLoop.dispatch(WTFMove(function));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingRunLoop::performTaskSync(std::function<void ()>&& function)
</del><ins>+void CompositingRunLoop::performTaskSync(NoncopyableFunction<void ()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> LockHolder locker(m_dispatchSyncConditionMutex);
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> m_dispatchSyncCondition.wait(m_dispatchSyncConditionMutex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingRunLoop::setUpdateTimer(UpdateTiming timing)
</del><ins>+void CompositingRunLoop::startUpdateTimer(UpdateTiming timing)
</ins><span class="cx"> {
</span><span class="cx"> if (m_updateTimer.isActive())
</span><span class="cx"> return;
</span><span class="lines">@@ -71,18 +71,23 @@
</span><span class="cx"> m_updateTimer.startOneShot(nextUpdateTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositingRunLoop::stopUpdateTimer()
-{
- if (m_updateTimer.isActive())
- m_updateTimer.stop();
-}
-
</del><span class="cx"> void CompositingRunLoop::updateTimerFired()
</span><span class="cx"> {
</span><span class="cx"> m_updateFunction();
</span><span class="cx"> m_lastUpdateTime = monotonicallyIncreasingTime();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CompositingRunLoop::run()
+{
+ m_runLoop.run();
+}
+
+void CompositingRunLoop::stop()
+{
+ m_updateTimer.stop();
+ m_runLoop.stop();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // USE(COORDINATED_GRAPHICS_THREADED)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorCompositingRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (202037 => 202038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h        2016-06-14 07:48:54 UTC (rev 202037)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h        2016-06-14 07:52:25 UTC (rev 202038)
</span><span class="lines">@@ -46,13 +46,13 @@
</span><span class="cx">
</span><span class="cx"> CompositingRunLoop(std::function<void ()>&&);
</span><span class="cx">
</span><del>- void performTask(std::function<void ()>&&);
- void performTaskSync(std::function<void ()>&&);
</del><ins>+ void performTask(NoncopyableFunction<void ()>&&);
+ void performTaskSync(NoncopyableFunction<void ()>&&);
</ins><span class="cx">
</span><del>- void setUpdateTimer(UpdateTiming timing = Immediate);
- void stopUpdateTimer();
</del><ins>+ void startUpdateTimer(UpdateTiming = Immediate);
</ins><span class="cx">
</span><del>- RunLoop& runLoop() { return m_runLoop; }
</del><ins>+ void run();
+ void stop();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (202037 => 202038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp        2016-06-14 07:48:54 UTC (rev 202037)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp        2016-06-14 07:52:25 UTC (rev 202038)
</span><span class="lines">@@ -50,8 +50,6 @@
</span><span class="cx">
</span><span class="cx"> ThreadedCompositor::ThreadedCompositor(Client* client)
</span><span class="cx"> : m_client(client)
</span><del>- , m_deviceScaleFactor(1)
- , m_threadIdentifier(0)
</del><span class="cx"> {
</span><span class="cx"> createCompositingThread();
</span><span class="cx"> }
</span><span class="lines">@@ -63,59 +61,52 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::setNativeSurfaceHandleForCompositing(uint64_t handle)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, handle] {
- protector->m_nativeSurfaceHandle = handle;
- protector->m_scene->setActive(true);
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), handle] {
+ m_nativeSurfaceHandle = handle;
+ m_scene->setActive(true);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::setDeviceScaleFactor(float scale)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, scale] {
- protector->m_deviceScaleFactor = scale;
- protector->scheduleDisplayImmediately();
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), scale] {
+ m_deviceScaleFactor = scale;
+ scheduleDisplayImmediately();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeViewportSize(const IntSize& size)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTaskSync([protector, size] {
- protector->viewportController()->didChangeViewportSize(size);
</del><ins>+ m_compositingRunLoop->performTaskSync([this, protectedThis = Ref<ThreadedCompositor>(*this), size] {
+ m_viewportController->didChangeViewportSize(size);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeViewportAttribute(const ViewportAttributes& attr)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, attr] {
- protector->viewportController()->didChangeViewportAttribute(attr);
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), attr] {
+ m_viewportController->didChangeViewportAttribute(attr);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeContentsSize(const IntSize& size)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, size] {
- protector->viewportController()->didChangeContentsSize(size);
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), size] {
+ m_viewportController->didChangeContentsSize(size);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::scrollTo(const IntPoint& position)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, position] {
- protector->viewportController()->scrollTo(position);
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), position] {
+ m_viewportController->scrollTo(position);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::scrollBy(const IntSize& delta)
</span><span class="cx"> {
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- m_compositingRunLoop->performTask([protector, delta] {
- protector->viewportController()->scrollBy(delta);
</del><ins>+ m_compositingRunLoop->performTask([this, protectedThis = Ref<ThreadedCompositor>(*this), delta] {
+ m_viewportController->scrollBy(delta);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -131,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::updateViewport()
</span><span class="cx"> {
</span><del>- m_compositingRunLoop->setUpdateTimer(CompositingRunLoop::WaitUntilNextFrame);
</del><ins>+ m_compositingRunLoop->startUpdateTimer(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">@@ -173,18 +164,15 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::scheduleDisplayImmediately()
</span><span class="cx"> {
</span><del>- m_compositingRunLoop->setUpdateTimer(CompositingRunLoop::Immediate);
</del><ins>+ m_compositingRunLoop->startUpdateTimer(CompositingRunLoop::Immediate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeVisibleRect()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(&RunLoop::current() == &m_compositingRunLoop->runLoop());
</span><span class="cx">
</span><del>- RefPtr<ThreadedCompositor> protector(this);
- FloatRect visibleRect = viewportController()->visibleContentsRect();
- float scale = viewportController()->pageScaleFactor();
- RunLoop::main().dispatch([protector, visibleRect, scale] {
- protector->m_client->setVisibleContentsRect(visibleRect, FloatPoint::zero(), scale);
</del><ins>+ RunLoop::main().dispatch([this, protectedThis = Ref<ThreadedCompositor>(*this), visibleRect = m_viewportController->visibleContentsRect(), scale = m_viewportController->pageScaleFactor()] {
+ m_client->setVisibleContentsRect(visibleRect, FloatPoint::zero(), scale);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> scheduleDisplayImmediately();
</span><span class="lines">@@ -202,8 +190,8 @@
</span><span class="cx"> FloatRect clipRect(0, 0, m_viewportSize.width(), m_viewportSize.height());
</span><span class="cx">
</span><span class="cx"> TransformationMatrix viewportTransform;
</span><del>- FloatPoint scrollPostion = viewportController()->visibleContentsRect().location();
- viewportTransform.scale(viewportController()->pageScaleFactor() * m_deviceScaleFactor);
</del><ins>+ FloatPoint scrollPostion = m_viewportController->visibleContentsRect().location();
+ viewportTransform.scale(m_viewportController->pageScaleFactor() * m_deviceScaleFactor);
</ins><span class="cx"> viewportTransform.translate(-scrollPostion.x(), -scrollPostion.y());
</span><span class="cx">
</span><span class="cx"> m_scene->paintToCurrentGLContext(viewportTransform, 1, clipRect, Color::white, false, scrollPostion);
</span><span class="lines">@@ -222,19 +210,13 @@
</span><span class="cx"> scheduleDisplayImmediately();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::compositingThreadEntry(void* coordinatedCompositor)
-{
- static_cast<ThreadedCompositor*>(coordinatedCompositor)->runCompositingThread();
-}
-
</del><span class="cx"> void ThreadedCompositor::createCompositingThread()
</span><span class="cx"> {
</span><span class="cx"> if (m_threadIdentifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LockHolder locker(m_initializeRunLoopConditionMutex);
</span><del>- m_threadIdentifier = createThread(compositingThreadEntry, this, "WebCore: ThreadedCompositor");
-
</del><ins>+ m_threadIdentifier = createThread("WebKit: ThreadedCompositor", [this] { runCompositingThread(); });
</ins><span class="cx"> m_initializeRunLoopCondition.wait(m_initializeRunLoopConditionMutex);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -252,9 +234,8 @@
</span><span class="cx"> m_initializeRunLoopCondition.notifyOne();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_compositingRunLoop->runLoop().run();
</del><ins>+ m_compositingRunLoop->run();
</ins><span class="cx">
</span><del>- m_compositingRunLoop->stopUpdateTimer();
</del><span class="cx"> m_scene->purgeGLResources();
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -274,7 +255,7 @@
</span><span class="cx"> LockHolder locker(m_terminateRunLoopConditionMutex);
</span><span class="cx">
</span><span class="cx"> m_scene->detach();
</span><del>- m_compositingRunLoop->runLoop().stop();
</del><ins>+ m_compositingRunLoop->stop();
</ins><span class="cx">
</span><span class="cx"> m_terminateRunLoopCondition.wait(m_terminateRunLoopConditionMutex);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (202037 => 202038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h        2016-06-14 07:48:54 UTC (rev 202037)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h        2016-06-14 07:52:25 UTC (rev 202038)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx">
</span><span class="cx"> bool ensureGLContext();
</span><span class="cx"> WebCore::GLContext* glContext();
</span><del>- SimpleViewportController* viewportController() { return m_viewportController.get(); }
</del><span class="cx">
</span><span class="cx"> void createCompositingThread();
</span><span class="cx"> void runCompositingThread();
</span><span class="lines">@@ -104,12 +103,12 @@
</span><span class="cx"> std::unique_ptr<WebCore::GLContext> m_context;
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize m_viewportSize;
</span><del>- float m_deviceScaleFactor;
- uint64_t m_nativeSurfaceHandle;
</del><ins>+ float m_deviceScaleFactor { 1 };
+ uint64_t m_nativeSurfaceHandle { 0 };
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<CompositingRunLoop> m_compositingRunLoop;
</span><span class="cx">
</span><del>- ThreadIdentifier m_threadIdentifier;
</del><ins>+ ThreadIdentifier m_threadIdentifier { 0 };
</ins><span class="cx"> Condition m_initializeRunLoopCondition;
</span><span class="cx"> Lock m_initializeRunLoopConditionMutex;
</span><span class="cx"> Condition m_terminateRunLoopCondition;
</span></span></pre>
</div>
</div>
</body>
</html>