<!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>[163972] trunk/Source</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/163972">163972</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-02-12 12:32:46 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CoordinatedGraphics] Move CoordinatedGraphicsScene, CoordinatedLayerTreeHostProxy to std::function
https://bugs.webkit.org/show_bug.cgi?id=128473
Reviewed by Anders Carlsson.
Source/WebCore:
Move the CoordinatedGraphicsScene class to using std::function instead of WTF::Functional and std::bind
instead of WTF::bind. The function wrapper is now moved through function calls and not passed by reference,
and lambda functions are inlined into the dispatchOnMainThread() calls, with the CoordinatedGraphicsScene
refcount-protected.
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
(WebCore::CoordinatedGraphicsScene::dispatchOnMainThread):
(WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext):
(WebCore::CoordinatedGraphicsScene::commitSceneState):
(WebCore::CoordinatedGraphicsScene::syncRemoteContent):
(WebCore::CoordinatedGraphicsScene::purgeGLResources):
(WebCore::CoordinatedGraphicsScene::commitScrollOffset):
(WebCore::CoordinatedGraphicsScene::appendUpdate):
(WebCore::CoordinatedGraphicsScene::setActive):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
Source/WebKit2:
Move the CoordinatedLayerTreeHostProxy class to using std::function instead of WTF::Functional. C++11
lambdas are used to construct the update functions, with the CoordinatedGraphicsScene refcount-protected
throughout the lifetime of the function wrapper.
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::dispatchUpdate):
(WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
(WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
(WebKit::CoordinatedLayerTreeHostProxy::setBackgroundColor):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsSceneh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [CoordinatedGraphics] Move CoordinatedGraphicsScene, CoordinatedLayerTreeHostProxy to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=128473
+
+ Reviewed by Anders Carlsson.
+
+
+ Move the CoordinatedGraphicsScene class to using std::function instead of WTF::Functional and std::bind
+ instead of WTF::bind. The function wrapper is now moved through function calls and not passed by reference,
+ and lambda functions are inlined into the dispatchOnMainThread() calls, with the CoordinatedGraphicsScene
+ refcount-protected.
+
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+ (WebCore::CoordinatedGraphicsScene::dispatchOnMainThread):
+ (WebCore::CoordinatedGraphicsScene::paintToCurrentGLContext):
+ (WebCore::CoordinatedGraphicsScene::commitSceneState):
+ (WebCore::CoordinatedGraphicsScene::syncRemoteContent):
+ (WebCore::CoordinatedGraphicsScene::purgeGLResources):
+ (WebCore::CoordinatedGraphicsScene::commitScrollOffset):
+ (WebCore::CoordinatedGraphicsScene::appendUpdate):
+ (WebCore::CoordinatedGraphicsScene::setActive):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
+
</ins><span class="cx"> 2014-02-12 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup the code added for https://bugs.webkit.org/show_bug.cgi?id=128125.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -34,12 +34,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::dispatchOnMainThread(const 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="cx"> else
</span><del>- callOnMainThread(function);
</del><ins>+ callOnMainThread(std::move(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool layerShouldHaveBackingStore(TextureMapperLayer* layer)
</span><span class="lines">@@ -98,8 +98,12 @@
</span><span class="cx"> m_textureMapper->endClip();
</span><span class="cx"> m_textureMapper->endPainting();
</span><span class="cx">
</span><del>- if (currentRootLayer->descendantsOrSelfHaveRunningAnimations())
- dispatchOnMainThread(bind(&CoordinatedGraphicsScene::updateViewport, this));
</del><ins>+ if (currentRootLayer->descendantsOrSelfHaveRunningAnimations()) {
+ RefPtr<CoordinatedGraphicsScene> protector(this);
+ dispatchOnMainThread([=] {
+ protector->updateViewport();
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::paintToGraphicsContext(PlatformGraphicsContext* platformContext)
</span><span class="lines">@@ -576,7 +580,10 @@
</span><span class="cx"> removeReleasedImageBackingsIfNeeded();
</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><del>- dispatchOnMainThread(bind(&CoordinatedGraphicsScene::renderNextFrame, this));
</del><ins>+ RefPtr<CoordinatedGraphicsScene> protector(this);
+ dispatchOnMainThread([=] {
+ protector->renderNextFrame();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::renderNextFrame()
</span><span class="lines">@@ -607,16 +614,16 @@
</span><span class="cx"> // We enqueue messages and execute them during paint, as they require an active GL context.
</span><span class="cx"> ensureRootLayer();
</span><span class="cx">
</span><del>- Vector<Function<void()> > renderQueue;
</del><ins>+ Vector<std::function<void()>> renderQueue;
</ins><span class="cx"> bool calledOnMainThread = WTF::isMainThread();
</span><span class="cx"> if (!calledOnMainThread)
</span><span class="cx"> m_renderQueueMutex.lock();
</span><del>- renderQueue.swap(m_renderQueue);
</del><ins>+ renderQueue = std::move(m_renderQueue);
</ins><span class="cx"> if (!calledOnMainThread)
</span><span class="cx"> m_renderQueueMutex.unlock();
</span><span class="cx">
</span><del>- for (size_t i = 0; i < renderQueue.size(); ++i)
- renderQueue[i]();
</del><ins>+ for (auto& function : renderQueue)
+ function();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::purgeGLResources()
</span><span class="lines">@@ -637,7 +644,11 @@
</span><span class="cx"> m_backingStoresWithPendingBuffers.clear();
</span><span class="cx">
</span><span class="cx"> setActive(false);
</span><del>- dispatchOnMainThread(bind(&CoordinatedGraphicsScene::purgeBackingStores, this));
</del><ins>+
+ RefPtr<CoordinatedGraphicsScene> protector(this);
+ dispatchOnMainThread([=] {
+ protector->purgeBackingStores();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::dispatchCommitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="lines">@@ -647,7 +658,10 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span><span class="cx"> {
</span><del>- dispatchOnMainThread(bind(&CoordinatedGraphicsScene::dispatchCommitScrollOffset, this, layerID, offset));
</del><ins>+ RefPtr<CoordinatedGraphicsScene> protector(this);
+ dispatchOnMainThread([=] {
+ protector->dispatchCommitScrollOffset(layerID, offset);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::purgeBackingStores()
</span><span class="lines">@@ -671,14 +685,14 @@
</span><span class="cx"> m_client = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsScene::appendUpdate(const 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="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> MutexLocker locker(m_renderQueueMutex);
</span><del>- m_renderQueue.append(function);
</del><ins>+ m_renderQueue.append(std::move(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::setActive(bool active)
</span><span class="lines">@@ -691,8 +705,12 @@
</span><span class="cx"> // and cannot be applied to the newly created instance.
</span><span class="cx"> m_renderQueue.clear();
</span><span class="cx"> m_isActive = active;
</span><del>- if (m_isActive)
- dispatchOnMainThread(bind(&CoordinatedGraphicsScene::renderNextFrame, this));
</del><ins>+ if (m_isActive) {
+ RefPtr<CoordinatedGraphicsScene> protector(this);
+ dispatchOnMainThread([=] {
+ protector->renderNextFrame();
+ });
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::setBackgroundColor(const Color& color)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "TextureMapperFPSCounter.h"
</span><span class="cx"> #include "TextureMapperLayer.h"
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/Functional.h>
</del><ins>+#include <functional>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> void paintToGraphicsContext(PlatformGraphicsContext*);
</span><span class="cx"> void setScrollPosition(const FloatPoint&);
</span><span class="cx"> void detach();
</span><del>- void appendUpdate(const 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">@@ -125,7 +125,7 @@
</span><span class="cx"> void syncRemoteContent();
</span><span class="cx"> void adjustPositionForFixedLayers();
</span><span class="cx">
</span><del>- void dispatchOnMainThread(const Function<void()>&);
</del><ins>+ void dispatchOnMainThread(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">@@ -146,7 +146,7 @@
</span><span class="cx"> void dispatchCommitScrollOffset(uint32_t layerID, const IntSize& offset);
</span><span class="cx">
</span><span class="cx"> // Render queue can be accessed ony from main thread or updatePaintNode call stack!
</span><del>- Vector<Function<void()> > m_renderQueue;
</del><ins>+ Vector<std::function<void()>> m_renderQueue;
</ins><span class="cx"> Mutex m_renderQueueMutex;
</span><span class="cx">
</span><span class="cx"> OwnPtr<TextureMapper> m_textureMapper;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [CoordinatedGraphics] Move CoordinatedGraphicsScene, CoordinatedLayerTreeHostProxy to std::function
+ https://bugs.webkit.org/show_bug.cgi?id=128473
+
+ Reviewed by Anders Carlsson.
+
+ Move the CoordinatedLayerTreeHostProxy class to using std::function instead of WTF::Functional. C++11
+ lambdas are used to construct the update functions, with the CoordinatedGraphicsScene refcount-protected
+ throughout the lifetime of the function wrapper.
+
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+ (WebKit::CoordinatedLayerTreeHostProxy::dispatchUpdate):
+ (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
+ (WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
+ (WebKit::CoordinatedLayerTreeHostProxy::setBackgroundColor):
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h:
+
</ins><span class="cx"> 2014-02-12 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) in WebKit2/{Database,Network}Process except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -52,14 +52,18 @@
</span><span class="cx"> m_drawingAreaProxy->updateViewport();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHostProxy::dispatchUpdate(const Function<void()>& function)
</del><ins>+void CoordinatedLayerTreeHostProxy::dispatchUpdate(std::function<void()> function)
</ins><span class="cx"> {
</span><del>- m_scene->appendUpdate(function);
</del><ins>+ m_scene->appendUpdate(std::move(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState(const CoordinatedGraphicsState& graphicsState)
</span><span class="cx"> {
</span><del>- dispatchUpdate(bind(&CoordinatedGraphicsScene::commitSceneState, m_scene.get(), graphicsState));
</del><ins>+ RefPtr<CoordinatedGraphicsScene> sceneProtector(m_scene);
+ dispatchUpdate([=] {
+ sceneProtector->commitSceneState(graphicsState);
+ });
+
</ins><span class="cx"> updateViewport();
</span><span class="cx"> #if USE(TILED_BACKING_STORE)
</span><span class="cx"> m_drawingAreaProxy->page()->didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
</span><span class="lines">@@ -69,7 +73,11 @@
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::setVisibleContentsRect(const FloatRect& rect, const FloatPoint& trajectoryVector)
</span><span class="cx"> {
</span><span class="cx"> // Inform the renderer to adjust viewport-fixed layers.
</span><del>- dispatchUpdate(bind(&CoordinatedGraphicsScene::setScrollPosition, m_scene.get(), rect.location()));
</del><ins>+ RefPtr<CoordinatedGraphicsScene> sceneProtector(m_scene);
+ const FloatPoint& scrollPosition = rect.location();
+ dispatchUpdate([=] {
+ sceneProtector->setScrollPosition(scrollPosition);
+ });
</ins><span class="cx">
</span><span class="cx"> if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector)
</span><span class="cx"> return;
</span><span class="lines">@@ -91,7 +99,10 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color)
</span><span class="cx"> {
</span><del>- dispatchUpdate(bind(&CoordinatedGraphicsScene::setBackgroundColor, m_scene.get(), color));
</del><ins>+ RefPtr<CoordinatedGraphicsScene> sceneProtector(m_scene);
+ dispatchUpdate([=] {
+ sceneProtector->setBackgroundColor(color);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedLayerTreeHostProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h (163971 => 163972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2014-02-12 20:29:33 UTC (rev 163971)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.h 2014-02-12 20:32:46 UTC (rev 163972)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "CoordinatedGraphicsArgumentCoders.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include <WebCore/CoordinatedGraphicsScene.h>
</span><del>-#include <wtf/Functional.h>
</del><ins>+#include <functional>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class CoordinatedGraphicsState;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> virtual void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void dispatchUpdate(const Function<void()>&);
</del><ins>+ void dispatchUpdate(std::function<void()>);
</ins><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span></span></pre>
</div>
</div>
</body>
</html>