<!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>[193878] 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/193878">193878</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 16:53:11 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: storage/indexeddb/metadata.html fails
https://bugs.webkit.org/show_bug.cgi?id=152099
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/abort-objectstore-info.html
And at least one existing failure now passes.
We did not properly reset object store info when version change transactions aborted.
* Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
(WebCore::IDBClient::IDBObjectStore::IDBObjectStore):
(WebCore::IDBClient::IDBObjectStore::rollbackInfoForVersionChangeAbort):
* Modules/indexeddb/client/IDBObjectStoreImpl.h:
* Modules/indexeddb/client/IDBTransactionImpl.cpp:
(WebCore::IDBClient::IDBTransaction::abort):
LayoutTests:
* platform/mac-wk1/TestExpectations:
* storage/indexeddb/modern/abort-objectstore-info-expected.txt: Added.
* storage/indexeddb/modern/abort-objectstore-info.html: Added.
* storage/indexeddb/modern/resources/abort-objectstore-info.js: Added.</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="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplh">trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortobjectstoreinfoexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernabortobjectstoreinfohtml">trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesabortobjectstoreinfojs">trunk/LayoutTests/storage/indexeddb/modern/resources/abort-objectstore-info.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/LayoutTests/ChangeLog 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-12-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Modern IDB: storage/indexeddb/metadata.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=152099
+
+ Reviewed by Alex Christensen.
+
+ * platform/mac-wk1/TestExpectations:
+ * storage/indexeddb/modern/abort-objectstore-info-expected.txt: Added.
+ * storage/indexeddb/modern/abort-objectstore-info.html: Added.
+ * storage/indexeddb/modern/resources/abort-objectstore-info.js: Added.
+
+2015-12-09 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Modern IDB: storage/indexeddb/intversion-close-between-events.html fails.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152096
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> storage/indexeddb/intversion-upgrades.html [ Failure ]
</span><span class="cx"> storage/indexeddb/key-type-array.html [ Failure ]
</span><span class="cx"> storage/indexeddb/lazy-index-types.html [ Failure ]
</span><del>-storage/indexeddb/metadata.html [ Failure ]
</del><span class="cx"> storage/indexeddb/objectstore-autoincrement.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-basics.html [ Failure ]
</span><span class="cx"> storage/indexeddb/objectstore-count.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortobjectstoreinfoexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info-expected.txt (0 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info-expected.txt 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+Explores the edge cases of what IDBObjectStore objects look like after a version change transaction that changed them aborts.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+dbname = "abort-objectstore-info.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+connection1 = event.target.result;
+objectStore1_1 = connection1.createObjectStore('objectStore1');
+objectStore1_2 = connection1.createObjectStore('objectStore2');
+objectStore1_2.createIndex('index', 'foo');
+
+PASS connection1.version is 1
+PASS connection1.objectStoreNames.length is 2
+PASS objectStore1_1.indexNames.length is 0
+PASS objectStore1_2.indexNames.length is 1
+
+connection1.close();
+secondRequest = indexedDB.open(dbname, 2);
+secondRequest.onupgradeneeded = secondUpgradeNeeded;
+connection2 = event.target.result;
+objectStore2_1 = secondRequest.transaction.objectStore('objectStore1');
+objectStore2_2 = secondRequest.transaction.objectStore('objectStore2');
+objectStore2_3 = connection2.createObjectStore('objectStore3');
+
+PASS connection2.version is 2
+PASS connection2.objectStoreNames.length is 3
+PASS objectStore2_1.indexNames.length is 0
+PASS objectStore2_2.indexNames.length is 1
+PASS objectStore2_3.indexNames.length is 0
+
+objectStore2_1.createIndex('index', 'foo');
+objectStore2_2.deleteIndex('index');
+objectStore2_3.createIndex('index', 'foo');
+
+PASS connection2.version is 2
+PASS connection2.objectStoreNames.length is 3
+PASS objectStore2_1.indexNames.length is 1
+PASS objectStore2_2.indexNames.length is 0
+PASS objectStore2_3.indexNames.length is 1
+
+secondRequest.transaction.abort();
+connection2.close()
+
+checkState():
+PASS connection1.version is 1
+PASS connection1.objectStoreNames.length is 2
+PASS objectStore1_1.indexNames.length is 0
+PASS objectStore1_2.indexNames.length is 1
+
+PASS connection2.version is 1
+PASS connection2.objectStoreNames.length is 2
+PASS objectStore2_1.indexNames.length is 0
+PASS objectStore2_2.indexNames.length is 1
+PASS objectStore2_3.indexNames.length is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernabortobjectstoreinfohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info.html (0 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/abort-objectstore-info.html 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/abort-objectstore-info.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesabortobjectstoreinfojs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/abort-objectstore-info.js (0 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/abort-objectstore-info.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/abort-objectstore-info.js 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+description("Explores the edge cases of what IDBObjectStore objects look like after a version change transaction that changed them aborts.");
+
+indexedDBTest(prepareDatabase, versionChangeSuccessCallback);
+
+function prepareDatabase()
+{
+ evalAndLog("connection1 = event.target.result;");
+ evalAndLog("objectStore1_1 = connection1.createObjectStore('objectStore1');");
+ evalAndLog("objectStore1_2 = connection1.createObjectStore('objectStore2');");
+ evalAndLog("objectStore1_2.createIndex('index', 'foo');");
+
+ debug("");
+ shouldBe("connection1.version", "1");
+ shouldBe("connection1.objectStoreNames.length", "2");
+ shouldBe("objectStore1_1.indexNames.length", "0");
+ shouldBe("objectStore1_2.indexNames.length", "1");
+ debug("");
+}
+
+function versionChangeSuccessCallback()
+{
+ evalAndLog("connection1.close();");
+ evalAndLog("secondRequest = indexedDB.open(dbname, 2);");
+ evalAndLog("secondRequest.onupgradeneeded = secondUpgradeNeeded;");
+ secondRequest.onsuccess = unexpectedSuccessCallback;
+ secondRequest.onerror = function() {
+ evalAndLog("connection2.close()");
+ checkState();
+ };
+}
+
+function secondUpgradeNeeded()
+{
+ evalAndLog("connection2 = event.target.result;");
+ evalAndLog("objectStore2_1 = secondRequest.transaction.objectStore('objectStore1');");
+ evalAndLog("objectStore2_2 = secondRequest.transaction.objectStore('objectStore2');");
+ evalAndLog("objectStore2_3 = connection2.createObjectStore('objectStore3');");
+
+ debug("");
+ shouldBe("connection2.version", "2");
+ shouldBe("connection2.objectStoreNames.length", "3");
+ shouldBe("objectStore2_1.indexNames.length", "0");
+ shouldBe("objectStore2_2.indexNames.length", "1");
+ shouldBe("objectStore2_3.indexNames.length", "0");
+
+ debug("");
+ evalAndLog("objectStore2_1.createIndex('index', 'foo');");
+ evalAndLog("objectStore2_2.deleteIndex('index');");
+ evalAndLog("objectStore2_3.createIndex('index', 'foo');");
+ debug("");
+
+ shouldBe("connection2.version", "2");
+ shouldBe("connection2.objectStoreNames.length", "3");
+ shouldBe("objectStore2_1.indexNames.length", "1");
+ shouldBe("objectStore2_2.indexNames.length", "0");
+ shouldBe("objectStore2_3.indexNames.length", "1");
+
+ debug("");
+ evalAndLog("secondRequest.transaction.abort();");
+}
+
+function checkState()
+{
+ debug("");
+ debug("checkState():");
+
+ shouldBe("connection1.version", "1");
+ shouldBe("connection1.objectStoreNames.length", "2");
+ shouldBe("objectStore1_1.indexNames.length", "0");
+ shouldBe("objectStore1_2.indexNames.length", "1");
+ debug("");
+
+ shouldBe("connection2.version", "1");
+ shouldBe("connection2.objectStoreNames.length", "2");
+ shouldBe("objectStore2_1.indexNames.length", "0");
+ shouldBe("objectStore2_2.indexNames.length", "1");
+ shouldBe("objectStore2_3.indexNames.length", "0");
+
+ finishJSTest();
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/Source/WebCore/ChangeLog 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-09 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: storage/indexeddb/metadata.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=152099
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/abort-objectstore-info.html
+ And at least one existing failure now passes.
+
+ We did not properly reset object store info when version change transactions aborted.
+
+ * Modules/indexeddb/client/IDBObjectStoreImpl.cpp:
+ (WebCore::IDBClient::IDBObjectStore::IDBObjectStore):
+ (WebCore::IDBClient::IDBObjectStore::rollbackInfoForVersionChangeAbort):
+ * Modules/indexeddb/client/IDBObjectStoreImpl.h:
+
+ * Modules/indexeddb/client/IDBTransactionImpl.cpp:
+ (WebCore::IDBClient::IDBTransaction::abort):
+
</ins><span class="cx"> 2015-12-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Adjust layer backing store format
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.cpp 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> IDBObjectStore::IDBObjectStore(const IDBObjectStoreInfo& info, IDBTransaction& transaction)
</span><span class="cx"> : m_info(info)
</span><ins>+ , m_originalInfo(info)
</ins><span class="cx"> , m_transaction(transaction)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -596,6 +597,11 @@
</span><span class="cx"> m_deleted = true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IDBObjectStore::rollbackInfoForVersionChangeAbort()
+{
+ m_info = m_originalInfo;
+}
+
</ins><span class="cx"> } // namespace IDBClient
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBObjectStoreImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -92,6 +92,8 @@
</span><span class="cx"> // this will no longer be necessary.
</span><span class="cx"> IDBTransaction& modernTransaction() { return m_transaction.get(); }
</span><span class="cx">
</span><ins>+ void rollbackInfoForVersionChangeAbort();
+
</ins><span class="cx"> private:
</span><span class="cx"> IDBObjectStore(const IDBObjectStoreInfo&, IDBTransaction&);
</span><span class="cx">
</span><span class="lines">@@ -104,6 +106,7 @@
</span><span class="cx"> RefPtr<WebCore::IDBRequest> doCount(ScriptExecutionContext&, const IDBKeyRangeData&, ExceptionCodeWithMessage&);
</span><span class="cx">
</span><span class="cx"> IDBObjectStoreInfo m_info;
</span><ins>+ IDBObjectStoreInfo m_originalInfo;
</ins><span class="cx"> Ref<IDBTransaction> m_transaction;
</span><span class="cx">
</span><span class="cx"> bool m_deleted { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBTransactionImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp (193877 => 193878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-12-09 23:57:59 UTC (rev 193877)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.cpp 2015-12-10 00:53:11 UTC (rev 193878)
</span><span class="lines">@@ -188,6 +188,9 @@
</span><span class="cx"> m_database->willAbortTransaction(*this);
</span><span class="cx">
</span><span class="cx"> if (isVersionChange()) {
</span><ins>+ for (auto& objectStore : m_referencedObjectStores.values())
+ objectStore->rollbackInfoForVersionChangeAbort();
+
</ins><span class="cx"> ASSERT(m_openDBRequest);
</span><span class="cx"> m_openDBRequest->versionChangeTransactionWillFinish();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>