<!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>[177425] 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/177425">177425</a></dd>

<dt>Author</dt> <dd>andersca@apple.com</dd>

<dt>Date</dt> <dd>2014-12-16 18:50:12 -0800 (Tue, 16 Dec 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Get rid of a couple of binds in WebKit2

https://bugs.webkit.org/show_bug.cgi?id=139717

Reviewed by Sam Weinig.

* DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::postDatabaseTask):

* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:

(WebKit::UniqueIDBDatabase::didShutdownBackingStore):

(WebKit::UniqueIDBDatabase::postMainThreadTask):

(WebKit::UniqueIDBDatabase::performNextMainThreadTask):

(WebKit::UniqueIDBDatabase::postDatabaseTask):

(WebKit::UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef): Deleted.

* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:

* Platform/IPC/mac/ConnectionMac.mm:

(IPC::Connection::initializeDeadNameSource):

* UIProcess/Launcher/ProcessLauncher.cpp:

(WebKit::processLauncherWorkQueue):

(WebKit::ProcessLauncher::ProcessLauncher):

* WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::unprotectPluginFromDestruction):

(WebKit::derefPluginView): Deleted.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>

<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>

<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>

<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>

<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/ChangeLog        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -1,3 +1,28 @@

</span><ins>+2014-12-16  Anders Carlsson  &lt;andersca@apple.com&gt;

+

+        Get rid of a couple of binds in WebKit2

+        https://bugs.webkit.org/show_bug.cgi?id=139717

+

+        Reviewed by Sam Weinig.

+

+        * DatabaseProcess/DatabaseProcess.cpp:

+        (WebKit::DatabaseProcess::postDatabaseTask):

+        * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:

+        (WebKit::UniqueIDBDatabase::didShutdownBackingStore):

+        (WebKit::UniqueIDBDatabase::postMainThreadTask):

+        (WebKit::UniqueIDBDatabase::performNextMainThreadTask):

+        (WebKit::UniqueIDBDatabase::postDatabaseTask):

+        (WebKit::UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef): Deleted.

+        * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:

+        * Platform/IPC/mac/ConnectionMac.mm:

+        (IPC::Connection::initializeDeadNameSource):

+        * UIProcess/Launcher/ProcessLauncher.cpp:

+        (WebKit::processLauncherWorkQueue):

+        (WebKit::ProcessLauncher::ProcessLauncher):

+        * WebProcess/Plugins/PluginView.cpp:

+        (WebKit::PluginView::unprotectPluginFromDestruction):

+        (WebKit::derefPluginView): Deleted.

+

</ins><span class="cx"> 2014-12-16  Andreas Kling  &lt;akling@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Use Ref for SecurityOrigin.

</span></span></pre></div>

<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -156,7 +156,9 @@

</span><span class="cx"> 

</span><span class="cx">     m_databaseTasks.append(WTF::move(task));

</span><span class="cx"> 

</span><del>-    m_queue-&gt;dispatch(bind(&amp;DatabaseProcess::performNextDatabaseTask, this));

</del><ins>+    m_queue-&gt;dispatch([this] {

+        performNextDatabaseTask();

+    });

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void DatabaseProcess::performNextDatabaseTask()

</span></span></pre></div>

<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -166,16 +166,16 @@

</span><span class="cx">     RefPtr&lt;UniqueIDBDatabase&gt; protector(adoptRef(this));

</span><span class="cx"> 

<span class="cx">     // Empty out remaining main thread tasks.

