<!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>[177426] 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/177426">177426</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 18:55:04 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix lambda and std::function formatting
https://bugs.webkit.org/show_bug.cgi?id=139719
Reviewed by Sam Weinig.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::getOrigins):
(WebKit::DatabaseProcess::deleteEntriesForOrigin):
(WebKit::DatabaseProcess::deleteEntriesModifiedBetweenDates):
(WebKit::DatabaseProcess::deleteAllEntries):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::deleteDatabase):
(WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
(WebKit::UniqueIDBDatabase::openTransaction):
(WebKit::UniqueIDBDatabase::beginTransaction):
(WebKit::UniqueIDBDatabase::commitTransaction):
(WebKit::UniqueIDBDatabase::resetTransaction):
(WebKit::UniqueIDBDatabase::rollbackTransaction):
(WebKit::UniqueIDBDatabase::postTransactionOperation):
(WebKit::UniqueIDBDatabase::changeDatabaseVersion):
(WebKit::UniqueIDBDatabase::createObjectStore):
(WebKit::UniqueIDBDatabase::deleteObjectStore):
(WebKit::UniqueIDBDatabase::clearObjectStore):
(WebKit::UniqueIDBDatabase::createIndex):
(WebKit::UniqueIDBDatabase::deleteIndex):
(WebKit::UniqueIDBDatabase::putRecord):
(WebKit::UniqueIDBDatabase::getRecord):
(WebKit::UniqueIDBDatabase::openCursor):
(WebKit::UniqueIDBDatabase::cursorAdvance):
(WebKit::UniqueIDBDatabase::cursorIterate):
(WebKit::UniqueIDBDatabase::count):
(WebKit::UniqueIDBDatabase::deleteRange):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
* NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
(WebKit::NetworkCacheStorage::store):
* Shared/AsyncTask.h:
(WebKit::AsyncTask::AsyncTask):
* Shared/ChildProcess.cpp:
(WebKit::didCloseOnConnectionWorkQueue):
* Shared/WebContextMenuItemData.cpp:
(WebKit::WebContextMenuItemData::WebContextMenuItemData):
* Shared/WebContextMenuItemData.h:
(WebKit::WebContextMenuItemData::selectionHandler):
* Shared/mac/SecItemShim.cpp:
(WebKit::responseMap):
* UIProcess/Plugins/PluginProcessManager.cpp:
(WebKit::PluginProcessManager::PluginProcessManager):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext):
(WebKit::m_processSuppressionDisabledForPageCounter):
* UIProcess/WebOriginDataManagerProxy.cpp:
(WebKit::CallbackSynchronizer::create):
(WebKit::CallbackSynchronizer::CallbackSynchronizer):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(-[WKSelectionHandlerWrapper initWithSelectionHandler:]):
(WebKit::nsMenuItemVector):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::deleteDatabase):
(WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
(WebKit::WebIDBServerConnection::openTransaction):
(WebKit::WebIDBServerConnection::beginTransaction):
(WebKit::WebIDBServerConnection::commitTransaction):
(WebKit::WebIDBServerConnection::resetTransaction):
(WebKit::WebIDBServerConnection::rollbackTransaction):
(WebKit::WebIDBServerConnection::setIndexKeys):
(WebKit::WebIDBServerConnection::createObjectStore):
(WebKit::WebIDBServerConnection::createIndex):
(WebKit::WebIDBServerConnection::deleteIndex):
(WebKit::WebIDBServerConnection::get):
(WebKit::WebIDBServerConnection::put):
(WebKit::WebIDBServerConnection::count):
(WebKit::WebIDBServerConnection::deleteRange):
(WebKit::WebIDBServerConnection::clearObjectStore):
(WebKit::WebIDBServerConnection::deleteObjectStore):
(WebKit::WebIDBServerConnection::changeDatabaseVersion):
(WebKit::WebIDBServerConnection::openCursor):
(WebKit::WebIDBServerConnection::cursorAdvance):
(WebKit::WebIDBServerConnection::cursorIterate):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
* WebProcess/OriginData/WebOriginDataManagerSupplement.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::getOrigins):
(WebKit::WebProcess::deleteEntriesForOrigin):
(WebKit::WebProcess::deleteEntriesModifiedBetweenDates):
(WebKit::WebProcess::deleteAllEntries):
* WebProcess/WebProcess.h:</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="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</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="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncTaskh">trunk/Source/WebKit2/Shared/AsyncTask.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcesscpp">trunk/Source/WebKit2/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemDatacpp">trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebContextMenuItemDatah">trunk/Source/WebKit2/Shared/WebContextMenuItemData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessOriginDataWebOriginDataManagerSupplementh">trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManagerSupplement.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -1,5 +1,97 @@
</span><span class="cx"> 2014-12-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Fix lambda and std::function formatting
+ https://bugs.webkit.org/show_bug.cgi?id=139719
+
+ Reviewed by Sam Weinig.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::getOrigins):
+ (WebKit::DatabaseProcess::deleteEntriesForOrigin):
+ (WebKit::DatabaseProcess::deleteEntriesModifiedBetweenDates):
+ (WebKit::DatabaseProcess::deleteAllEntries):
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::deleteDatabase):
+ (WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
+ (WebKit::UniqueIDBDatabase::openTransaction):
+ (WebKit::UniqueIDBDatabase::beginTransaction):
+ (WebKit::UniqueIDBDatabase::commitTransaction):
+ (WebKit::UniqueIDBDatabase::resetTransaction):
+ (WebKit::UniqueIDBDatabase::rollbackTransaction):
+ (WebKit::UniqueIDBDatabase::postTransactionOperation):
+ (WebKit::UniqueIDBDatabase::changeDatabaseVersion):
+ (WebKit::UniqueIDBDatabase::createObjectStore):
+ (WebKit::UniqueIDBDatabase::deleteObjectStore):
+ (WebKit::UniqueIDBDatabase::clearObjectStore):
+ (WebKit::UniqueIDBDatabase::createIndex):
+ (WebKit::UniqueIDBDatabase::deleteIndex):
+ (WebKit::UniqueIDBDatabase::putRecord):
+ (WebKit::UniqueIDBDatabase::getRecord):
+ (WebKit::UniqueIDBDatabase::openCursor):
+ (WebKit::UniqueIDBDatabase::cursorAdvance):
+ (WebKit::UniqueIDBDatabase::cursorIterate):
+ (WebKit::UniqueIDBDatabase::count):
+ (WebKit::UniqueIDBDatabase::deleteRange):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+ * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+ (WebKit::NetworkCacheStorage::store):
+ * Shared/AsyncTask.h:
+ (WebKit::AsyncTask::AsyncTask):
+ * Shared/ChildProcess.cpp:
+ (WebKit::didCloseOnConnectionWorkQueue):
+ * Shared/WebContextMenuItemData.cpp:
+ (WebKit::WebContextMenuItemData::WebContextMenuItemData):
+ * Shared/WebContextMenuItemData.h:
+ (WebKit::WebContextMenuItemData::selectionHandler):
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::responseMap):
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::PluginProcessManager):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::m_processSuppressionDisabledForPageCounter):
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::CallbackSynchronizer::create):
+ (WebKit::CallbackSynchronizer::CallbackSynchronizer):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (-[WKSelectionHandlerWrapper initWithSelectionHandler:]):
+ (WebKit::nsMenuItemVector):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::deleteDatabase):
+ (WebKit::WebIDBServerConnection::getOrEstablishIDBDatabaseMetadata):
+ (WebKit::WebIDBServerConnection::openTransaction):
+ (WebKit::WebIDBServerConnection::beginTransaction):
+ (WebKit::WebIDBServerConnection::commitTransaction):
+ (WebKit::WebIDBServerConnection::resetTransaction):
+ (WebKit::WebIDBServerConnection::rollbackTransaction):
+ (WebKit::WebIDBServerConnection::setIndexKeys):
+ (WebKit::WebIDBServerConnection::createObjectStore):
+ (WebKit::WebIDBServerConnection::createIndex):
+ (WebKit::WebIDBServerConnection::deleteIndex):
+ (WebKit::WebIDBServerConnection::get):
+ (WebKit::WebIDBServerConnection::put):
+ (WebKit::WebIDBServerConnection::count):
+ (WebKit::WebIDBServerConnection::deleteRange):
+ (WebKit::WebIDBServerConnection::clearObjectStore):
+ (WebKit::WebIDBServerConnection::deleteObjectStore):
+ (WebKit::WebIDBServerConnection::changeDatabaseVersion):
+ (WebKit::WebIDBServerConnection::openCursor):
+ (WebKit::WebIDBServerConnection::cursorAdvance):
+ (WebKit::WebIDBServerConnection::cursorIterate):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.h:
+ * WebProcess/OriginData/WebOriginDataManagerSupplement.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::getOrigins):
+ (WebKit::WebProcess::deleteEntriesForOrigin):
+ (WebKit::WebProcess::deleteEntriesModifiedBetweenDates):
+ (WebKit::WebProcess::deleteAllEntries):
+ * WebProcess/WebProcess.h:
+
+2014-12-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Get rid of a couple of binds in WebKit2
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139717
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> removeAllDatabasesForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::getOrigins(WKOriginDataTypes types, std::function<void(const Vector<SecurityOriginData>&)> completion)
</del><ins>+void DatabaseProcess::getOrigins(WKOriginDataTypes types, std::function<void (const Vector<SecurityOriginData>&)> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKWebSQLDatabaseOriginData)) {
</span><span class="cx"> completion(Vector<SecurityOriginData>());
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void()> completion)
</del><ins>+void DatabaseProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKWebSQLDatabaseOriginData)) {
</span><span class="cx"> completion();
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void()> completion)
</del><ins>+void DatabaseProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKWebSQLDatabaseOriginData)) {
</span><span class="cx"> completion();
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void()> completion)
</del><ins>+void DatabaseProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKWebSQLDatabaseOriginData)) {
</span><span class="cx"> completion();
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -93,10 +93,10 @@
</span><span class="cx"> void ensurePathExists(const String&);
</span><span class="cx">
</span><span class="cx"> // WebOriginDataManagerSupplement
</span><del>- virtual void getOrigins(WKOriginDataTypes, std::function<void(const Vector<SecurityOriginData>&)> completion) override;
- virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void()> completion) override;
- virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void()> completion) override;
- virtual void deleteAllEntries(WKOriginDataTypes, std::function<void()> completion) override;
</del><ins>+ virtual void getOrigins(WKOriginDataTypes, std::function<void (const Vector<SecurityOriginData>&)> completion) override;
+ virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void ()> completion) override;
+ virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void ()> completion) override;
+ virtual void deleteAllEntries(WKOriginDataTypes, std::function<void ()> completion) override;
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -187,13 +187,13 @@
</span><span class="cx"> m_pendingShutdownTask = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::deleteDatabase(std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::deleteDatabase(std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> // Someone else has already shutdown this database, so we can't request a delete.
</span><del>- callOnMainThread([successCallback]() {
</del><ins>+ callOnMainThread([successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx"> return;
</span><span class="lines">@@ -204,14 +204,14 @@
</span><span class="cx"> // If the shutdown just completed was a Delete shutdown then we succeeded.
</span><span class="cx"> // If not report failure instead of trying again.
</span><span class="cx"> successCallback(type == UniqueIDBDatabaseShutdownType::DeleteShutdown);
</span><del>- }, [this, protector, successCallback]() {
</del><ins>+ }, [this, protector, successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> shutdown(UniqueIDBDatabaseShutdownType::DeleteShutdown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
</del><ins>+void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void (bool, const IDBDatabaseMetadata&)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -235,9 +235,9 @@
</span><span class="cx"> bool shouldOpenBackingStore = m_pendingMetadataRequests.isEmpty();
</span><span class="cx">
</span><span class="cx"> // Then remember this metadata request to be answered later.
</span><del>- RefPtr<AsyncRequest> request = AsyncRequestImpl<>::create([completionCallback, this]() {
</del><ins>+ RefPtr<AsyncRequest> request = AsyncRequestImpl<>::create([completionCallback, this] {
</ins><span class="cx"> completionCallback(!!m_metadata, m_metadata ? *m_metadata : IDBDatabaseMetadata());
</span><del>- }, [completionCallback]() {
</del><ins>+ }, [completionCallback] {
</ins><span class="cx"> // The boolean flag to the completion callback represents whether the
</span><span class="cx"> // attempt to get/establish metadata succeeded or failed.
</span><span class="cx"> // Since we're aborting the attempt, it failed, so we always pass in false.
</span><span class="lines">@@ -282,32 +282,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::openTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::openTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(transactionIdentifier, createAsyncTask(*this, &UniqueIDBDatabase::openBackingStoreTransaction, transactionIdentifier, objectStoreIDs, mode), successCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::beginTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::beginTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(transactionIdentifier, createAsyncTask(*this, &UniqueIDBDatabase::beginBackingStoreTransaction, transactionIdentifier), successCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::commitTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::commitTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(transactionIdentifier, createAsyncTask(*this, &UniqueIDBDatabase::commitBackingStoreTransaction, transactionIdentifier), successCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::resetTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::resetTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(transactionIdentifier, createAsyncTask(*this, &UniqueIDBDatabase::resetBackingStoreTransaction, transactionIdentifier), successCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::rollbackTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::rollbackTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> postTransactionOperation(transactionIdentifier, createAsyncTask(*this, &UniqueIDBDatabase::rollbackBackingStoreTransaction, transactionIdentifier), successCallback);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask> task, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask> task, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<bool>::create([successCallback](bool success) {
</span><span class="cx"> successCallback(success);
</span><del>- }, [successCallback]() {
</del><ins>+ }, [successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> finalizeRollback(transactionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> if (!success)
</span><span class="cx"> m_metadata->version = oldVersion;
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, oldVersion, successCallback]() {
</del><ins>+ }, [this, oldVersion, successCallback] {
</ins><span class="cx"> m_metadata->version = oldVersion;
</span><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> request->completeRequest(success);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::createObjectStore(const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::createObjectStore(const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> if (!success)
</span><span class="cx"> m_metadata->objectStores.remove(addedObjectStoreID);
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, addedObjectStoreID, successCallback]() {
</del><ins>+ }, [this, addedObjectStoreID, successCallback] {
</ins><span class="cx"> m_metadata->objectStores.remove(addedObjectStoreID);
</span><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::createObjectStoreInBackingStore, requestID, transactionIdentifier, metadata));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx"> if (!success)
</span><span class="cx"> m_metadata->objectStores.set(metadata.id, metadata);
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, metadata, successCallback]() {
</del><ins>+ }, [this, metadata, successCallback] {
</ins><span class="cx"> m_metadata->objectStores.set(metadata.id, metadata);
</span><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::deleteObjectStoreInBackingStore, requestID, transactionIdentifier, objectStoreID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<bool>::create([this, successCallback](bool success) {
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, successCallback]() {
</del><ins>+ }, [this, successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::clearObjectStoreInBackingStore, requestID, transactionIdentifier, objectStoreID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBIndexMetadata& metadata, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBIndexMetadata& metadata, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> objectStoreFind->value.indexes.remove(addedIndexID);
</span><span class="cx"> }
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, objectStoreID, addedIndexID, successCallback]() {
</del><ins>+ }, [this, objectStoreID, addedIndexID, successCallback] {
</ins><span class="cx"> auto objectStoreFind = m_metadata->objectStores.find(objectStoreID);
</span><span class="cx"> if (objectStoreFind != m_metadata->objectStores.end())
</span><span class="cx"> objectStoreFind->value.indexes.remove(addedIndexID);
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::createIndexInBackingStore, requestID, transactionIdentifier, objectStoreID, metadata));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, std::function<void(bool)> successCallback)
</del><ins>+void UniqueIDBDatabase::deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, std::function<void (bool)> successCallback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> objectStoreFind->value.indexes.set(metadata.id, metadata);
</span><span class="cx"> }
</span><span class="cx"> successCallback(success);
</span><del>- }, [this, objectStoreID, metadata, successCallback]() {
</del><ins>+ }, [this, objectStoreID, metadata, successCallback] {
</ins><span class="cx"> auto objectStoreFind = m_metadata->objectStores.find(objectStoreID);
</span><span class="cx"> if (objectStoreFind != m_metadata->objectStores.end())
</span><span class="cx"> objectStoreFind->value.indexes.set(metadata.id, metadata);
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::deleteIndexInBackingStore, requestID, transactionIdentifier, objectStoreID, indexID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyData& keyData, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys, std::function<void(const IDBKeyData&, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyData& keyData, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys, std::function<void (const IDBKeyData&, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<const IDBKeyData&, uint32_t, const String&>::create([this, callback](const IDBKeyData& keyData, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(keyData, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(IDBKeyData(), INVALID_STATE_ERR, "Unable to put record into database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::putRecordInBackingStore, requestID, transactionIdentifier, m_metadata->objectStores.get(objectStoreID), keyData, value.vector(), putMode, indexIDs, indexKeys));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::getRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType, std::function<void(const IDBGetResult&, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::getRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType, std::function<void (const IDBGetResult&, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<const IDBGetResult&, uint32_t, const String&>::create([this, callback](const IDBGetResult& result, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(result, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(IDBGetResult(), INVALID_STATE_ERR, "Unable to get record from database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::getRecordFromBackingStore, requestID, transactionIdentifier, m_metadata->objectStores.get(objectStoreID), indexID, keyRangeData, cursorType));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRangeData, std::function<void(int64_t, const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRangeData, std::function<void (int64_t, const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<int64_t, const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&>::create([this, callback](int64_t cursorID, const IDBKeyData& key, const IDBKeyData& primaryKey, PassRefPtr<SharedBuffer> value, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(cursorID, key, primaryKey, value, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(0, nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to get record from database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::openCursorInBackingStore, requestID, transactionIdentifier, objectStoreID, indexID, cursorDirection, cursorType, taskType, keyRangeData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::cursorAdvance(const IDBIdentifier& cursorIdentifier, uint64_t count, std::function<void(const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::cursorAdvance(const IDBIdentifier& cursorIdentifier, uint64_t count, std::function<void (const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&>::create([this, callback](const IDBKeyData& key, const IDBKeyData& primaryKey, PassRefPtr<SharedBuffer> value, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(key, primaryKey, value, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to advance cursor in database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -647,7 +647,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::advanceCursorInBackingStore, requestID, cursorIdentifier, count));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::cursorIterate(const IDBIdentifier& cursorIdentifier, const IDBKeyData& key, std::function<void(const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::cursorIterate(const IDBIdentifier& cursorIdentifier, const IDBKeyData& key, std::function<void (const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&>::create([this, callback](const IDBKeyData& key, const IDBKeyData& primaryKey, PassRefPtr<SharedBuffer> value, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(key, primaryKey, value, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to iterate cursor in database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::iterateCursorInBackingStore, requestID, cursorIdentifier, key));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, std::function<void(int64_t, uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, std::function<void (int64_t, uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<int64_t, uint32_t, const String&>::create([this, callback](int64_t count, uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(count, errorCode, errorMessage);
</span><del>- }, [this, callback]() {
</del><ins>+ }, [this, callback] {
</ins><span class="cx"> callback(0, INVALID_STATE_ERR, "Unable to get count from database");
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::countInBackingStore, requestID, transactionIdentifier, objectStoreID, indexID, keyRangeData));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRangeData& keyRangeData, std::function<void(uint32_t, const String&)> callback)
</del><ins>+void UniqueIDBDatabase::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRangeData& keyRangeData, std::function<void (uint32_t, const String&)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = AsyncRequestImpl<uint32_t, const String&>::create([callback](uint32_t errorCode, const String& errorMessage) {
</span><span class="cx"> callback(errorCode, errorMessage);
</span><del>- }, [callback]() {
</del><ins>+ }, [callback] {
</ins><span class="cx"> callback(INVALID_STATE_ERR, "Unable to deleteRange from database");
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -76,32 +76,32 @@
</span><span class="cx"> void registerConnection(DatabaseProcessIDBConnection&);
</span><span class="cx"> void unregisterConnection(DatabaseProcessIDBConnection&);
</span><span class="cx">
</span><del>- void deleteDatabase(std::function<void(bool)> successCallback);
</del><ins>+ void deleteDatabase(std::function<void (bool)> successCallback);
</ins><span class="cx">
</span><del>- void getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const WebCore::IDBDatabaseMetadata&)> completionCallback);
</del><ins>+ void getOrEstablishIDBDatabaseMetadata(std::function<void (bool, const WebCore::IDBDatabaseMetadata&)> completionCallback);
</ins><span class="cx">
</span><del>- void openTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode, std::function<void(bool)> successCallback);
- void beginTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback);
- void commitTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback);
- void resetTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback);
- void rollbackTransaction(const IDBIdentifier& transactionIdentifier, std::function<void(bool)> successCallback);
</del><ins>+ void openTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode, std::function<void (bool)> successCallback);
+ void beginTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback);
+ void commitTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback);
+ void resetTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback);
+ void rollbackTransaction(const IDBIdentifier& transactionIdentifier, std::function<void (bool)> successCallback);
</ins><span class="cx">
</span><del>- void changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void(bool)> successCallback);
- void createObjectStore(const IDBIdentifier& transactionIdentifier, const WebCore::IDBObjectStoreMetadata&, std::function<void(bool)> successCallback);
- void deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback);
- void clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback);
- void createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBIndexMetadata&, std::function<void(bool)> successCallback);
- void deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, std::function<void(bool)> successCallback);
</del><ins>+ void changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void (bool)> successCallback);
+ void createObjectStore(const IDBIdentifier& transactionIdentifier, const WebCore::IDBObjectStoreMetadata&, std::function<void (bool)> successCallback);
+ void deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void (bool)> successCallback);
+ void clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void (bool)> successCallback);
+ void createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBIndexMetadata&, std::function<void (bool)> successCallback);
+ void deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, std::function<void (bool)> successCallback);
</ins><span class="cx">
</span><del>- void putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyData&, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys, std::function<void(const WebCore::IDBKeyData&, uint32_t, const String&)> callback);
- void getRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyRangeData&, WebCore::IndexedDB::CursorType, std::function<void(const WebCore::IDBGetResult&, uint32_t, const String&)> callback);
</del><ins>+ void putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyData&, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<WebCore::IDBKeyData>>& indexKeys, std::function<void (const WebCore::IDBKeyData&, uint32_t, const String&)> callback);
+ void getRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyRangeData&, WebCore::IndexedDB::CursorType, std::function<void (const WebCore::IDBGetResult&, uint32_t, const String&)> callback);
</ins><span class="cx">
</span><del>- void openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, WebCore::IndexedDB::CursorDirection, WebCore::IndexedDB::CursorType, WebCore::IDBDatabaseBackend::TaskType, const WebCore::IDBKeyRangeData&, std::function<void(int64_t, const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
- void cursorAdvance(const IDBIdentifier& cursorIdentifier, uint64_t count, std::function<void(const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
- void cursorIterate(const IDBIdentifier& cursorIdentifier, const WebCore::IDBKeyData&, std::function<void(const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
</del><ins>+ void openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, WebCore::IndexedDB::CursorDirection, WebCore::IndexedDB::CursorType, WebCore::IDBDatabaseBackend::TaskType, const WebCore::IDBKeyRangeData&, std::function<void (int64_t, const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
+ void cursorAdvance(const IDBIdentifier& cursorIdentifier, uint64_t count, std::function<void (const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
+ void cursorIterate(const IDBIdentifier& cursorIdentifier, const WebCore::IDBKeyData&, std::function<void (const WebCore::IDBKeyData&, const WebCore::IDBKeyData&, PassRefPtr<WebCore::SharedBuffer>, uint32_t, const String&)> callback);
</ins><span class="cx">
</span><del>- void count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyRangeData&, std::function<void(int64_t, uint32_t, const String&)> callback);
- void deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyRangeData&, std::function<void(uint32_t, const String&)> callback);
</del><ins>+ void count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyRangeData&, std::function<void (int64_t, uint32_t, const String&)> callback);
+ void deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyRangeData&, std::function<void (uint32_t, const String&)> callback);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> // Returns true if this origin can use the same databases as the given origin.
</span><span class="cx"> bool canShareDatabases(const SecurityOriginData&, const SecurityOriginData&) const;
</span><span class="cx">
</span><del>- void postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask>, std::function<void(bool)> successCallback);
</del><ins>+ void postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask>, std::function<void (bool)> successCallback);
</ins><span class="cx">
</span><span class="cx"> // To be called from the database workqueue thread only
</span><span class="cx"> void performNextDatabaseTask();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> StringCapture cachePathCapture(m_directoryPath);
</span><del>- dispatch_async(m_backgroundIOQueue.get(), [this, key, entry, cachePathCapture, completionHandler]() {
</del><ins>+ dispatch_async(m_backgroundIOQueue.get(), [this, key, entry, cachePathCapture, completionHandler] {
</ins><span class="cx"> auto data = encodeEntry(key, entry);
</span><span class="cx"> int fd;
</span><span class="cx"> auto channel = createIOChannelForKey(key, IOChannelType::Write, cachePathCapture.string(), fd);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncTask.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncTask.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/Shared/AsyncTask.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> class AsyncTask {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(AsyncTask);
</span><span class="cx"> public:
</span><del>- AsyncTask(const std::function<void()> taskFunction)
</del><ins>+ AsyncTask(const std::function<void ()> taskFunction)
</ins><span class="cx"> : m_taskFunction(taskFunction)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(taskFunction);
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> AsyncTask() { }
</span><span class="cx">
</span><del>- std::function<void()> m_taskFunction;
</del><ins>+ std::function<void ()> m_taskFunction;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T, typename... Arguments>
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> public:
</span><span class="cx"> AsyncTaskImpl(T* callee, void (T::*method)(Arguments...), Arguments&&... arguments)
</span><span class="cx"> {
</span><del>- m_taskFunction = [callee, method, arguments...]() {
</del><ins>+ m_taskFunction = [callee, method, arguments...] {
</ins><span class="cx"> (callee->*method)(arguments...);
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> // the process will exit forcibly.
</span><span class="cx"> auto watchdogDelay = std::chrono::seconds(10);
</span><span class="cx">
</span><del>- WorkQueue::create("com.apple.WebKit.ChildProcess.WatchDogQueue")->dispatchAfter(watchdogDelay, []{
</del><ins>+ WorkQueue::create("com.apple.WebKit.ChildProcess.WatchDogQueue")->dispatchAfter(watchdogDelay, [] {
</ins><span class="cx"> // We use _exit here since the watchdog callback is called from another thread and we don't want
</span><span class="cx"> // global destructors or atexit handlers to be called from this thread while the main thread is busy
</span><span class="cx"> // doing its thing.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItemData.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item, std::function<void()> selectionHandler)
</del><ins>+WebContextMenuItemData::WebContextMenuItemData(const WebCore::ContextMenuItem& item, std::function<void ()> selectionHandler)
</ins><span class="cx"> : m_type(item.type())
</span><span class="cx"> , m_action(item.action())
</span><span class="cx"> , m_title(item.title())
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebContextMenuItemDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebContextMenuItemData.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebContextMenuItemData.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/Shared/WebContextMenuItemData.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> class WebContextMenuItemData {
</span><span class="cx"> public:
</span><span class="cx"> WebContextMenuItemData();
</span><del>- WebContextMenuItemData(const WebCore::ContextMenuItem&, std::function<void()> selectionHandler = nullptr);
</del><ins>+ WebContextMenuItemData(const WebCore::ContextMenuItem&, std::function<void ()> selectionHandler = nullptr);
</ins><span class="cx"> WebContextMenuItemData(WebCore::ContextMenuItemType, WebCore::ContextMenuAction, const String& title, bool enabled, bool checked);
</span><span class="cx"> WebContextMenuItemData(WebCore::ContextMenuAction, const String& title, bool enabled, const Vector<WebContextMenuItemData>& submenu);
</span><span class="cx">
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebContextMenuItemData&);
</span><span class="cx">
</span><del>- std::function<void()> selectionHandler() const { return m_selectionHandler; }
</del><ins>+ std::function<void ()> selectionHandler() const { return m_selectionHandler; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebCore::ContextMenuItemType m_type;
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> Vector<WebContextMenuItemData> m_submenu;
</span><span class="cx"> RefPtr<API::Object> m_userData;
</span><span class="cx">
</span><del>- std::function<void()> m_selectionHandler;
</del><ins>+ std::function<void ()> m_selectionHandler;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Vector<WebContextMenuItemData> kitItems(const Vector<WebCore::ContextMenuItem>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> static std::once_flag onceFlag;
</span><span class="cx"> static LazyNeverDestroyed<BlockingResponseMap<SecItemResponseData>> responseMap;
</span><span class="cx">
</span><del>- std::call_once(onceFlag, []{
</del><ins>+ std::call_once(onceFlag, [] {
</ins><span class="cx"> responseMap.construct();
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> PluginProcessManager::PluginProcessManager()
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- : m_processSuppressionDisabledForPageCounter([this]() { updateProcessSuppressionState(); })
</del><ins>+ : m_processSuppressionDisabledForPageCounter([this] { updateProcessSuppressionState(); })
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="cx"> #endif
</span><span class="cx"> , m_memoryCacheDisabled(false)
</span><del>- , m_userObservablePageCounter([this]() { updateProcessSuppressionState(); })
- , m_processSuppressionDisabledForPageCounter([this]() { updateProcessSuppressionState(); })
</del><ins>+ , m_userObservablePageCounter([this] { updateProcessSuppressionState(); })
+ , m_processSuppressionDisabledForPageCounter([this] { updateProcessSuppressionState(); })
</ins><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> class CallbackSynchronizer : public RefCounted<CallbackSynchronizer> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<CallbackSynchronizer> create(const std::function<void(const CallbackBase::Error&)>& callback)
</del><ins>+ static PassRefPtr<CallbackSynchronizer> create(const std::function<void (const CallbackBase::Error&)>& callback)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new CallbackSynchronizer(callback));
</span><span class="cx"> }
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- CallbackSynchronizer(const std::function<void(const CallbackBase::Error&)>& callback)
</del><ins>+ CallbackSynchronizer(const std::function<void (const CallbackBase::Error&)>& callback)
</ins><span class="cx"> : m_count(0)
</span><span class="cx"> , m_callback(callback)
</span><span class="cx"> , m_error(CallbackBase::Error::None)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned m_count;
</span><del>- std::function<void(const CallbackBase::Error&)> m_callback;
</del><ins>+ std::function<void (const CallbackBase::Error&)> m_callback;
</ins><span class="cx"> CallbackBase::Error m_error;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
</span><del>- m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this]() {
</del><ins>+ m_viewStateChangeDispatcher = RunLoopObserver::create(viewStateChangeRunLoopOrder, [this] {
</ins><span class="cx"> this->dispatchViewStateChange();
</span><span class="cx"> });
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -74,14 +74,14 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKSelectionHandlerWrapper : NSObject {
</span><del>- std::function<void()> _selectionHandler;
</del><ins>+ std::function<void ()> _selectionHandler;
</ins><span class="cx"> }
</span><del>-- (id)initWithSelectionHandler:(std::function<void()>)selectionHandler;
</del><ins>+- (id)initWithSelectionHandler:(std::function<void ()>)selectionHandler;
</ins><span class="cx"> - (void)executeSelectionHandler;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKSelectionHandlerWrapper
</span><del>-- (id)initWithSelectionHandler:(std::function<void()>)selectionHandler
</del><ins>+- (id)initWithSelectionHandler:(std::function<void ()>)selectionHandler
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> [menuItem setEnabled:items[i].enabled()];
</span><span class="cx"> [menuItem setState:items[i].checked() ? NSOnState : NSOffState];
</span><span class="cx">
</span><del>- if (std::function<void()> selectionHandler = items[i].selectionHandler()) {
</del><ins>+ if (std::function<void ()> selectionHandler = items[i].selectionHandler()) {
</ins><span class="cx"> WKSelectionHandlerWrapper *wrapper = [[WKSelectionHandlerWrapper alloc] initWithSelectionHandler:selectionHandler];
</span><span class="cx"> [menuItem setRepresentedObject:wrapper];
</span><span class="cx"> [wrapper release];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<bool>::create(successCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([successCallback]() {
</del><ins>+ serverRequest->setAbortHandler([successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<const IDBDatabaseMetadata&, bool>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> IDBDatabaseMetadata metadata;
</span><span class="cx"> completionCallback(metadata, false);
</span><span class="cx"> });
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<bool>::create(successCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([successCallback]() {
</del><ins>+ serverRequest->setAbortHandler([successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> serverRequest->completeRequest(success);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::beginTransaction(int64_t transactionID, std::function<void()> completionCallback)
</del><ins>+void WebIDBServerConnection::beginTransaction(int64_t transactionID, std::function<void ()> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<>::create(completionCallback, completionCallback);
</span><span class="cx">
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<bool>::create(successCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([successCallback]() {
</del><ins>+ serverRequest->setAbortHandler([successCallback] {
</ins><span class="cx"> successCallback(false);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> serverRequest->completeRequest(success);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::resetTransaction(int64_t transactionID, std::function<void()> completionCallback)
</del><ins>+void WebIDBServerConnection::resetTransaction(int64_t transactionID, std::function<void ()> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<>::create(completionCallback, completionCallback);
</span><span class="cx">
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback)
</del><ins>+void WebIDBServerConnection::rollbackTransaction(int64_t transactionID, std::function<void ()> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<>::create(completionCallback, completionCallback);
</span><span class="cx">
</span><span class="lines">@@ -305,16 +305,16 @@
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const IDBObjectStoreMetadata&, IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<IDBKey>>>& indexKeys, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::createObjectStore(IDBTransactionBackend& transaction, const CreateObjectStoreOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::createObjectStore(IDBTransactionBackend& transaction, const CreateObjectStoreOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><span class="cx"> String objectStoreName = operation.objectStoreMetadata().name;
</span><del>- serverRequest->setAbortHandler([objectStoreName, completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([objectStoreName, completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, String::format("Unknown error occured creating object store '%s'", objectStoreName.utf8().data())));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -339,11 +339,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured creating object store"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::createIndex(IDBTransactionBackend&transaction, const CreateIndexOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::createIndex(IDBTransactionBackend&transaction, const CreateIndexOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured creating index"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -368,11 +368,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured creating index"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::deleteIndex(IDBTransactionBackend&transaction, const DeleteIndexOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::deleteIndex(IDBTransactionBackend&transaction, const DeleteIndexOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured deleting index"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -397,11 +397,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured deleting index"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::get(IDBTransactionBackend& transaction, const GetOperation& operation, std::function<void(const IDBGetResult&, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::get(IDBTransactionBackend& transaction, const GetOperation& operation, std::function<void (const IDBGetResult&, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<const IDBGetResult&, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBGetResult(), IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured getting record"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -416,11 +416,11 @@
</span><span class="cx"> send(Messages::DatabaseProcessIDBConnection::GetRecord(requestID, transaction.id(), operation.objectStoreID(), operation.indexID(), operation.keyRange(), static_cast<int64_t>(operation.cursorType())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::put(IDBTransactionBackend& transaction, const PutOperation& operation, std::function<void(PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::put(IDBTransactionBackend& transaction, const PutOperation& operation, std::function<void (PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBKey>, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(nullptr, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured putting record"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -507,11 +507,11 @@
</span><span class="cx"> serverRequest->completeRequest(key.maybeCreateIDBKey(), primaryKey.maybeCreateIDBKey(), value.release(), errorCode ? IDBDatabaseError::create(errorCode, errorMessage) : nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::count(IDBTransactionBackend& transaction, const CountOperation& operation, std::function<void(int64_t, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::count(IDBTransactionBackend& transaction, const CountOperation& operation, std::function<void (int64_t, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<int64_t, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(0, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured getting count"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -536,11 +536,11 @@
</span><span class="cx"> serverRequest->completeRequest(count, errorCode ? IDBDatabaseError::create(errorCode, errorMessage) : nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::deleteRange(IDBTransactionBackend& transaction, const DeleteRangeOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::deleteRange(IDBTransactionBackend& transaction, const DeleteRangeOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured getting count"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -565,11 +565,11 @@
</span><span class="cx"> serverRequest->completeRequest(errorCode ? IDBDatabaseError::create(errorCode, errorMessage) : nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::clearObjectStore(IDBTransactionBackend&, const ClearObjectStoreOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::clearObjectStore(IDBTransactionBackend&, const ClearObjectStoreOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured clearing object store"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -594,11 +594,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured clearing object store"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::deleteObjectStore(IDBTransactionBackend&, const DeleteObjectStoreOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::deleteObjectStore(IDBTransactionBackend&, const DeleteObjectStoreOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured deleting object store"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -623,11 +623,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured deleting object store"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation& operation, std::function<void(PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::changeDatabaseVersion(IDBTransactionBackend&, const IDBDatabaseBackend::VersionChangeOperation& operation, std::function<void (PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured changing database version"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -652,11 +652,11 @@
</span><span class="cx"> serverRequest->completeRequest(success ? nullptr : IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured changing database version"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::openCursor(IDBTransactionBackend&, const OpenCursorOperation& operation, std::function<void(int64_t, PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::openCursor(IDBTransactionBackend&, const OpenCursorOperation& operation, std::function<void (int64_t, PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<int64_t, PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(0, nullptr, nullptr, nullptr, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured opening database cursor"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -669,11 +669,11 @@
</span><span class="cx"> send(Messages::DatabaseProcessIDBConnection::OpenCursor(requestID, operation.transactionID(), operation.objectStoreID(), operation.indexID(), static_cast<int64_t>(operation.direction()), static_cast<int64_t>(operation.cursorType()), static_cast<int64_t>(operation.taskType()), operation.keyRange()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::cursorAdvance(IDBCursorBackend&, const CursorAdvanceOperation& operation, std::function<void(PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::cursorAdvance(IDBCursorBackend&, const CursorAdvanceOperation& operation, std::function<void (PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(nullptr, nullptr, nullptr, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured advancing database cursor"));
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -686,11 +686,11 @@
</span><span class="cx"> send(Messages::DatabaseProcessIDBConnection::CursorAdvance(requestID, operation.cursorID(), operation.count()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBServerConnection::cursorIterate(IDBCursorBackend&, const CursorIterationOperation& operation, std::function<void(PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</del><ins>+void WebIDBServerConnection::cursorIterate(IDBCursorBackend&, const CursorIterationOperation& operation, std::function<void (PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>)> completionCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = AsyncRequestImpl<PassRefPtr<IDBKey>, PassRefPtr<IDBKey>, PassRefPtr<SharedBuffer>, PassRefPtr<IDBDatabaseError>>::create(completionCallback);
</span><span class="cx">
</span><del>- serverRequest->setAbortHandler([completionCallback]() {
</del><ins>+ serverRequest->setAbortHandler([completionCallback] {
</ins><span class="cx"> completionCallback(nullptr, nullptr, nullptr, IDBDatabaseError::create(IDBDatabaseException::UnknownError, "Unknown error occured iterating database cursor"));
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -61,30 +61,30 @@
</span><span class="cx">
</span><span class="cx"> // Transaction-level operations
</span><span class="cx"> virtual void openTransaction(int64_t transactionID, const HashSet<int64_t>& objectStoreIds, WebCore::IndexedDB::TransactionMode, BoolCallbackFunction successCallback) override;
</span><del>- virtual void beginTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</del><ins>+ virtual void beginTransaction(int64_t transactionID, std::function<void ()> completionCallback) override;
</ins><span class="cx"> virtual void commitTransaction(int64_t transactionID, BoolCallbackFunction successCallback) override;
</span><del>- virtual void resetTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</del><ins>+ virtual void resetTransaction(int64_t transactionID, std::function<void ()> completionCallback) override;
</ins><span class="cx"> virtual bool resetTransactionSync(int64_t transactionID) override;
</span><del>- virtual void rollbackTransaction(int64_t transactionID, std::function<void()> completionCallback) override;
</del><ins>+ virtual void rollbackTransaction(int64_t transactionID, std::function<void ()> completionCallback) override;
</ins><span class="cx"> virtual bool rollbackTransactionSync(int64_t transactionID) override;
</span><span class="cx">
</span><del>- virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>>& indexKeys, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</del><ins>+ virtual void setIndexKeys(int64_t transactionID, int64_t databaseID, int64_t objectStoreID, const WebCore::IDBObjectStoreMetadata&, WebCore::IDBKey& primaryKey, const Vector<int64_t>& indexIDs, const Vector<Vector<RefPtr<WebCore::IDBKey>>>& indexKeys, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</ins><span class="cx">
</span><del>- virtual void createObjectStore(WebCore::IDBTransactionBackend&, const WebCore::CreateObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void createIndex(WebCore::IDBTransactionBackend&, const WebCore::CreateIndexOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void deleteIndex(WebCore::IDBTransactionBackend&, const WebCore::DeleteIndexOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void get(WebCore::IDBTransactionBackend&, const WebCore::GetOperation&, std::function<void(const WebCore::IDBGetResult&, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void put(WebCore::IDBTransactionBackend&, const WebCore::PutOperation&, std::function<void(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void openCursor(WebCore::IDBTransactionBackend&, const WebCore::OpenCursorOperation&, std::function<void(int64_t, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void count(WebCore::IDBTransactionBackend&, const WebCore::CountOperation&, std::function<void(int64_t, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void deleteRange(WebCore::IDBTransactionBackend&, const WebCore::DeleteRangeOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void clearObjectStore(WebCore::IDBTransactionBackend&, const WebCore::ClearObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void deleteObjectStore(WebCore::IDBTransactionBackend&, const WebCore::DeleteObjectStoreOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void changeDatabaseVersion(WebCore::IDBTransactionBackend&, const WebCore::IDBDatabaseBackend::VersionChangeOperation&, std::function<void(PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</del><ins>+ virtual void createObjectStore(WebCore::IDBTransactionBackend&, const WebCore::CreateObjectStoreOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void createIndex(WebCore::IDBTransactionBackend&, const WebCore::CreateIndexOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void deleteIndex(WebCore::IDBTransactionBackend&, const WebCore::DeleteIndexOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void get(WebCore::IDBTransactionBackend&, const WebCore::GetOperation&, std::function<void (const WebCore::IDBGetResult&, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void put(WebCore::IDBTransactionBackend&, const WebCore::PutOperation&, std::function<void (PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void openCursor(WebCore::IDBTransactionBackend&, const WebCore::OpenCursorOperation&, std::function<void (int64_t, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void count(WebCore::IDBTransactionBackend&, const WebCore::CountOperation&, std::function<void (int64_t, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void deleteRange(WebCore::IDBTransactionBackend&, const WebCore::DeleteRangeOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void clearObjectStore(WebCore::IDBTransactionBackend&, const WebCore::ClearObjectStoreOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void deleteObjectStore(WebCore::IDBTransactionBackend&, const WebCore::DeleteObjectStoreOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void changeDatabaseVersion(WebCore::IDBTransactionBackend&, const WebCore::IDBDatabaseBackend::VersionChangeOperation&, std::function<void (PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</ins><span class="cx">
</span><span class="cx"> // Cursor-level operations
</span><del>- virtual void cursorAdvance(WebCore::IDBCursorBackend&, const WebCore::CursorAdvanceOperation&, std::function<void(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
- virtual void cursorIterate(WebCore::IDBCursorBackend&, const WebCore::CursorIterationOperation&, std::function<void(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</del><ins>+ virtual void cursorAdvance(WebCore::IDBCursorBackend&, const WebCore::CursorAdvanceOperation&, std::function<void (PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
+ virtual void cursorIterate(WebCore::IDBCursorBackend&, const WebCore::CursorIterationOperation&, std::function<void (PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBDatabaseError>)> completionCallback) override;
</ins><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void didReceiveWebIDBServerConnectionMessage(IPC::Connection*, IPC::MessageDecoder&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessOriginDataWebOriginDataManagerSupplementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManagerSupplement.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManagerSupplement.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManagerSupplement.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> WebOriginDataManagerSupplement() { }
</span><span class="cx"> virtual ~WebOriginDataManagerSupplement() { }
</span><span class="cx">
</span><del>- virtual void getOrigins(WKOriginDataTypes, std::function<void(const Vector<SecurityOriginData>&)> completion) = 0;
- virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void()> completion) = 0;
- virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void()> completion) = 0;
- virtual void deleteAllEntries(WKOriginDataTypes, std::function<void()> completion) = 0;
</del><ins>+ virtual void getOrigins(WKOriginDataTypes, std::function<void (const Vector<SecurityOriginData>&)> completion) = 0;
+ virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void ()> completion) = 0;
+ virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void ()> completion) = 0;
+ virtual void deleteAllEntries(WKOriginDataTypes, std::function<void ()> completion) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -1257,7 +1257,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebProcess::getOrigins(WKOriginDataTypes types, std::function<void(const Vector<SecurityOriginData>&)> completion)
</del><ins>+void WebProcess::getOrigins(WKOriginDataTypes types, std::function<void (const Vector<SecurityOriginData>&)> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKMediaKeyStorageOriginData)) {
</span><span class="cx"> completion(Vector<SecurityOriginData>());
</span><span class="lines">@@ -1273,7 +1273,7 @@
</span><span class="cx"> completion(manager->getMediaKeyOrigins());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void()> completion)
</del><ins>+void WebProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKMediaKeyStorageOriginData)) {
</span><span class="cx"> completion();
</span><span class="lines">@@ -1290,7 +1290,7 @@
</span><span class="cx"> completion();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void()> completion)
</del><ins>+void WebProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKMediaKeyStorageOriginData)) {
</span><span class="cx"> completion();
</span><span class="lines">@@ -1307,7 +1307,7 @@
</span><span class="cx"> completion();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void()> completion)
</del><ins>+void WebProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void ()> completion)
</ins><span class="cx"> {
</span><span class="cx"> if (!(types & kWKMediaKeyStorageOriginData)) {
</span><span class="cx"> completion();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177425 => 177426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-17 02:50:12 UTC (rev 177425)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-17 02:55:04 UTC (rev 177426)
</span><span class="lines">@@ -287,10 +287,10 @@
</span><span class="cx"> void didReceiveWebProcessMessage(IPC::Connection*, IPC::MessageDecoder&);
</span><span class="cx">
</span><span class="cx"> // WebOriginDataManagerSupplement
</span><del>- virtual void getOrigins(WKOriginDataTypes, std::function<void(const Vector<SecurityOriginData>&)> completion) override;
- virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void()> completion) override;
- virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void()> completion) override;
- virtual void deleteAllEntries(WKOriginDataTypes, std::function<void()> completion) override;
</del><ins>+ virtual void getOrigins(WKOriginDataTypes, std::function<void (const Vector<SecurityOriginData>&)> completion) override;
+ virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void ()> completion) override;
+ virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void ()> completion) override;
+ virtual void deleteAllEntries(WKOriginDataTypes, std::function<void ()> completion) override;
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebConnectionToUIProcess> m_webConnection;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>