<!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>[194563] 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/194563">194563</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 16:06:05 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Memory indexes aren't deleted when their owning memory object stores are deleted.
https://bugs.webkit.org/show_bug.cgi?id=152717
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html
* Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
(WebCore::IDBServer::MemoryBackingStoreTransaction::objectStoreDeleted):
* Modules/indexeddb/server/MemoryObjectStore.cpp:
(WebCore::IDBServer::MemoryObjectStore::deleteAllIndexes):
* Modules/indexeddb/server/MemoryObjectStore.h:
LayoutTests:
* storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt: Added.
* storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html: Added.
* storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryBackingStoreTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreh">trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernmemoryindexnotdeletedwithobjectstoreexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernmemoryindexnotdeletedwithobjectstorehtml">trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcesmemoryindexnotdeletedwithobjectstorejs">trunk/LayoutTests/storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194562 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-05 00:06:02 UTC (rev 194562)
+++ trunk/LayoutTests/ChangeLog 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-04 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Memory indexes aren't deleted when their owning memory object stores are deleted.
+ https://bugs.webkit.org/show_bug.cgi?id=152717
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt: Added.
+ * storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html: Added.
+ * storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js: Added.
+
</ins><span class="cx"> 2016-01-04 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r194143): Float width incorrectly calculated on Wikipedia
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernmemoryindexnotdeletedwithobjectstoreexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt (0 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore-expected.txt 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -0,0 +1,165 @@
</span><ins>+Makes sure that when an in-memory object store is deleted, any in-memory indexes it has are also deleted. If the test does not crash, it passes.
+
+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 = "memory-index-not-deleted-with-objectstore.html"
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+connection = event.target.result;
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+store = connection.createObjectStore('name');
+index = store.createIndex('name', 'foo');
+Deleted all object stores.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernmemoryindexnotdeletedwithobjectstorehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html (0 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html 2016-01-05 00:06:05 UTC (rev 194563)
</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/memory-index-not-deleted-with-objectstore.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcesmemoryindexnotdeletedwithobjectstorejs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js (0 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/memory-index-not-deleted-with-objectstore.js 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+description("Makes sure that when an in-memory object store is deleted, any in-memory indexes it has are also deleted. If the test does not crash, it passes.");
+
+indexedDBTest(prepareDatabase, versionChangeDone);
+
+function prepareDatabase()
+{
+ evalAndLog("connection = event.target.result;");
+
+ for (var i = 0; i < 50; ++i) {
+ evalAndLog("store = connection.createObjectStore('name');");
+ evalAndLog("index = store.createIndex('name', 'foo');");
+ deleteAllObjectStores(connection);
+ }
+}
+
+function versionChangeDone()
+{
+ finishJSTest();
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194562 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-05 00:06:02 UTC (rev 194562)
+++ trunk/Source/WebCore/ChangeLog 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-04 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Memory indexes aren't deleted when their owning memory object stores are deleted.
+ https://bugs.webkit.org/show_bug.cgi?id=152717
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/memory-index-not-deleted-with-objectstore.html
+
+ * Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
+ (WebCore::IDBServer::MemoryBackingStoreTransaction::objectStoreDeleted):
+ * Modules/indexeddb/server/MemoryObjectStore.cpp:
+ (WebCore::IDBServer::MemoryObjectStore::deleteAllIndexes):
+ * Modules/indexeddb/server/MemoryObjectStore.h:
+
</ins><span class="cx"> 2016-01-04 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn on gesture events when building for Yosemite
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryBackingStoreTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp (194562 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2016-01-05 00:06:02 UTC (rev 194562)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -116,6 +116,8 @@
</span><span class="cx"> ASSERT(m_objectStores.contains(objectStore.get()));
</span><span class="cx"> m_objectStores.remove(objectStore.get());
</span><span class="cx">
</span><ins>+ objectStore->deleteAllIndexes(*this);
+
</ins><span class="cx"> auto addResult = m_deletedObjectStores.add(objectStore->info().name(), nullptr);
</span><span class="cx"> if (addResult.isNewEntry)
</span><span class="cx"> addResult.iterator->value = WTFMove(objectStore);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp (194562 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp 2016-01-05 00:06:02 UTC (rev 194562)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -156,6 +156,18 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MemoryObjectStore::deleteAllIndexes(MemoryBackingStoreTransaction& transaction)
+{
+ Vector<String> indexNames;
+ indexNames.reserveInitialCapacity(m_indexesByName.size());
+
+ for (auto& name : m_indexesByName.keys())
+ indexNames.uncheckedAppend(name);
+
+ for (auto& name : indexNames)
+ deleteIndex(transaction, name);
+}
+
</ins><span class="cx"> bool MemoryObjectStore::containsRecord(const IDBKeyData& key)
</span><span class="cx"> {
</span><span class="cx"> if (!m_keyValueStore)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverMemoryObjectStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h (194562 => 194563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h 2016-01-05 00:06:02 UTC (rev 194562)
+++ trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.h 2016-01-05 00:06:05 UTC (rev 194563)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx">
</span><span class="cx"> IDBError createIndex(MemoryBackingStoreTransaction&, const IDBIndexInfo&);
</span><span class="cx"> IDBError deleteIndex(MemoryBackingStoreTransaction&, const String& indexName);
</span><ins>+ void deleteAllIndexes(MemoryBackingStoreTransaction&);
</ins><span class="cx"> void registerIndex(std::unique_ptr<MemoryIndex>&&);
</span><span class="cx">
</span><span class="cx"> bool containsRecord(const IDBKeyData&);
</span></span></pre>
</div>
</div>
</body>
</html>