<!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>[199410] releases/WebKitGTK/webkit-2.12</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/199410">199410</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 23:44:02 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198357">r198357</a> - Don't try to restore deleted MemoryIndexes if their owning object store is not restored.
https://bugs.webkit.org/show_bug.cgi?id=155068
Reviewed by Alex Christensen.
Source/WebCore:
Test: storage/indexeddb/modern/deleteindex-4-private.html
* Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
(WebCore::IDBServer::MemoryBackingStoreTransaction::indexDeleted):
LayoutTests:
* storage/indexeddb/modern/deleteindex-4-private-expected.txt: Added.
* storage/indexeddb/modern/deleteindex-4-private.html: Added.
* storage/indexeddb/modern/resources/deleteindex-4.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreModulesindexeddbserverMemoryBackingStoreTransactioncpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmoderndeleteindex4privateexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmoderndeleteindex4privatehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmodernresourcesdeleteindex4js">releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/resources/deleteindex-4.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199409 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 06:41:58 UTC (rev 199409)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-17 Brady Eidson <beidson@apple.com>
+
+ Don't try to restore deleted MemoryIndexes if their owning object store is not restored.
+ https://bugs.webkit.org/show_bug.cgi?id=155068
+
+ Reviewed by Alex Christensen.
+
+ * storage/indexeddb/modern/deleteindex-4-private-expected.txt: Added.
+ * storage/indexeddb/modern/deleteindex-4-private.html: Added.
+ * storage/indexeddb/modern/resources/deleteindex-4.js: Added.
+
</ins><span class="cx"> 2016-03-16 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Directly composited image layers need pixelsnapping.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmoderndeleteindex4privateexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private-expected.txt (0 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private-expected.txt 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+This tests deleting an object store with an index, when aborting the transaction would *not* restore that object store, and makes sure the transaction successfully 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;
+
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+first put success
+second put success
+Aborted!
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmoderndeleteindex4privatehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private.html (0 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/deleteindex-4-private.html 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<html>
+<head>
+<script>
+enablePrivateBrowsing = true;
+</script>
+<script src="../../../resources/js-test.js"></script>
+<script src="../resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/deleteindex-4.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsstorageindexeddbmodernresourcesdeleteindex4js"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/resources/deleteindex-4.js (0 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/resources/deleteindex-4.js (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/storage/indexeddb/modern/resources/deleteindex-4.js 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+description("This tests deleting an object store with an index, when aborting the transaction would *not* restore that object store, and makes sure the transaction successfully aborts");
+
+indexedDBTest(prepareDatabase);
+
+function prepareDatabase(event)
+{
+ tx = event.target.transaction;
+ tx.onabort = function() {
+ debug("Aborted!");
+ finishJSTest();
+ }
+ tx.onerror = function() {
+ debug("Unexpected error");
+ finishJSTest();
+ }
+ tx.oncomplete = function() {
+ debug("Unexpected completion");
+ finishJSTest();
+ }
+
+ db = event.target.result;
+ db.createObjectStore("name");
+ db.deleteObjectStore("name");
+
+ os = db.createObjectStore("name");
+ os.createIndex("index", "foo");
+ os.put("bar", "foo").onsuccess = function() {
+ debug("first put success");
+ db.deleteObjectStore("name");
+ db.createObjectStore("name").put("bar", "foo").onsuccess = function() {
+ debug("second put success");
+ tx.abort();
+ }
+ }
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199409 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:41:58 UTC (rev 199409)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-17 Brady Eidson <beidson@apple.com>
+
+ Don't try to restore deleted MemoryIndexes if their owning object store is not restored.
+ https://bugs.webkit.org/show_bug.cgi?id=155068
+
+ Reviewed by Alex Christensen.
+
+ Test: storage/indexeddb/modern/deleteindex-4-private.html
+
+ * Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp:
+ (WebCore::IDBServer::MemoryBackingStoreTransaction::indexDeleted):
+
</ins><span class="cx"> 2016-03-16 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Directly composited image layers need pixelsnapping.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreModulesindexeddbserverMemoryBackingStoreTransactioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp (199409 => 199410)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2016-04-13 06:41:58 UTC (rev 199409)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/Modules/indexeddb/server/MemoryBackingStoreTransaction.cpp 2016-04-13 06:44:02 UTC (rev 199410)
</span><span class="lines">@@ -94,6 +94,14 @@
</span><span class="cx"> {
</span><span class="cx"> m_indexes.remove(&index.get());
</span><span class="cx">
</span><ins>+ // If this MemoryIndex belongs to an object store that will not get restored if this transaction aborts,
+ // then we can forget about it altogether.
+ auto& objectStore = index->objectStore();
+ if (auto deletedObjectStore = m_deletedObjectStores.get(objectStore.info().name())) {
+ if (deletedObjectStore != &objectStore)
+ return;
+ }
+
</ins><span class="cx"> auto addResult = m_deletedIndexes.add(index->info().name(), nullptr);
</span><span class="cx"> if (addResult.isNewEntry)
</span><span class="cx"> addResult.iterator->value = WTFMove(index);
</span></span></pre>
</div>
</div>
</body>
</html>