<!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>[172901] trunk/Source/WebCore</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/172901">172901</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-24 23:04:03 -0700 (Sun, 24 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move WebCore storage code to C++11 lambdas, std::function
https://bugs.webkit.org/show_bug.cgi?id=126435
Reviewed by Darin Adler.
Use C++11 lambdas instead of WTF::bind and std::function<void ()>
instead of WTF::Function<void ()> in StorageAreaSync, StorageSyncManager,
StorageThread and StorageTracker classes.
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::StorageAreaSync):
(WebCore::StorageAreaSync::scheduleFinalSync):
(WebCore::StorageAreaSync::syncTimerFired):
* storage/StorageSyncManager.cpp:
(WebCore::StorageSyncManager::dispatch):
* storage/StorageSyncManager.h:
* storage/StorageThread.cpp:
(WebCore::StorageThread::dispatch):
(WebCore::StorageThread::terminate):
(WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads):
* storage/StorageThread.h:
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::importOriginIdentifiers):
(WebCore::StorageTracker::syncImportOriginIdentifiers):
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
(WebCore::StorageTracker::setOriginDetails):
(WebCore::StorageTracker::deleteAllOrigins):
(WebCore::StorageTracker::deleteOrigin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynccpp">trunk/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageSyncManagercpp">trunk/Source/WebCore/storage/StorageSyncManager.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageSyncManagerh">trunk/Source/WebCore/storage/StorageSyncManager.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageThreadcpp">trunk/Source/WebCore/storage/StorageThread.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageThreadh">trunk/Source/WebCore/storage/StorageThread.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackercpp">trunk/Source/WebCore/storage/StorageTracker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/ChangeLog 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-08-24 Zan Dobersek <zdobersek@igalia.com>
+
+ Move WebCore storage code to C++11 lambdas, std::function
+ https://bugs.webkit.org/show_bug.cgi?id=126435
+
+ Reviewed by Darin Adler.
+
+ Use C++11 lambdas instead of WTF::bind and std::function<void ()>
+ instead of WTF::Function<void ()> in StorageAreaSync, StorageSyncManager,
+ StorageThread and StorageTracker classes.
+
+ * storage/StorageAreaSync.cpp:
+ (WebCore::StorageAreaSync::StorageAreaSync):
+ (WebCore::StorageAreaSync::scheduleFinalSync):
+ (WebCore::StorageAreaSync::syncTimerFired):
+ * storage/StorageSyncManager.cpp:
+ (WebCore::StorageSyncManager::dispatch):
+ * storage/StorageSyncManager.h:
+ * storage/StorageThread.cpp:
+ (WebCore::StorageThread::dispatch):
+ (WebCore::StorageThread::terminate):
+ (WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads):
+ * storage/StorageThread.h:
+ * storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::importOriginIdentifiers):
+ (WebCore::StorageTracker::syncImportOriginIdentifiers):
+ (WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
+ (WebCore::StorageTracker::setOriginDetails):
+ (WebCore::StorageTracker::deleteAllOrigins):
+ (WebCore::StorageTracker::deleteOrigin):
+
</ins><span class="cx"> 2014-08-24 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT(extractable()) when storing a non-extractable key in IndexedDB
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "StorageSyncManager.h"
</span><span class="cx"> #include "StorageTracker.h"
</span><span class="cx"> #include "SuddenTermination.h"
</span><del>-#include <wtf/Functional.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -72,7 +71,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: If it can't import, then the default WebKit behavior should be that of private browsing,
</span><span class="cx"> // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
</span><del>- m_syncManager->dispatch(bind(&StorageAreaSync::performImport, this));
</del><ins>+ RefPtr<StorageAreaSync> protector(this);
+ m_syncManager->dispatch([protector] {
+ protector->performImport();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageAreaSync> StorageAreaSync::create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
</span><span class="lines">@@ -108,7 +110,10 @@
</span><span class="cx"> m_finalSyncScheduled = true;
</span><span class="cx"> syncTimerFired(&m_syncTimer);
</span><span class="cx">
</span><del>- m_syncManager->dispatch(bind(&StorageAreaSync::deleteEmptyDatabase, this));
</del><ins>+ RefPtr<StorageAreaSync> protector(this);
+ m_syncManager->dispatch([protector] {
+ protector->deleteEmptyDatabase();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageAreaSync::scheduleItemForSync(const String& key, const String& value)
</span><span class="lines">@@ -210,7 +215,10 @@
</span><span class="cx"> // performSync function.
</span><span class="cx"> disableSuddenTermination();
</span><span class="cx">
</span><del>- m_syncManager->dispatch(bind(&StorageAreaSync::performSync, this));
</del><ins>+ RefPtr<StorageAreaSync> protector(this);
+ m_syncManager->dispatch([protector] {
+ protector->performSync();
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageSyncManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageSyncManager.cpp 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageSyncManager.cpp 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return pathByAppendingComponent(m_path, databaseIdentifier + ".localstorage");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageSyncManager::dispatch(const Function<void ()>& function)
</del><ins>+void StorageSyncManager::dispatch(const std::function<void ()>& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_thread);
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageSyncManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageSyncManager.h (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageSyncManager.h 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageSyncManager.h 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef StorageSyncManager_h
</span><span class="cx"> #define StorageSyncManager_h
</span><span class="cx">
</span><ins>+#include <functional>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> static PassRefPtr<StorageSyncManager> create(const String& path);
</span><span class="cx"> ~StorageSyncManager();
</span><span class="cx">
</span><del>- void dispatch(const Function<void ()>&);
</del><ins>+ void dispatch(const std::function<void ()>&);
</ins><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageThread.cpp (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageThread.cpp 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageThread.cpp 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -76,11 +76,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageThread::dispatch(const Function<void ()>& function)
</del><ins>+void StorageThread::dispatch(const std::function<void ()>& function)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(!m_queue.killed() && m_threadID);
</span><del>- m_queue.append(std::make_unique<Function<void ()>>(function));
</del><ins>+ m_queue.append(std::make_unique<std::function<void ()>>(function));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageThread::terminate()
</span><span class="lines">@@ -92,7 +92,9 @@
</span><span class="cx"> if (!m_threadID)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_queue.append(std::make_unique<Function<void ()>>(bind(&StorageThread::performTerminate, this)));
</del><ins>+ m_queue.append(std::make_unique<std::function<void ()>>([this] {
+ performTerminate();
+ }));
</ins><span class="cx"> waitForThreadCompletion(m_threadID);
</span><span class="cx"> ASSERT(m_queue.killed());
</span><span class="cx"> m_threadID = 0;
</span><span class="lines">@@ -109,7 +111,7 @@
</span><span class="cx"> HashSet<StorageThread*>& threads = activeStorageThreads();
</span><span class="cx">
</span><span class="cx"> for (HashSet<StorageThread*>::iterator it = threads.begin(), end = threads.end(); it != end; ++it)
</span><del>- (*it)->dispatch(bind(WTF::releaseFastMallocFreeMemory));
</del><ins>+ (*it)->dispatch(WTF::releaseFastMallocFreeMemory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageThread.h (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageThread.h 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageThread.h 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef StorageThread_h
</span><span class="cx"> #define StorageThread_h
</span><span class="cx">
</span><del>-#include <wtf/Functional.h>
</del><ins>+#include <functional>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/MessageQueue.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> bool start();
</span><span class="cx"> void terminate();
</span><span class="cx">
</span><del>- void dispatch(const Function<void()>&);
</del><ins>+ void dispatch(const std::function<void ()>&);
</ins><span class="cx">
</span><span class="cx"> static void releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> void performTerminate();
</span><span class="cx">
</span><span class="cx"> ThreadIdentifier m_threadID;
</span><del>- MessageQueue<Function<void ()>> m_queue;
</del><ins>+ MessageQueue<std::function<void ()>> m_queue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (172900 => 172901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp 2014-08-25 04:06:35 UTC (rev 172900)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp 2014-08-25 06:04:03 UTC (rev 172901)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "StorageThread.h"
</span><span class="cx"> #include "StorageTrackerClient.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><del>-#include <wtf/Functional.h>
</del><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -170,7 +169,9 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_thread);
</span><span class="cx">
</span><del>- m_thread->dispatch(bind(&StorageTracker::syncImportOriginIdentifiers, this));
</del><ins>+ m_thread->dispatch([this] {
+ syncImportOriginIdentifiers();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::finishedImportingOriginIdentifiers()
</span><span class="lines">@@ -232,7 +233,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callOnMainThread(bind(&StorageTracker::finishedImportingOriginIdentifiers, this));
</del><ins>+ callOnMainThread([this] {
+ finishedImportingOriginIdentifiers();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::syncFileSystemAndTrackerDatabase()
</span><span class="lines">@@ -281,7 +284,10 @@
</span><span class="cx"> if (foundOrigins.contains(originIdentifier))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- callOnMainThread(bind(&StorageTracker::deleteOriginWithIdentifier, this, originIdentifier.isolatedCopy()));
</del><ins>+ String originIdentifierCopy = originIdentifier.isolatedCopy();
+ callOnMainThread([this, originIdentifierCopy] {
+ deleteOriginWithIdentifier(originIdentifierCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -299,14 +305,20 @@
</span><span class="cx"> m_originSet.add(originIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Function<void ()> function = bind(&StorageTracker::syncSetOriginDetails, this, originIdentifier.isolatedCopy(), databaseFile.isolatedCopy());
</del><ins>+ String originIdentifierCopy = originIdentifier.isolatedCopy();
+ String databaseFileCopy = databaseFile.isolatedCopy();
+ auto function = [this, originIdentifierCopy, databaseFileCopy] {
+ syncSetOriginDetails(originIdentifierCopy, databaseFileCopy);
+ };
</ins><span class="cx">
</span><span class="cx"> if (isMainThread()) {
</span><span class="cx"> ASSERT(m_thread);
</span><span class="cx"> m_thread->dispatch(function);
</span><span class="cx"> } else {
</span><span class="cx"> // FIXME: This weird ping-ponging was done to fix a deadlock. We should figure out a cleaner way to avoid it instead.
</span><del>- callOnMainThread(bind(&StorageThread::dispatch, m_thread.get(), function));
</del><ins>+ callOnMainThread([this, function] {
+ m_thread->dispatch(function);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -378,7 +390,9 @@
</span><span class="cx">
</span><span class="cx"> PageGroup::clearLocalStorageForAllOrigins();
</span><span class="cx">
</span><del>- m_thread->dispatch(bind(&StorageTracker::syncDeleteAllOrigins, this));
</del><ins>+ m_thread->dispatch([this] {
+ syncDeleteAllOrigins();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::syncDeleteAllOrigins()
</span><span class="lines">@@ -474,7 +488,10 @@
</span><span class="cx"> m_originSet.remove(originId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_thread->dispatch(bind(&StorageTracker::syncDeleteOrigin, this, originId.isolatedCopy()));
</del><ins>+ String originIdCopy = originId.isolatedCopy();
+ m_thread->dispatch([this, originIdCopy] {
+ syncDeleteOrigin(originIdCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageTracker::syncDeleteOrigin(const String& originIdentifier)
</span></span></pre>
</div>
</div>
</body>
</html>