<!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>[160033] 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/160033">160033</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 13:21:52 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Indexed Database work should be done on a non-main queue
https://bugs.webkit.org/show_bug.cgi?id=125127
Reviewed by Darin Adler.
Add a non-main WorkQueue to the DatabaseProcess:
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::DatabaseProcess):
(WebKit::DatabaseProcess::queue):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
(WebKit::UniqueIDBDatabase::enqueueDatabaseQueueRequest): Add an AsyncRequest to the deque then schedule performing
the requests on the background WorkQueue.
(WebKit::UniqueIDBDatabase::processDatabaseRequestQueue): Processes all enqueued database requests.
(WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata): Renamed from getIDBDatabaseMetadata().
(WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadataInternal): For doing i/o on a background queue/thread.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
Add a creator that takes the abort handler as an argument, and rename requestedCompleted()
to completeRequest(). This makes more sense in more situations:
* Shared/AsyncRequest.cpp:
(WebKit::AsyncRequest::AsyncRequest):
(WebKit::AsyncRequest::setAbortHandler):
* Shared/AsyncRequest.h:
(WebKit::AsyncRequest::completeRequest):
Update for the AsyncRequest rename:
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):</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="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncRequestcpp">trunk/Source/WebKit2/Shared/AsyncRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncRequesth">trunk/Source/WebKit2/Shared/AsyncRequest.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2013-12-03 Brady Eidson <beidson@apple.com>
+
+ Indexed Database work should be done on a non-main queue
+ https://bugs.webkit.org/show_bug.cgi?id=125127
+
+ Reviewed by Darin Adler.
+
+ Add a non-main WorkQueue to the DatabaseProcess:
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::DatabaseProcess):
+ (WebKit::DatabaseProcess::queue):
+ * DatabaseProcess/DatabaseProcess.h:
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebKit::UniqueIDBDatabase::enqueueDatabaseQueueRequest): Add an AsyncRequest to the deque then schedule performing
+ the requests on the background WorkQueue.
+ (WebKit::UniqueIDBDatabase::processDatabaseRequestQueue): Processes all enqueued database requests.
+ (WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata): Renamed from getIDBDatabaseMetadata().
+ (WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadataInternal): For doing i/o on a background queue/thread.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ Add a creator that takes the abort handler as an argument, and rename requestedCompleted()
+ to completeRequest(). This makes more sense in more situations:
+ * Shared/AsyncRequest.cpp:
+ (WebKit::AsyncRequest::AsyncRequest):
+ (WebKit::AsyncRequest::setAbortHandler):
+ * Shared/AsyncRequest.h:
+ (WebKit::AsyncRequest::completeRequest):
+
+ Update for the AsyncRequest rename:
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::didGetOrEstablishIDBDatabaseMetadata):
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata):
+
</ins><span class="cx"> 2013-12-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove TiledCoreAnimationDrawingArea(Proxy)IOS
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx">
</span><ins>+#if ENABLE(DATABASE_PROCESS)
+
</ins><span class="cx"> #include "DatabaseProcessCreationParameters.h"
</span><span class="cx"> #include "DatabaseProcessProxyMessages.h"
</span><span class="cx"> #include "DatabaseToWebProcessConnection.h"
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx">
</span><del>-#if ENABLE(DATABASE_PROCESS)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> DatabaseProcess& DatabaseProcess::shared()
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseProcess::DatabaseProcess()
</span><ins>+ : m_queue(adoptRef(*WorkQueue::create("com.apple.WebKit.DatabaseProcess").leakRef()))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx">
</span><ins>+class WorkQueue;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><span class="lines">@@ -48,6 +50,8 @@
</span><span class="cx"> PassRefPtr<UniqueIDBDatabase> getOrCreateUniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="cx"> void removeUniqueIDBDatabase(const UniqueIDBDatabase&);
</span><span class="cx">
</span><ins>+ WorkQueue& queue() const { return const_cast<WorkQueue&>(m_queue.get()); }
+
</ins><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="cx"> ~DatabaseProcess();
</span><span class="lines">@@ -70,6 +74,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
</span><span class="cx">
</span><ins>+ Ref<WorkQueue> m_queue;
+
</ins><span class="cx"> String m_indexedDatabaseDirectory;
</span><span class="cx">
</span><span class="cx"> HashMap<UniqueIDBDatabaseIdentifier, RefPtr<UniqueIDBDatabase>> m_idbDatabases;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><del>- m_uniqueIDBDatabase->getIDBDatabaseMetadata([connection, requestID](bool success, const IDBDatabaseMetadata& metadata) {
</del><ins>+ m_uniqueIDBDatabase->getOrEstablishIDBDatabaseMetadata([connection, requestID](bool success, const IDBDatabaseMetadata& metadata) {
</ins><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidGetOrEstablishIDBDatabaseMetadata(requestID, success, metadata));
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -28,9 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "AsyncRequest.h"
</ins><span class="cx"> #include "DatabaseProcess.h"
</span><span class="cx"> #include "DatabaseProcessIDBConnection.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseMetadata.h>
</span><ins>+#include <wtf/MainThread.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -38,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabase::UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier& identifier)
</span><span class="cx"> : m_identifier(identifier)
</span><ins>+ , m_processingDatabaseQueueRequests(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -60,13 +63,66 @@
</span><span class="cx"> DatabaseProcess::shared().removeUniqueIDBDatabase(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::getIDBDatabaseMetadata(std::function<void(bool, const WebCore::IDBDatabaseMetadata&)> completionCallback)
</del><ins>+void UniqueIDBDatabase::enqueueDatabaseQueueRequest(PassRefPtr<AsyncRequest> request)
</ins><span class="cx"> {
</span><ins>+ ASSERT(request);
+
+ MutexLocker locker(m_databaseQueueRequestsMutex);
+ m_databaseQueueRequests.append(request);
+
+ if (m_processingDatabaseQueueRequests)
+ return;
+
+ m_processingDatabaseQueueRequests = true;
+ DatabaseProcess::shared().queue().dispatch(bind(&UniqueIDBDatabase::processDatabaseRequestQueue, this));
+}
+
+void UniqueIDBDatabase::processDatabaseRequestQueue()
+{
+ ASSERT(m_processingDatabaseQueueRequests);
+
+ while (true) {
+ RefPtr<AsyncRequest> request;
+ {
+ MutexLocker locker(m_databaseQueueRequestsMutex);
+ if (m_databaseQueueRequests.isEmpty()) {
+ m_processingDatabaseQueueRequests = false;
+ return;
+ }
+ request = m_databaseQueueRequests.takeFirst();
+ }
+
+ request->completeRequest();
+ }
+}
+
+void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
+{
+ RefPtr<AsyncRequest> request = AsyncRequestImpl<>::create([completionCallback, this]() {
+ IDBDatabaseMetadata metadata;
+ bool success = getOrEstablishIDBDatabaseMetadataInternal(metadata);
+
+ RunLoop::main()->dispatch([metadata, success, completionCallback]() {
+ completionCallback(success, metadata);
+ });
+ }, [completionCallback]() {
+ RunLoop::main()->dispatch([completionCallback]() {
+ // The boolean flag to the completion callback represents whether the attempt to get/establish metadata
+ // succeeded or failed.
+ // Since we're aborting the attempt, it failed, so we always pass in false.
+ completionCallback(false, IDBDatabaseMetadata());
+ });
+ });
+
+ enqueueDatabaseQueueRequest(request.release());
+}
+
+bool UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadataInternal(const WebCore::IDBDatabaseMetadata&)
+{
</ins><span class="cx"> // FIXME: This method is successfully called by messaging from the WebProcess, and calls back with dummy data.
</span><span class="cx"> // Needs real implementation.
</span><del>-
- IDBDatabaseMetadata metadata;
- completionCallback(false, metadata);
</del><ins>+ ASSERT(!isMainThread());
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/Deque.h>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class AsyncRequest;
</ins><span class="cx"> class DatabaseProcessIDBConnection;
</span><span class="cx">
</span><span class="cx"> struct SecurityOriginData;
</span><span class="lines">@@ -59,7 +61,7 @@
</span><span class="cx"> void registerConnection(DatabaseProcessIDBConnection&);
</span><span class="cx"> void unregisterConnection(DatabaseProcessIDBConnection&);
</span><span class="cx">
</span><del>- void getIDBDatabaseMetadata(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><span class="cx"> private:
</span><span class="cx"> UniqueIDBDatabase(const UniqueIDBDatabaseIdentifier&);
</span><span class="lines">@@ -67,6 +69,17 @@
</span><span class="cx"> UniqueIDBDatabaseIdentifier m_identifier;
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<DatabaseProcessIDBConnection>> m_connections;
</span><ins>+ HashMap<uint64_t, RefPtr<AsyncRequest>> m_databaseRequests;
+
+ void enqueueDatabaseQueueRequest(PassRefPtr<AsyncRequest>);
+
+ // To be called from the database workqueue thread only
+ void processDatabaseRequestQueue();
+ bool getOrEstablishIDBDatabaseMetadataInternal(const WebCore::IDBDatabaseMetadata&);
+
+ Mutex m_databaseQueueRequestsMutex;
+ Deque<RefPtr<AsyncRequest>> m_databaseQueueRequests;
+ bool m_processingDatabaseQueueRequests;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncRequest.cpp (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncRequest.cpp 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/Shared/AsyncRequest.cpp 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -38,8 +38,9 @@
</span><span class="cx"> return ++requestID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AsyncRequest::AsyncRequest()
- : m_requestID(generateRequestID())
</del><ins>+AsyncRequest::AsyncRequest(std::function<void ()> abortHandler)
+ : m_abortHandler(std::move(abortHandler))
+ , m_requestID(generateRequestID())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> ASSERT(!m_abortHandler);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncRequest::setAbortHandler(std::function<void()> handler)
</del><ins>+void AsyncRequest::setAbortHandler(std::function<void ()> handler)
</ins><span class="cx"> {
</span><span class="cx"> m_abortHandler = std::move(handler);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncRequest.h (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncRequest.h 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/Shared/AsyncRequest.h 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -39,16 +39,16 @@
</span><span class="cx">
</span><span class="cx"> uint64_t requestID() { return m_requestID; }
</span><span class="cx">
</span><del>- void setAbortHandler(std::function<void()>);
</del><ins>+ void setAbortHandler(std::function<void ()>);
</ins><span class="cx"> void requestAborted();
</span><del>- template<typename... Arguments> void requestCompleted(Arguments&&... arguments);
</del><ins>+ template<typename... Arguments> void completeRequest(Arguments&&... arguments);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- AsyncRequest();
</del><ins>+ explicit AsyncRequest(std::function<void ()> abortHandler);
</ins><span class="cx">
</span><span class="cx"> virtual void clearCompletionHandler() = 0;
</span><span class="cx">
</span><del>- std::function<void()> m_abortHandler;
</del><ins>+ std::function<void ()> m_abortHandler;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> uint64_t m_requestID;
</span><span class="lines">@@ -59,23 +59,29 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<AsyncRequest> create(std::function<void (Arguments...)> completionHandler)
</span><span class="cx"> {
</span><del>- return adoptRef(new AsyncRequestImpl<Arguments...>(std::move(completionHandler)));
</del><ins>+ return adoptRef(new AsyncRequestImpl<Arguments...>(std::move(completionHandler), nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ static PassRefPtr<AsyncRequest> create(std::function<void (Arguments...)> completionHandler, std::function<void ()> abortHandler)
+ {
+ return adoptRef(new AsyncRequestImpl<Arguments...>(std::move(completionHandler), std::move(abortHandler)));
+ }
+
</ins><span class="cx"> virtual ~AsyncRequestImpl()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_completionHandler);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void requestCompleted(Arguments&&... arguments)
</del><ins>+ void completeRequest(Arguments&&... arguments)
</ins><span class="cx"> {
</span><span class="cx"> m_completionHandler(std::forward<Arguments>(arguments)...);
</span><span class="cx"> m_completionHandler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- AsyncRequestImpl(std::function<void (Arguments...)> completionHandler)
- : m_completionHandler(std::move(completionHandler))
</del><ins>+ AsyncRequestImpl(std::function<void (Arguments...)> completionHandler, std::function<void ()> abortHandler)
+ : AsyncRequest(std::move(abortHandler))
+ , m_completionHandler(std::move(completionHandler))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_completionHandler);
</span><span class="cx"> }
</span><span class="lines">@@ -88,10 +94,10 @@
</span><span class="cx"> std::function<void (Arguments...)> m_completionHandler;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename... Arguments> void AsyncRequest::requestCompleted(Arguments&&... arguments)
</del><ins>+template<typename... Arguments> void AsyncRequest::completeRequest(Arguments&&... arguments)
</ins><span class="cx"> {
</span><span class="cx"> AsyncRequestImpl<Arguments...>* request = static_cast<AsyncRequestImpl<Arguments...>*>(this);
</span><del>- request->requestCompleted(std::forward<Arguments>(arguments)...);
</del><ins>+ request->completeRequest(std::forward<Arguments>(arguments)...);
</ins><span class="cx"> m_abortHandler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (160032 => 160033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-03 20:58:18 UTC (rev 160032)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2013-12-03 21:21:52 UTC (rev 160033)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> RefPtr<AsyncRequest> serverRequest = m_serverRequests.take(requestID);
</span><span class="cx"> ASSERT(serverRequest);
</span><span class="cx">
</span><del>- serverRequest->requestCompleted(metadata, success);
</del><ins>+ serverRequest->completeRequest(metadata, success);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBServerConnection::close()
</span></span></pre>
</div>
</div>
</body>
</html>