<!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>[198525] 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/198525">198525</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-03-22 02:44:47 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CoordinatedGraphics] Polish std::function<> usage in ThreadedCompositor, CoordinatedGraphicsScene
https://bugs.webkit.org/show_bug.cgi?id=155726
Reviewed by Darin Adler.
Adjust the methods in ThreadedCompositor and CoordinatedGraphicsScene
classes to accept std::function<> arguments via rvalue references. This
should prevent both unnecessary copies and moves.
Fix lambda expressions that are most commonly used to construct the
std::function<> objects so that they don't capture-by-value by default,
but instead list the captured values verbosely. This part alone exposed
an issue in ThreadedCompositor::didChangeVisibleRect() where we were
capturing the `this' value by default, instead of a protector RefPtr.
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::dispatchOnMainThread):
(WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):
(WebKit::CoordinatedGraphicsScene::commitSceneState):
(WebKit::CoordinatedGraphicsScene::purgeGLResources):
(WebKit::CoordinatedGraphicsScene::commitScrollOffset):
(WebKit::CoordinatedGraphicsScene::appendUpdate):
(WebKit::CoordinatedGraphicsScene::setActive):
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
(WebKit::CompositingRunLoop::CompositingRunLoop):
(WebKit::CompositingRunLoop::callOnCompositingRunLoop):
(WebKit::ThreadedCompositor::setNeedsDisplay):
(WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing):
(WebKit::ThreadedCompositor::setDeviceScaleFactor):
(WebKit::ThreadedCompositor::didChangeViewportSize):
(WebKit::ThreadedCompositor::didChangeViewportAttribute):
(WebKit::ThreadedCompositor::didChangeContentsSize):
(WebKit::ThreadedCompositor::scrollTo):
(WebKit::ThreadedCompositor::scrollBy):
(WebKit::ThreadedCompositor::didChangeVisibleRect):
(WebKit::ThreadedCompositor::callOnCompositingThread):
* Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:</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>
<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 (198524 => 198525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-22 09:38:12 UTC (rev 198524)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-22 09:44:47 UTC (rev 198525)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2016-03-22 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [CoordinatedGraphics] Polish std::function<> usage in ThreadedCompositor, CoordinatedGraphicsScene
+ https://bugs.webkit.org/show_bug.cgi?id=155726
+
+ Reviewed by Darin Adler.
+
+ Adjust the methods in ThreadedCompositor and CoordinatedGraphicsScene
+ classes to accept std::function<> arguments via rvalue references. This
+ should prevent both unnecessary copies and moves.
+
+ Fix lambda expressions that are most commonly used to construct the
+ std::function<> objects so that they don't capture-by-value by default,
+ but instead list the captured values verbosely. This part alone exposed
+ an issue in ThreadedCompositor::didChangeVisibleRect() where we were
+ capturing the `this' value by default, instead of a protector RefPtr.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::dispatchOnMainThread):
+ (WebKit::CoordinatedGraphicsScene::dispatchOnClientRunLoop):
+ (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+ (WebKit::CoordinatedGraphicsScene::onNewBufferAvailable):
+ (WebKit::CoordinatedGraphicsScene::commitSceneState):
+ (WebKit::CoordinatedGraphicsScene::purgeGLResources):
+ (WebKit::CoordinatedGraphicsScene::commitScrollOffset):
+ (WebKit::CoordinatedGraphicsScene::appendUpdate):
+ (WebKit::CoordinatedGraphicsScene::setActive):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::CompositingRunLoop::CompositingRunLoop):
+ (WebKit::CompositingRunLoop::callOnCompositingRunLoop):
+ (WebKit::ThreadedCompositor::setNeedsDisplay):
+ (WebKit::ThreadedCompositor::setNativeSurfaceHandleForCompositing):
+ (WebKit::ThreadedCompositor::setDeviceScaleFactor):
+ (WebKit::ThreadedCompositor::didChangeViewportSize):
+ (WebKit::ThreadedCompositor::didChangeViewportAttribute):
+ (WebKit::ThreadedCompositor::didChangeContentsSize):
+ (WebKit::ThreadedCompositor::scrollTo):
+ (WebKit::ThreadedCompositor::scrollBy):
+ (WebKit::ThreadedCompositor::didChangeVisibleRect):
+ (WebKit::ThreadedCompositor::callOnCompositingThread):
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+
+2016-03-22 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [CoordinatedGraphics] Prefer RunLoop::main().dispatch() over callOnMainThread()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155725
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (198524 => 198525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2016-03-22 09:38:12 UTC (rev 198524)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2016-03-22 09:44:47 UTC (rev 198525)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchOnMainThread(std::function<void()> function)
</del><ins>+void CoordinatedGraphicsScene::dispatchOnMainThread(std::function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> function();
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> RunLoop::main().dispatch(WTFMove(function));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchOnClientRunLoop(std::function<void()> function)
</del><ins>+void CoordinatedGraphicsScene::dispatchOnClientRunLoop(std::function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (&m_clientRunLoop == &RunLoop::current())
</span><span class="cx"> function();
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> if (currentRootLayer->descendantsOrSelfHaveRunningAnimations()) {
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnClientRunLoop([=] {
</del><ins>+ dispatchOnClientRunLoop([protector] {
</ins><span class="cx"> protector->updateViewport();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> void CoordinatedGraphicsScene::onNewBufferAvailable()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnClientRunLoop([=] {
</del><ins>+ dispatchOnClientRunLoop([protector] {
</ins><span class="cx"> protector->updateViewport();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx">
</span><span class="cx"> // The pending tiles state is on its way for the screen, tell the web process to render the next one.
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnMainThread([=] {
</del><ins>+ dispatchOnMainThread([protector] {
</ins><span class="cx"> protector->renderNextFrame();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> setActive(false);
</span><span class="cx">
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnMainThread([=] {
</del><ins>+ dispatchOnMainThread([protector] {
</ins><span class="cx"> protector->purgeBackingStores();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> void CoordinatedGraphicsScene::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnMainThread([=] {
</del><ins>+ dispatchOnMainThread([protector, layerID, offset] {
</ins><span class="cx"> protector->dispatchCommitScrollOffset(layerID, offset);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> m_client = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::appendUpdate(std::function<void()> function)
</del><ins>+void CoordinatedGraphicsScene::appendUpdate(std::function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_isActive)
</span><span class="cx"> return;
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> m_isActive = active;
</span><span class="cx"> if (m_isActive) {
</span><span class="cx"> RefPtr<CoordinatedGraphicsScene> protector(this);
</span><del>- dispatchOnMainThread([=] {
</del><ins>+ dispatchOnMainThread([protector] {
</ins><span class="cx"> protector->renderNextFrame();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (198524 => 198525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2016-03-22 09:38:12 UTC (rev 198524)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2016-03-22 09:44:47 UTC (rev 198525)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&, const WebCore::Color& backgroundColor, bool drawsBackground, const WebCore::FloatPoint&, WebCore::TextureMapper::PaintFlags = 0);
</span><span class="cx"> void paintToGraphicsContext(PlatformGraphicsContext*, const WebCore::Color& backgroundColor, bool drawsBackground);
</span><span class="cx"> void detach();
</span><del>- void appendUpdate(std::function<void()>);
</del><ins>+ void appendUpdate(std::function<void()>&&);
</ins><span class="cx">
</span><span class="cx"> WebCore::TextureMapperLayer* findScrollableContentsLayerAt(const WebCore::FloatPoint&);
</span><span class="cx">
</span><span class="lines">@@ -131,8 +131,8 @@
</span><span class="cx"> void syncRemoteContent();
</span><span class="cx"> void adjustPositionForFixedLayers(const WebCore::FloatPoint& contentPosition);
</span><span class="cx">
</span><del>- void dispatchOnMainThread(std::function<void()>);
- void dispatchOnClientRunLoop(std::function<void()>);
</del><ins>+ void dispatchOnMainThread(std::function<void()>&&);
+ 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></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadedCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (198524 => 198525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-03-22 09:38:12 UTC (rev 198524)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2016-03-22 09:44:47 UTC (rev 198525)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> WaitUntilNextFrame,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- CompositingRunLoop(std::function<void()> updateFunction)
</del><ins>+ CompositingRunLoop(std::function<void()>&& updateFunction)
</ins><span class="cx"> : m_runLoop(RunLoop::current())
</span><span class="cx"> , m_updateTimer(m_runLoop, this, &CompositingRunLoop::updateTimerFired)
</span><span class="cx"> , m_updateFunction(WTFMove(updateFunction))
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void callOnCompositingRunLoop(std::function<void()> function)
</del><ins>+ void callOnCompositingRunLoop(std::function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> if (&m_runLoop == &RunLoop::current()) {
</span><span class="cx"> function();
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> void ThreadedCompositor::setNeedsDisplay()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([=] {
</del><ins>+ callOnCompositingThread([protector] {
</ins><span class="cx"> protector->scheduleDisplayImmediately();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -138,7 +138,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([=] {
</del><ins>+ callOnCompositingThread([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">@@ -147,24 +147,24 @@
</span><span class="cx"> void ThreadedCompositor::setDeviceScaleFactor(float scale)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([=] {
</del><ins>+ callOnCompositingThread([protector, scale] {
</ins><span class="cx"> protector->m_deviceScaleFactor = scale;
</span><span class="cx"> protector->scheduleDisplayImmediately();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::didChangeViewportSize(const IntSize& newSize)
</del><ins>+void ThreadedCompositor::didChangeViewportSize(const IntSize& size)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([=] {
- protector->viewportController()->didChangeViewportSize(newSize);
</del><ins>+ callOnCompositingThread([protector, size] {
+ protector->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><span class="cx"> RefPtr<ThreadedCompositor> protector(this);
</span><del>- callOnCompositingThread([=] {
</del><ins>+ callOnCompositingThread([protector, attr] {
</ins><span class="cx"> protector->viewportController()->didChangeViewportAttribute(attr);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -172,7 +172,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([=] {
</del><ins>+ callOnCompositingThread([protector, size] {
</ins><span class="cx"> protector->viewportController()->didChangeContentsSize(size);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -180,7 +180,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([=] {
</del><ins>+ callOnCompositingThread([protector, position] {
</ins><span class="cx"> protector->viewportController()->scrollTo(position);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -188,7 +188,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([=] {
</del><ins>+ callOnCompositingThread([protector, delta] {
</ins><span class="cx"> protector->viewportController()->scrollBy(delta);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -250,10 +250,11 @@
</span><span class="cx">
</span><span class="cx"> void ThreadedCompositor::didChangeVisibleRect()
</span><span class="cx"> {
</span><ins>+ RefPtr<ThreadedCompositor> protector(this);
</ins><span class="cx"> FloatRect visibleRect = viewportController()->visibleContentsRect();
</span><span class="cx"> float scale = viewportController()->pageScaleFactor();
</span><del>- RunLoop::main().dispatch([=] {
- m_client->setVisibleContentsRect(visibleRect, FloatPoint::zero(), scale);
</del><ins>+ RunLoop::main().dispatch([protector, visibleRect, scale] {
+ protector->m_client->setVisibleContentsRect(visibleRect, FloatPoint::zero(), scale);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> scheduleDisplayImmediately();
</span><span class="lines">@@ -289,7 +290,7 @@
</span><span class="cx"> setNeedsDisplay();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedCompositor::callOnCompositingThread(std::function<void()> function)
</del><ins>+void ThreadedCompositor::callOnCompositingThread(std::function<void()>&& function)
</ins><span class="cx"> {
</span><span class="cx"> m_compositingRunLoop->callOnCompositingRunLoop(WTFMove(function));
</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 (198524 => 198525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-03-22 09:38:12 UTC (rev 198524)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2016-03-22 09:44:47 UTC (rev 198525)
</span><span class="lines">@@ -94,7 +94,7 @@
</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><ins>+ void callOnCompositingThread(std::function<void()>&&);
</ins><span class="cx"> void createCompositingThread();
</span><span class="cx"> void runCompositingThread();
</span><span class="cx"> void terminateCompositingThread();
</span></span></pre>
</div>
</div>
</body>
</html>