</span><del>-    while (performNextMainThreadTaskWithoutAdoptRef()) {

</del><ins>+    while (performNextMainThreadTask()) {

</ins><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // No more requests will be handled, so abort all outstanding requests.

</span><del>-    for (const auto&amp; it : m_pendingMetadataRequests)

-        it-&gt;requestAborted();

-    for (const auto&amp; it : m_pendingTransactionRequests)

-        it.value-&gt;requestAborted();

-    for (const auto&amp; it : m_pendingDatabaseTasks)

-        it.value-&gt;requestAborted();

</del><ins>+    for (const auto&amp; request : m_pendingMetadataRequests)

+        request-&gt;requestAborted();

+    for (const auto&amp; request : m_pendingTransactionRequests.values())

+        request-&gt;requestAborted();

+    for (const auto&amp; request : m_pendingDatabaseTasks.values())

+        request-&gt;requestAborted();

</ins><span class="cx"> 

</span><span class="cx">     m_pendingMetadataRequests.clear();

</span><span class="cx">     m_pendingTransactionRequests.clear();

</span><span class="lines">@@ -1148,23 +1148,16 @@

</span><span class="cx"> 

</span><span class="cx">     m_mainThreadTasks.append(WTF::move(task));

</span><span class="cx"> 

</span><del>-    // Balanced by an adoptRef() in ::performNextMainThreadTask

-    ref();

-    RunLoop::main().dispatch(bind(&amp;UniqueIDBDatabase::performNextMainThreadTask, this));

</del><ins>+    RefPtr&lt;UniqueIDBDatabase&gt; database(this);

+    RunLoop::main().dispatch([database] {

+        database-&gt;performNextMainThreadTask();

+    });

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-void UniqueIDBDatabase::performNextMainThreadTask()

</del><ins>+bool UniqueIDBDatabase::performNextMainThreadTask()

</ins><span class="cx"> {

</span><span class="cx">     ASSERT(RunLoop::isMain());

</span><span class="cx"> 

</span><del>-    // Balanced by a ref() in ::postMainThreadTask

-    RefPtr&lt;UniqueIDBDatabase&gt; protector(adoptRef(this));

-

-    performNextMainThreadTaskWithoutAdoptRef();

-}

-

-bool UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef()

-{

</del><span class="cx">     bool moreTasks;

</span><span class="cx"> 

</span><span class="cx">     std::unique_ptr&lt;AsyncTask&gt; task;

</span><span class="lines">@@ -1195,7 +1188,10 @@

</span><span class="cx"> 

</span><span class="cx">     m_databaseTasks.append(WTF::move(task));

</span><span class="cx"> 

</span><del>-    DatabaseProcess::shared().queue().dispatch(bind(&amp;UniqueIDBDatabase::performNextDatabaseTask, this));

</del><ins>+    RefPtr&lt;UniqueIDBDatabase&gt; database(this);

+    DatabaseProcess::shared().queue().dispatch([database] {

+        database-&gt;performNextDatabaseTask();

+    });

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void UniqueIDBDatabase::performNextDatabaseTask()

</span></span></pre></div>

<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -164,8 +164,7 @@

</span><span class="cx">     void shutdownBackingStore(UniqueIDBDatabaseShutdownType, const String&amp; databaseDirectory);

</span><span class="cx"> 

</span><span class="cx">     // Callbacks from the database workqueue thread, to be performed on the main thread only

</span><del>-    void performNextMainThreadTask();

-    bool performNextMainThreadTaskWithoutAdoptRef();

</del><ins>+    bool performNextMainThreadTask();

</ins><span class="cx">     void didOpenBackingStoreAndReadMetadata(const WebCore::IDBDatabaseMetadata&amp;, bool success);

</span><span class="cx">     void didCompleteTransactionOperation(const IDBIdentifier&amp; transactionIdentifier, bool success);

</span><span class="cx">     void didChangeDatabaseVersion(uint64_t requestID, bool success);

</span></span></pre></div>

<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -361,8 +361,12 @@

</span><span class="cx"> void Connection::initializeDeadNameSource()

</span><span class="cx"> {

</span><span class="cx">     m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue-&gt;dispatchQueue());

</span><del>-    dispatch_source_set_event_handler(m_deadNameSource, bind(&amp;Connection::connectionDidClose, this));

</del><span class="cx"> 

</span><ins>+    RefPtr&lt;Connection&gt; connection(this);

+    dispatch_source_set_event_handler(m_deadNameSource, [connection] {

+        connection-&gt;connectionDidClose();

+    });

+

</ins><span class="cx">     mach_port_t sendPort = m_sendPort;

</span><span class="cx">     dispatch_source_set_cancel_handler(m_deadNameSource, ^{

<span class="cx">         // Release our send right.

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -31,9 +31,9 @@

</span><span class="cx"> 

</span><span class="cx"> namespace WebKit {

</span><span class="cx"> 

</span><del>-static WorkQueue* processLauncherWorkQueue()

</del><ins>+static WorkQueue&amp; processLauncherWorkQueue()

</ins><span class="cx"> {

</span><del>-    static WorkQueue* processLauncherWorkQueue = WorkQueue::create(&quot;com.apple.WebKit.ProcessLauncher&quot;).leakRef();

</del><ins>+    static WorkQueue&amp; processLauncherWorkQueue = *WorkQueue::create(&quot;com.apple.WebKit.ProcessLauncher&quot;).leakRef();

</ins><span class="cx">     return processLauncherWorkQueue;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -42,9 +42,12 @@

</span><span class="cx">     , m_launchOptions(launchOptions)

</span><span class="cx">     , m_processIdentifier(0)

</span><span class="cx"> {

<del>-    // Launch the process.

</del><span class="cx">     m_isLaunching = true;

</span><del>-    processLauncherWorkQueue()-&gt;dispatch(bind(&amp;ProcessLauncher::launchProcess, this));

</del><ins>+

+    RefPtr&lt;ProcessLauncher&gt; processLauncher(this);

+    processLauncherWorkQueue().dispatch([processLauncher] {

+        processLauncher-&gt;launchProcess();

+    });

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void ProcessLauncher::didFinishLaunchingProcess(PlatformProcessIdentifier processIdentifier, IPC::Connection::Identifier identifier)

</span></span></pre></div>

<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (177424 => 177425)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp        2014-12-17 02:29:22 UTC (rev 177424)

+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp        2014-12-17 02:50:12 UTC (rev 177425)

</span><span class="lines">@@ -1616,11 +1616,6 @@

</span><span class="cx">         ref();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static void derefPluginView(PluginView* pluginView)

-{

-    pluginView-&gt;deref();

-}

-

</del><span class="cx"> void PluginView::unprotectPluginFromDestruction()

</span><span class="cx"> {

</span><span class="cx">     if (m_isBeingDestroyed)

</span><span class="lines">@@ -1631,10 +1626,14 @@

</span><span class="cx">     // for example, may crash if the plug-in is destroyed and we return to code for

</span><span class="cx">     // the destroyed object higher on the stack. To prevent this, if the plug-in has

<span class="cx">     // only one remaining reference, call deref() asynchronously.

</span><del>-    if (hasOneRef())

-        RunLoop::main().dispatch(bind(derefPluginView, this));

-    else

-        deref();

</del><ins>+    if (hasOneRef()) {

+        RunLoop::main().dispatch([this] {

+            deref();

+        });

+        return;

+    }

+

+    deref();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void PluginView::didFinishLoad(WebFrame* webFrame)

</span></span></pre>

</div>

</div>

</body>

</html>