<!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>[191847] 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/191847">191847</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-31 16:17:43 -0700 (Sat, 31 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html is flaky.
https://bugs.webkit.org/show_bug.cgi?id=150735
Reviewed by Darin Adler.
Source/WebCore:
No new tests (Covered by existing tests).
Transactions were liable to commit too early because IDBRequests could be waiting
to dispatch their error/success events but their operations would no longer be
registered with the transaction.
Having outstanding requests should also keep a transaction from committing, just
like having outstanding operations should.
* Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
(WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
* Modules/indexeddb/client/IDBRequestImpl.cpp:
(WebCore::IDBClient::IDBRequest::dispatchEvent):
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::addRequest):
(WebCore::IDBClient::IDBTransaction::removeRequest):
(WebCore::IDBClient::IDBTransaction::operationTimerFired):
(WebCore::IDBClient::IDBTransaction::requestGetRecord):
(WebCore::IDBClient::IDBTransaction::requestClearObjectStore):
(WebCore::IDBClient::IDBTransaction::requestPutOrAdd):
(WebCore::IDBClient::IDBTransaction::operationDidComplete):
* Modules/indexeddb/client/IDBTransactionImpl.h:
* Modules/indexeddb/client/TransactionOperation.h:
(WebCore::IDBClient::TransactionOperation::completed):
LayoutTests:
* platform/mac-wk1/TestExpectations: Reenable the test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientTransactionOperationh">trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/LayoutTests/ChangeLog 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-31 Brady Eidson <beidson@apple.com>
+
+ storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=150735
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk1/TestExpectations: Reenable the test.
+
</ins><span class="cx"> 2015-10-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Test Debugger.scriptParsed events received after opening inspector frontend
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -50,8 +50,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/150564 svg/repaint/add-background-property-on-root.html [ Pass Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/150735 storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html [ Pass Failure ]
-
</del><span class="cx"> ### END OF (1) Failures with bug reports
</span><span class="cx"> ########################################
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/ChangeLog 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-10-31 Brady Eidson <beidson@apple.com>
+
+ storage/indexeddb/modern/idbdatabase-deleteobjectstore-failures.html is flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=150735
+
+ Reviewed by Darin Adler.
+
+ No new tests (Covered by existing tests).
+
+ Transactions were liable to commit too early because IDBRequests could be waiting
+ to dispatch their error/success events but their operations would no longer be
+ registered with the transaction.
+
+ Having outstanding requests should also keep a transaction from committing, just
+ like having outstanding operations should.
+
+ * Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBOpenDBRequest::onUpgradeNeeded):
+
+ * Modules/indexeddb/client/IDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBRequest::dispatchEvent):
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::addRequest):
+ (WebCore::IDBClient::IDBTransaction::removeRequest):
+ (WebCore::IDBClient::IDBTransaction::operationTimerFired):
+ (WebCore::IDBClient::IDBTransaction::requestGetRecord):
+ (WebCore::IDBClient::IDBTransaction::requestClearObjectStore):
+ (WebCore::IDBClient::IDBTransaction::requestPutOrAdd):
+ (WebCore::IDBClient::IDBTransaction::operationDidComplete):
+ * Modules/indexeddb/client/IDBTransactionImpl.h:
+
+ * Modules/indexeddb/client/TransactionOperation.h:
+ (WebCore::IDBClient::TransactionOperation::completed):
+
</ins><span class="cx"> 2015-10-31 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][Mac] Fix WebAudio build
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBOpenDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.cpp 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> m_result = IDBAny::create(WTF::move(database));
</span><span class="cx"> m_readyState = IDBRequestReadyState::Done;
</span><span class="cx"> m_transaction = adoptRef(&transaction.leakRef());
</span><ins>+ m_transaction->addRequest(*this);
</ins><span class="cx">
</span><span class="cx"> enqueueEvent(IDBVersionChangeEvent::create(oldVersion, newVersion, eventNames().upgradeneededEvent));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBRequestImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -166,6 +166,10 @@
</span><span class="cx">
</span><span class="cx"> m_hasPendingActivity = false;
</span><span class="cx">
</span><ins>+ // FIXME: When we implement reusable requests (for cursors) it will be incorrect to always remove the request from the transaction.
+ if (m_transaction)
+ m_transaction->removeRequest(*this);
+
</ins><span class="cx"> return dontPreventDefault;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -207,6 +207,18 @@
</span><span class="cx"> || m_state == IndexedDB::TransactionState::Finished;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBTransaction::addRequest(IDBRequest& request)
+{
+ ASSERT(!m_openRequests.contains(&request));
+ m_openRequests.add(&request);
+}
+
+void IDBTransaction::removeRequest(IDBRequest& request)
+{
+ ASSERT(m_openRequests.contains(&request));
+ m_openRequests.remove(&request);
+}
+
</ins><span class="cx"> void IDBTransaction::scheduleOperation(RefPtr<TransactionOperation>&& operation)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_transactionOperationMap.contains(operation->identifier()));
</span><span class="lines">@@ -237,6 +249,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!m_transactionOperationMap.isEmpty() || !m_openRequests.isEmpty())
+ return;
+
</ins><span class="cx"> if (!isFinishedOrFinishing())
</span><span class="cx"> commit();
</span><span class="cx"> }
</span><span class="lines">@@ -393,6 +408,7 @@
</span><span class="cx"> ASSERT(!keyRangeData.isNull);
</span><span class="cx">
</span><span class="cx"> Ref<IDBRequest> request = IDBRequest::create(context, objectStore, *this);
</span><ins>+ addRequest(request.get());
</ins><span class="cx">
</span><span class="cx"> auto operation = createTransactionOperation(*this, request.get(), &IDBTransaction::didGetRecordOnServer, &IDBTransaction::getRecordOnServer, keyRangeData);
</span><span class="cx"> scheduleOperation(WTF::move(operation));
</span><span class="lines">@@ -421,6 +437,7 @@
</span><span class="cx"> ASSERT(isActive());
</span><span class="cx">
</span><span class="cx"> Ref<IDBRequest> request = IDBRequest::create(context, objectStore, *this);
</span><ins>+ addRequest(request.get());
</ins><span class="cx">
</span><span class="cx"> uint64_t objectStoreIdentifier = objectStore.info().identifier();
</span><span class="cx"> auto operation = createTransactionOperation(*this, request.get(), &IDBTransaction::didClearObjectStoreOnServer, &IDBTransaction::clearObjectStoreOnServer, objectStoreIdentifier);
</span><span class="lines">@@ -452,6 +469,7 @@
</span><span class="cx"> ASSERT(objectStore.info().autoIncrement() || key);
</span><span class="cx">
</span><span class="cx"> Ref<IDBRequest> request = IDBRequest::create(context, objectStore, *this);
</span><ins>+ addRequest(request.get());
</ins><span class="cx">
</span><span class="cx"> auto operation = createTransactionOperation(*this, request.get(), &IDBTransaction::didPutOrAddOnServer, &IDBTransaction::putOrAddOnServer, key, &value, overwriteMode);
</span><span class="cx"> scheduleOperation(WTF::move(operation));
</span><span class="lines">@@ -503,6 +521,14 @@
</span><span class="cx"> ASSERT_UNUSED(resultData, resultData.type() == IDBResultType::DeleteObjectStoreSuccess);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBTransaction::operationDidComplete(TransactionOperation& operation)
+{
+ ASSERT(m_transactionOperationMap.get(operation.identifier()) == &operation);
+ m_transactionOperationMap.remove(operation.identifier());
+
+ scheduleOperationTimer();
+}
+
</ins><span class="cx"> void IDBTransaction::establishOnServer()
</span><span class="cx"> {
</span><span class="cx"> LOG(IndexedDB, "IDBTransaction::establishOnServer");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -95,12 +95,15 @@
</span><span class="cx">
</span><span class="cx"> void deleteObjectStore(const String& objectStoreName);
</span><span class="cx">
</span><ins>+ void addRequest(IDBRequest&);
+ void removeRequest(IDBRequest&);
+
</ins><span class="cx"> IDBConnectionToServer& serverConnection();
</span><span class="cx">
</span><span class="cx"> void activate();
</span><span class="cx"> void deactivate();
</span><span class="cx">
</span><del>- void scheduleOperationTimer();
</del><ins>+ void operationDidComplete(TransactionOperation&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IDBTransaction(IDBDatabase&, const IDBTransactionInfo&);
</span><span class="lines">@@ -138,6 +141,8 @@
</span><span class="cx">
</span><span class="cx"> void establishOnServer();
</span><span class="cx">
</span><ins>+ void scheduleOperationTimer();
+
</ins><span class="cx"> Ref<IDBDatabase> m_database;
</span><span class="cx"> IDBTransactionInfo m_info;
</span><span class="cx"> std::unique_ptr<IDBDatabaseInfo> m_originalDatabaseInfo;
</span><span class="lines">@@ -154,6 +159,8 @@
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_transactionOperationMap;
</span><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<IDBObjectStore>> m_referencedObjectStores;
</span><ins>+
+ HashSet<RefPtr<IDBRequest>> m_openRequests;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TransactionActivator {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientTransactionOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h (191846 => 191847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2015-10-31 23:12:53 UTC (rev 191846)
+++ trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h 2015-10-31 23:17:43 UTC (rev 191847)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> void completed(const IDBResultData& data)
</span><span class="cx"> {
</span><span class="cx"> m_completeFunction(data);
</span><del>- m_transaction->scheduleOperationTimer();
</del><ins>+ m_transaction->operationDidComplete(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const IDBResourceIdentifier& identifier() const { return m_identifier; }
</span></span></pre>
</div>
</div>
</body>
</html>