<!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>[170269] 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/170269">170269</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-22 11:21:49 -0700 (Sun, 22 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace a couple of uses of bind with lambdas
https://bugs.webkit.org/show_bug.cgi?id=134172
Reviewed by Sam Weinig.
* Platform/IPC/Connection.cpp:
(IPC::Connection::postConnectionDidCloseOnConnectionWorkQueue):
(IPC::Connection::connectionDidClose):
(IPC::Connection::dispatchMessage):
(IPC::Connection::dispatchConnectionDidClose): Deleted.
* Platform/IPC/Connection.h:
* Shared/Plugins/NPObjectProxy.cpp:
(WebKit::NPObjectProxy::NP_Deallocate):
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::scheduleDatabaseUpdate):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::pluginThreadAsyncCall):
(WebKit::NetscapePlugin::handlePluginThreadAsyncCall): Deleted.
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::forceRepaintAsync):
(WebKit::TiledCoreAnimationDrawingArea::dispatchAfterEnsuringUpdatedScrollPosition):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNPObjectProxycpp">trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-06-22 Anders Carlsson <andersca@apple.com>
+
+ Replace a couple of uses of bind with lambdas
+ https://bugs.webkit.org/show_bug.cgi?id=134172
+
+ Reviewed by Sam Weinig.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::postConnectionDidCloseOnConnectionWorkQueue):
+ (IPC::Connection::connectionDidClose):
+ (IPC::Connection::dispatchMessage):
+ (IPC::Connection::dispatchConnectionDidClose): Deleted.
+ * Platform/IPC/Connection.h:
+ * Shared/Plugins/NPObjectProxy.cpp:
+ (WebKit::NPObjectProxy::NP_Deallocate):
+ * UIProcess/Storage/LocalStorageDatabase.cpp:
+ (WebKit::LocalStorageDatabase::scheduleDatabaseUpdate):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::pluginThreadAsyncCall):
+ (WebKit::NetscapePlugin::handlePluginThreadAsyncCall): Deleted.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::forceRepaintAsync):
+ (WebKit::TiledCoreAnimationDrawingArea::dispatchAfterEnsuringUpdatedScrollPosition):
+
</ins><span class="cx"> 2014-06-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Have scrollingTreeAsText() dump the non-fast-scrollable region
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -677,7 +677,10 @@
</span><span class="cx">
</span><span class="cx"> void Connection::postConnectionDidCloseOnConnectionWorkQueue()
</span><span class="cx"> {
</span><del>- m_connectionQueue->dispatch(WTF::bind(&Connection::connectionDidClose, this));
</del><ins>+ RefPtr<Connection> connection(this);
+ m_connectionQueue->dispatch([connection] {
+ connection->connectionDidClose();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Connection::connectionDidClose()
</span><span class="lines">@@ -708,23 +711,21 @@
</span><span class="cx"> if (m_didCloseOnConnectionWorkQueueCallback)
</span><span class="cx"> m_didCloseOnConnectionWorkQueueCallback(this);
</span><span class="cx">
</span><del>- m_clientRunLoop.dispatch(WTF::bind(&Connection::dispatchConnectionDidClose, this));
-}
</del><ins>+ RefPtr<Connection> connection(this);
+ m_clientRunLoop.dispatch([connection] {
+ // If the connection has been explicitly invalidated before dispatchConnectionDidClose was called,
+ // then the client will be null here.
+ if (!connection->m_client)
+ return;
</ins><span class="cx">
</span><del>-void Connection::dispatchConnectionDidClose()
-{
- // If the connection has been explicitly invalidated before dispatchConnectionDidClose was called,
- // then the client will be null here.
- if (!m_client)
- return;
</del><ins>+ // Because we define a connection as being "valid" based on wheter it has a null client, we null out
+ // the client before calling didClose here. Otherwise, sendSync will try to send a message to the connection and
+ // will then wait indefinitely for a reply.
+ Client* client = connection->m_client;
+ connection->m_client = nullptr;
</ins><span class="cx">
</span><del>- // Because we define a connection as being "valid" based on wheter it has a null client, we null out
- // the client before calling didClose here. Otherwise, sendSync will try to send a message to the connection and
- // will then wait indefinitely for a reply.
- Client* client = m_client;
- m_client = 0;
-
- client->didClose(this);
</del><ins>+ client->didClose(connection.get());
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Connection::canSendOutgoingMessages() const
</span><span class="lines">@@ -810,8 +811,6 @@
</span><span class="cx">
</span><span class="cx"> void Connection::dispatchMessage(std::unique_ptr<MessageDecoder> message)
</span><span class="cx"> {
</span><del>- // If there's no client, return. We do this after calling releaseArguments so that
- // the ArgumentDecoder message will be freed.
</del><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -217,7 +217,6 @@
</span><span class="cx"> void connectionDidClose();
</span><span class="cx">
</span><span class="cx"> // Called on the listener thread.
</span><del>- void dispatchConnectionDidClose();
</del><span class="cx"> void dispatchOneMessage();
</span><span class="cx"> void dispatchMessage(std::unique_ptr<MessageDecoder>);
</span><span class="cx"> void dispatchMessage(MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNPObjectProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -303,7 +303,9 @@
</span><span class="cx"> // that is known to be misused during plugin teardown, and to not be concerned about change in behavior if this
</span><span class="cx"> // occured at any other time.
</span><span class="cx"> if (!isMainThread()) {
</span><del>- RunLoop::main().dispatch(bind(&NPObjectProxy::NP_Deallocate, npObject));
</del><ins>+ RunLoop::main().dispatch([npObject] {
+ NP_Deallocate(npObject);
+ });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -241,7 +241,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_didScheduleDatabaseUpdate = true;
</span><del>- m_queue->dispatchAfter(databaseUpdateInterval, bind(&LocalStorageDatabase::updateDatabase, this));
</del><ins>+
+ RefPtr<LocalStorageDatabase> localStorageDatabase(this);
+ m_queue->dispatchAfter(databaseUpdateInterval, [localStorageDatabase] {
+ localStorageDatabase->updateDatabase();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LocalStorageDatabase::updateDatabase()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -304,15 +304,13 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::pluginThreadAsyncCall(void (*function)(void*), void* userData)
</span><span class="cx"> {
</span><del>- RunLoop::main().dispatch(WTF::bind(&NetscapePlugin::handlePluginThreadAsyncCall, this, function, userData));
-}
-
-void NetscapePlugin::handlePluginThreadAsyncCall(void (*function)(void*), void* userData)
-{
- if (!m_isStarted)
- return;
</del><ins>+ RefPtr<NetscapePlugin> plugin(this);
+ RunLoop::main().dispatch([plugin, function, userData] {
+ if (!plugin->m_isStarted)
+ return;
</ins><span class="cx">
</span><del>- function(userData);
</del><ins>+ function(userData);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetscapePlugin::Timer::Timer(NetscapePlugin* netscapePlugin, unsigned timerID, unsigned interval, bool repeat, TimerFunc timerFunc)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -120,9 +120,6 @@
</span><span class="cx">
</span><span class="cx"> void pluginThreadAsyncCall(void (*function)(void*), void* userData);
</span><span class="cx">
</span><del>- // Called on the plug-in run loop (which is currently the main thread run loop).
- void handlePluginThreadAsyncCall(void (*function)(void*), void* userData);
-
</del><span class="cx"> unsigned scheduleTimer(unsigned interval, bool repeat, void (*timerFunc)(NPP, unsigned timerID));
</span><span class="cx"> void unscheduleTimer(unsigned timerID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (170268 => 170269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-22 18:09:36 UTC (rev 170268)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-06-22 18:21:49 UTC (rev 170269)
</span><span class="lines">@@ -144,10 +144,10 @@
</span><span class="cx"> if (m_layerTreeStateIsFrozen)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- dispatchAfterEnsuringUpdatedScrollPosition(bind(^{
</del><ins>+ dispatchAfterEnsuringUpdatedScrollPosition([this, callbackID] {
</ins><span class="cx"> m_webPage->drawingArea()->forceRepaint();
</span><span class="cx"> m_webPage->send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> // (The web page is already kept alive by dispatchAfterEnsuringUpdatedScrollPosition).
</span><span class="cx"> WebPage* webPage = m_webPage;
</span><span class="cx">
</span><del>- ScrollingThread::dispatchBarrier(bind(^{
</del><ins>+ ScrollingThread::dispatchBarrier([this, webPage, function] {
</ins><span class="cx"> DrawingArea* drawingArea = webPage->drawingArea();
</span><span class="cx"> if (!drawingArea)
</span><span class="cx"> return;
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> m_layerFlushScheduler.resume();
</span><span class="cx">
</span><span class="cx"> webPage->deref();
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> #else
</span><span class="cx"> function();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>