<!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>[163817] trunk</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/163817">163817</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 14:15:37 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>IDB: storage/indexeddb/mozilla/object-store-remove-values.html fails
<rdar://problem/16029319> and https://bugs.webkit.org/show_bug.cgi?id=128487
Reviewed by Tim Horton.
Source/WebKit2:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
(WebKit::DatabaseProcessIDBConnection::disconnectedFromWebProcess):
(WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata): Update logging.
(WebKit::DatabaseProcessIDBConnection::deleteDatabase): If deleteDatabase succeeds,
also disconnect from the UniqueIDBDatabase so it can be cleaned up properly.
(WebKit::DatabaseProcessIDBConnection::close): New message from the WebProcess to handle
clean closures.
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
* DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::shutdown): Move most of the cleanup to didShutdownBackingStore.
(WebKit::UniqueIDBDatabase::didShutdownBackingStore): Execute all remaining mainThreadTasks
(as they represent real results from the backing store thread).
(WebKit::UniqueIDBDatabase::deleteDatabase): Add an ASSERT.
(WebKit::UniqueIDBDatabase::performNextMainThreadTask): Call through to performNextMainThreadTaskWithoutAdoptRef.
(WebKit::UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef): Execute a task,
returning true if there are more tasks left to execute.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite): Properly
handle JSC cleanup.
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::WebIDBServerConnection::close): Implement this.
LayoutTests:
* platform/mac-wk2/TestExpectations: Add the now-passing test (skipped because of
unrelated flakiness in IDB tests)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in</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="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/LayoutTests/ChangeLog 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-10 Brady Eidson <beidson@apple.com>
+
+ IDB: storage/indexeddb/mozilla/object-store-remove-values.html fails
+ <rdar://problem/16029319> and https://bugs.webkit.org/show_bug.cgi?id=128487
+
+ Reviewed by Tim Horton.
+
+ * platform/mac-wk2/TestExpectations: Add the now-passing test (skipped because of
+ unrelated flakiness in IDB tests)
+
</ins><span class="cx"> 2014-02-10 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add test for hitting breakpoints from functions called via console
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -481,6 +481,7 @@
</span><span class="cx"> # storage/indexeddb/mozilla/cursors.html [ Pass ]
</span><span class="cx"> # storage/indexeddb/mozilla/index-prev-no-duplicate.html [ Pass ]
</span><span class="cx"> # storage/indexeddb/mozilla/object-cursors.html [ Pass ]
</span><ins>+# storage/indexeddb/mozilla/object-store-remove-values.html [ Pass ]
</ins><span class="cx"> # storage/indexeddb/mozilla/versionchange-abort.html [ Pass ]
</span><span class="cx">
</span><span class="cx"> ### END OF (5) Features that are not supported in WebKit1, so skipped in mac/TestExpectations then re-enabled here
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-02-10 Brady Eidson <beidson@apple.com>
+
+ IDB: storage/indexeddb/mozilla/object-store-remove-values.html fails
+ <rdar://problem/16029319> and https://bugs.webkit.org/show_bug.cgi?id=128487
+
+ Reviewed by Tim Horton.
+
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp:
+ (WebKit::DatabaseProcessIDBConnection::disconnectedFromWebProcess):
+ (WebKit::DatabaseProcessIDBConnection::getOrEstablishIDBDatabaseMetadata): Update logging.
+ (WebKit::DatabaseProcessIDBConnection::deleteDatabase): If deleteDatabase succeeds,
+ also disconnect from the UniqueIDBDatabase so it can be cleaned up properly.
+ (WebKit::DatabaseProcessIDBConnection::close): New message from the WebProcess to handle
+ clean closures.
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h:
+ * DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in:
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::shutdown): Move most of the cleanup to didShutdownBackingStore.
+ (WebKit::UniqueIDBDatabase::didShutdownBackingStore): Execute all remaining mainThreadTasks
+ (as they represent real results from the backing store thread).
+ (WebKit::UniqueIDBDatabase::deleteDatabase): Add an ASSERT.
+ (WebKit::UniqueIDBDatabase::performNextMainThreadTask): Call through to performNextMainThreadTaskWithoutAdoptRef.
+ (WebKit::UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef): Execute a task,
+ returning true if there are more tasks left to execute.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h:
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite): Properly
+ handle JSC cleanup.
+
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::WebIDBServerConnection::close): Implement this.
+
</ins><span class="cx"> 2014-02-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Add empty definition for an API allowing clients to define obscured edges over the scrollview
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -57,8 +57,13 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::disconnectedFromWebProcess()
</span><span class="cx"> {
</span><ins>+ // It's possible that the m_uniqueIDBDatabase pointer has already been cleared
+ // if the represented database was deleted.
+ if (!m_uniqueIDBDatabase)
+ return;
+
</ins><span class="cx"> m_uniqueIDBDatabase->unregisterConnection(*this);
</span><del>- m_uniqueIDBDatabase.clear();
</del><ins>+ m_uniqueIDBDatabase = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessIDBConnection::establishConnection(const String& databaseName, const SecurityOriginData& openingOrigin, const SecurityOriginData& mainFrameOrigin)
</span><span class="lines">@@ -71,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><del>- LOG(IDB, "DatabaseProcess getOrEstablishIDBDatabaseMetadata request ID %llu", requestID);
</del><ins>+ LOG(IDB, "DatabaseProcess getOrEstablishIDBDatabaseMetadata request ID %llu (connection %p)", requestID, this);
</ins><span class="cx">
</span><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><span class="cx"> m_uniqueIDBDatabase->getOrEstablishIDBDatabaseMetadata([connection, requestID](bool success, const IDBDatabaseMetadata& metadata) {
</span><span class="lines">@@ -83,7 +88,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_uniqueIDBDatabase);
</span><span class="cx">
</span><del>- LOG(IDB, "DatabaseProcess deleteDatabase request ID %llu", requestID);
</del><ins>+ LOG(IDB, "DatabaseProcess deleteDatabase request ID %llu (connection %p)", requestID, this);
</ins><span class="cx">
</span><span class="cx"> if (databaseName != m_uniqueIDBDatabase->identifier().databaseName()) {
</span><span class="cx"> LOG_ERROR("Request to delete database name that doesn't match with this database connection's database name");
</span><span class="lines">@@ -91,7 +96,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseProcessIDBConnection> connection(this);
</span><del>- m_uniqueIDBDatabase->deleteDatabase([connection, requestID](bool success) {
</del><ins>+ m_uniqueIDBDatabase->deleteDatabase([connection, this, requestID](bool success) {
+ if (success) {
+ // If the database was deleted, this connection should detach from it so it can be cleaned up.
+ m_uniqueIDBDatabase->unregisterConnection(*this);
+ m_uniqueIDBDatabase = nullptr;
+ }
</ins><span class="cx"> connection->send(Messages::WebIDBServerConnection::DidDeleteDatabase(requestID, success));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -326,6 +336,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessIDBConnection::close()
+{
+ LOG(IDB, "DatabaseProcessIDBConnection close");
+
+ disconnectedFromWebProcess();
+}
+
</ins><span class="cx"> IPC::Connection* DatabaseProcessIDBConnection::messageSenderConnection()
</span><span class="cx"> {
</span><span class="cx"> return m_connection->connection();
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.h 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -90,6 +90,8 @@
</span><span class="cx"> void count(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, const WebCore::IDBKeyRangeData&);
</span><span class="cx"> void deleteRange(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, const WebCore::IDBKeyRangeData& keyRange);
</span><span class="cx">
</span><ins>+ void close();
+
</ins><span class="cx"> Ref<DatabaseToWebProcessConnection> m_connection;
</span><span class="cx"> uint64_t m_serverConnectionIdentifier;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBDatabaseProcessIDBConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx">
</span><span class="cx"> Count(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, int64_t indexID, WebCore::IDBKeyRangeData keyRange)
</span><span class="cx"> DeleteRange(uint64_t requestID, int64_t transactionID, int64_t objectStoreID, WebCore::IDBKeyRangeData keyRange)
</span><ins>+
+ Close()
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -126,32 +126,14 @@
</span><span class="cx">
</span><span class="cx"> m_acceptingNewRequests = false;
</span><span class="cx">
</span><ins>+ // Balanced by an adoptRef in ::didShutdownBackingStore()
+ ref();
+
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_databaseTaskMutex);
</span><span class="cx"> m_databaseTasks.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- {
- MutexLocker locker(m_mainThreadTaskMutex);
- m_mainThreadTasks.clear();
- }
-
- for (const auto& it : m_pendingMetadataRequests)
- it->requestAborted();
-
- for (const auto& it : m_pendingTransactionRequests)
- it.value->requestAborted();
-
- for (const auto& it : m_pendingDatabaseTasks)
- it.value->requestAborted();
-
- m_pendingMetadataRequests.clear();
- m_pendingTransactionRequests.clear();
- m_pendingDatabaseTasks.clear();
-
- // Balanced by an adoptRef in ::didShutdownBackingStore()
- ref();
-
</del><span class="cx"> postDatabaseTask(createAsyncTask(*this, &UniqueIDBDatabase::shutdownBackingStore, type, absoluteDatabaseDirectory()), DatabaseTaskType::Shutdown);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,6 +160,22 @@
</span><span class="cx"> // Balanced by a ref in ::shutdown()
</span><span class="cx"> RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
</span><span class="cx">
</span><ins>+ // Empty out remaining main thread tasks.
+ while (performNextMainThreadTaskWithoutAdoptRef()) {
+ }
+
+ // No more requests will be handled, so abort all outstanding requests.
+ for (const auto& it : m_pendingMetadataRequests)
+ it->requestAborted();
+ for (const auto& it : m_pendingTransactionRequests)
+ it.value->requestAborted();
+ for (const auto& it : m_pendingDatabaseTasks)
+ it.value->requestAborted();
+
+ m_pendingMetadataRequests.clear();
+ m_pendingTransactionRequests.clear();
+ m_pendingDatabaseTasks.clear();
+
</ins><span class="cx"> if (m_pendingShutdownTask)
</span><span class="cx"> m_pendingShutdownTask->completeRequest(type);
</span><span class="cx">
</span><span class="lines">@@ -186,6 +184,8 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteDatabase(std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><ins>+ ASSERT(isMainThread());
+
</ins><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><span class="cx"> callOnMainThread([successCallback]() {
</span><span class="lines">@@ -1093,18 +1093,28 @@
</span><span class="cx"> // Balanced by a ref() in ::postMainThreadTask
</span><span class="cx"> RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
</span><span class="cx">
</span><ins>+ performNextMainThreadTaskWithoutAdoptRef();
+}
+
+bool UniqueIDBDatabase::performNextMainThreadTaskWithoutAdoptRef()
+{
+ bool moreTasks;
+
</ins><span class="cx"> std::unique_ptr<AsyncTask> task;
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_mainThreadTaskMutex);
</span><span class="cx">
</span><span class="cx"> // This database might be shutting down, in which case the task queue might be empty.
</span><span class="cx"> if (m_mainThreadTasks.isEmpty())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> task = m_mainThreadTasks.takeFirst();
</span><ins>+ moreTasks = !m_mainThreadTasks.isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> task->performTask();
</span><ins>+
+ return moreTasks;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::postDatabaseTask(std::unique_ptr<AsyncTask> task, DatabaseTaskType taskType)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx">
</span><span class="cx"> // Callbacks from the database workqueue thread, to be performed on the main thread only
</span><span class="cx"> void performNextMainThreadTask();
</span><ins>+ bool performNextMainThreadTaskWithoutAdoptRef();
</ins><span class="cx"> void didOpenBackingStoreAndReadMetadata(const WebCore::IDBDatabaseMetadata&, bool success);
</span><span class="cx"> void didCompleteTransactionOperation(const IDBIdentifier& transactionIdentifier, bool success);
</span><span class="cx"> void didChangeDatabaseVersion(uint64_t requestID, bool success);
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -74,6 +74,12 @@
</span><span class="cx">
</span><span class="cx"> m_transactions.clear();
</span><span class="cx"> m_sqliteDB = nullptr;
</span><ins>+
+ if (m_vm) {
+ JSLockHolder lockHolder(JSLockHolder(m_vm.get()));
+ m_globalObject.clear();
+ m_vm = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (163816 => 163817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-02-10 22:08:55 UTC (rev 163816)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-02-10 22:15:37 UTC (rev 163817)
</span><span class="lines">@@ -144,6 +144,16 @@
</span><span class="cx">
</span><span class="cx"> void WebIDBServerConnection::close()
</span><span class="cx"> {
</span><ins>+ LOG(IDB, "WebProcess close");
+
+ RefPtr<WebIDBServerConnection> protector(this);
+
+ for (auto& request : m_serverRequests)
+ request.value->requestAborted();
+
+ m_serverRequests.clear();
+
+ send(Messages::DatabaseProcessIDBConnection::Close());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIDBServerConnection::openTransaction(int64_t transactionID, const HashSet<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode, BoolCallbackFunction successCallback)
</span></span></pre>
</div>
</div>
</body>
</html>