<!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>[205042] 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/205042">205042</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 13:59:13 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Test and address issues in IndexedDB.requestData
https://bugs.webkit.org/show_bug.cgi?id=161178
<rdar://problem/28002467>
Reviewed by Brian Burg.
Source/WebCore:
Test: inspector/indexeddb/requestData.html
* inspector/InspectorIndexedDBAgent.cpp:
(idbKeyRangeFromKeyRange):
Parsing was too strict. "lower" and "upper" keys are optional.
(WebCore::DataLoader::execute):
Ensure the skip count is passed forward.
LayoutTests:
* inspector/indexeddb/requestData-expected.txt: Added.
* inspector/indexeddb/requestData.html: 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="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorindexeddbrequestDataexpectedtxt">trunk/LayoutTests/inspector/indexeddb/requestData-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorindexeddbrequestDatahtml">trunk/LayoutTests/inspector/indexeddb/requestData.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205041 => 205042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
+++ trunk/LayoutTests/ChangeLog 2016-08-26 20:59:13 UTC (rev 205042)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Test and address issues in IndexedDB.requestData
+ https://bugs.webkit.org/show_bug.cgi?id=161178
+ <rdar://problem/28002467>
+
+ Reviewed by Brian Burg.
+
+ * inspector/indexeddb/requestData-expected.txt: Added.
+ * inspector/indexeddb/requestData.html: Added.
+
</ins><span class="cx"> 2016-08-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Provide a way to clear an IndexedDB object store
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbrequestDataexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/indexeddb/requestData-expected.txt (0 => 205042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/requestData-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/indexeddb/requestData-expected.txt 2016-08-26 20:59:13 UTC (rev 205042)
</span><span class="lines">@@ -0,0 +1,128 @@
</span><ins>+CONSOLE MESSAGE: line 18: Created Database 'Database1'
+CONSOLE MESSAGE: line 18: Created Database 'Database2'
+CONSOLE MESSAGE: line 18: Created Database 'Database3'
+
+== Running test suite: IndexedDB.requestData
+-- Running test case: ClearDatabases
+-- Running test case: RequestDataBasic
+-- No Index
+PASS: Should be 4 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 1
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+PASS: Primary key should be ordered by primary key: 2
+PASS: Value should be a remote object for: 'Jamming Peacock'
+PASS: Primary key should be ordered by primary key: 3
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+-- Name Index
+PASS: Should be 4 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by name: 3
+PASS: Key should be ordered by name: 'Bustling Badger'
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by name: 2
+PASS: Key should be ordered by name: 'Jamming Peacock'
+PASS: Value should be a remote object for: 'Jamming Peacock'
+PASS: Primary key should be ordered by name: 4
+PASS: Key should be ordered by name: 'Monstrous Beaver'
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+PASS: Primary key should be ordered by name: 1
+PASS: Key should be ordered by name: 'Thirsty Hampster'
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+-- Email Index
+PASS: Should be 4 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by email: 3
+PASS: Key should be ordered by email: 'badger@webkit.org'
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by email: 4
+PASS: Key should be ordered by email: 'beaver@webkit.org'
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+FAIL: Primary key should be ordered by email: 2
+PASS: Key should be ordered by email: 'hampster@webkit.org'
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+FAIL: Primary key should be ordered by email: 1
+PASS: Key should be ordered by email: 'peacock@webkit.org'
+PASS: Value should be a remote object for: 'Jamming Peacock'
+
+-- Running test case: RequestDataPagination
+-- Page 1
+PASS: Entries length should match page size.
+PASS: Should have more entries.
+PASS: Primary key should be ordered by primary key: 1
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+PASS: Primary key should be ordered by primary key: 2
+PASS: Value should be a remote object for: 'Jamming Peacock'
+-- Page 2
+PASS: Entries length should match page size.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 3
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+
+-- Running test case: RequestDataKeyRangeBounds
+-- Keys >= 'M'
+-- Lower Bound: 'M' (closed)
+-- Upper Bound: -
+PASS: Should be 2 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+PASS: Primary key should be ordered by primary key: 1
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+-- Keys > 'M'
+-- Lower Bound: 'M' (open)
+-- Upper Bound: -
+PASS: Should be 2 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+PASS: Primary key should be ordered by primary key: 1
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+-- Keys > 'Monstrous Beaver'
+-- Lower Bound: 'Monstrous Beaver' (open)
+-- Upper Bound: -
+PASS: Should be 1 entry.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 1
+PASS: Value should be a remote object for: 'Thirsty Hampster'
+-- Keys <= 'M'
+-- Lower Bound: -
+-- Upper Bound: 'M' (closed)
+PASS: Should be 2 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 3
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by primary key: 2
+PASS: Value should be a remote object for: 'Jamming Peacock'
+-- Keys <= 'Monstrous Beaver'
+-- Lower Bound: -
+-- Upper Bound: 'Monstrous Beaver' (closed)
+PASS: Should be 3 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 3
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by primary key: 2
+PASS: Value should be a remote object for: 'Jamming Peacock'
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+-- Keys < 'M'
+-- Lower Bound: -
+-- Upper Bound: 'M' (open)
+PASS: Should be 2 entries.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 3
+PASS: Value should be a remote object for: 'Bustling Badger'
+PASS: Primary key should be ordered by primary key: 2
+PASS: Value should be a remote object for: 'Jamming Peacock'
+-- 'Monstrous Beaver' <= Key <= 'Monstrous Beaver'
+-- Lower Bound: 'Monstrous Beaver' (closed)
+-- Upper Bound: 'Monstrous Beaver' (closed)
+PASS: Should be 1 entry.
+PASS: Should not have more entries.
+PASS: Primary key should be ordered by primary key: 4
+PASS: Value should be a remote object for: 'Monstrous Beaver'
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorindexeddbrequestDatahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/indexeddb/requestData.html (0 => 205042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/indexeddb/requestData.html (rev 0)
+++ trunk/LayoutTests/inspector/indexeddb/requestData.html 2016-08-26 20:59:13 UTC (rev 205042)
</span><span class="lines">@@ -0,0 +1,343 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="resources/utilities.js"></script>
+<script>
+function test()
+{
+ function objectPropertyPreview(remoteObject, name) {
+ for (let propertyPreview of remoteObject.preview.propertyPreviews) {
+ if (propertyPreview.name === name)
+ return propertyPreview;
+ }
+ return null;
+ }
+
+ let suite = InspectorTest.createAsyncSuite("IndexedDB.requestData");
+
+ suite.addTestCase({
+ name: "ClearDatabases",
+ description: "Remove any existing IndexedDB databases.",
+ test: (resolve, reject) => {
+ // FIXME: Remove any existing IndexedDB databases that might exist to workaround:
+ // <https://webkit.org/b/148006> Each test should run with its own clean data store
+ IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, (error, names) => {
+ InspectorTest.evaluateInPage("deleteDatabaseNames(" + JSON.stringify(names) + ")", resolve);
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "RequestDataBasic",
+ description: "Request data for an object store with different indexes.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createDatabaseWithStores('Database1', 1)");
+ IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "Database1", (error, database) => {
+ InspectorTest.expectNoError(error);
+
+ let [emptyObjectStore, reviewersObjectStore, statsObjectStore] = database.objectStores;
+ const securityOrigin = WebInspector.frameResourceManager.mainFrame.securityOrigin;
+ const skipCount = 0;
+ const pageSize = 10;
+
+ let indexName = "";
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.log("-- No Index");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 4, "Should be 4 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [1, 2, 3, 4];
+ let expectedNamesOrderedByPrimaryKey = ["Thirsty Hampster", "Jamming Peacock", "Bustling Badger", "Monstrous Beaver"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ indexName = "Name Index";
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.log("-- Name Index");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 4, "Should be 4 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 2, 4, 1];
+ let expectedKeysOrderedByName = ["Bustling Badger", "Jamming Peacock", "Monstrous Beaver", "Thirsty Hampster"];
+ let expectedNamesOrderedByName = expectedKeysOrderedByName;
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let key = WebInspector.RemoteObject.fromPayload(entryPayload.key);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by name: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(key.value === expectedKeysOrderedByName[i], `Key should be ordered by name: '${expectedKeysOrderedByName[i]}'`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByName[i], `Value should be a remote object for: '${expectedNamesOrderedByName[i]}'`);
+ }
+ });
+
+ indexName = "Email Index";
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.log("-- Email Index");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 4, "Should be 4 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 4, 2, 1];
+ let expectedKeysOrderedByEmail = ["badger@webkit.org", "beaver@webkit.org", "hampster@webkit.org", "peacock@webkit.org"];
+ let expectedNamesOrderedByEmail = ["Bustling Badger", "Monstrous Beaver", "Thirsty Hampster", "Jamming Peacock"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let key = WebInspector.RemoteObject.fromPayload(entryPayload.key);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by email: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(key.value === expectedKeysOrderedByEmail[i], `Key should be ordered by email: '${expectedKeysOrderedByEmail[i]}'`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByEmail[i], `Value should be a remote object for: '${expectedNamesOrderedByEmail[i]}'`);
+ }
+ });
+
+ InspectorBackend.runAfterPendingDispatches(resolve);
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "RequestDataPagination",
+ description: "Request data for an object store with paginated requests.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createDatabaseWithStores('Database2', 1)");
+ IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "Database2", (error, database) => {
+ InspectorTest.expectNoError(error);
+
+ let [emptyObjectStore, reviewersObjectStore, statsObjectStore] = database.objectStores;
+ const securityOrigin = WebInspector.frameResourceManager.mainFrame.securityOrigin;
+ const indexName = "";
+ const pageSize = 2;
+
+ let skipCount = 0;
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.log("-- Page 1");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Entries length should match page size.");
+ InspectorTest.expectThat(hasMore, "Should have more entries.");
+
+ let expectedPrimaryKeyOrder = [1, 2];
+ let expectedNamesOrderedByPrimaryKey = ["Thirsty Hampster", "Jamming Peacock"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ skipCount = 2;
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.log("-- Page 2");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Entries length should match page size.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 4];
+ let expectedNamesOrderedByPrimaryKey = ["Bustling Badger", "Monstrous Beaver"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ InspectorBackend.runAfterPendingDispatches(resolve);
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "RequestDataKeyRangeBounds",
+ description: "Request key range bounded data for an object store.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createDatabaseWithStores('Database3', 1)");
+ IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "Database3", (error, database) => {
+ InspectorTest.expectNoError(error);
+
+ let [emptyObjectStore, reviewersObjectStore, statsObjectStore] = database.objectStores;
+ const securityOrigin = WebInspector.frameResourceManager.mainFrame.securityOrigin;
+ const indexName = "Name Index";
+ const skipCount = 0;
+ const pageSize = 10;
+
+ function stringKeyWithString(string) {
+ return {type: "string", string};
+ }
+
+ // Index: Name Index
+ // Keys: [3, 2, 4, 1]
+ // Values: ["Bustling Badger", "Jamming Peacock", "Monstrous Beaver", "Thirsty Hampster"];
+
+ // Keys >= "M"
+ let keyRange = {lower: stringKeyWithString("M"), lowerOpen: false, upperOpen: true};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys >= 'M'");
+ InspectorTest.log("-- Lower Bound: 'M' (closed)");
+ InspectorTest.log("-- Upper Bound: -");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Should be 2 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [4, 1];
+ let expectedNamesOrderedByPrimaryKey = ["Monstrous Beaver", "Thirsty Hampster"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // Keys > "M"
+ keyRange = {lower: stringKeyWithString("M"), lowerOpen: true, upperOpen: true};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys > 'M'");
+ InspectorTest.log("-- Lower Bound: 'M' (open)");
+ InspectorTest.log("-- Upper Bound: -");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Should be 2 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [4, 1];
+ let expectedNamesOrderedByPrimaryKey = ["Monstrous Beaver", "Thirsty Hampster"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // Keys > "Monstrous Beaver"
+ keyRange = {lower: stringKeyWithString("Monstrous Beaver"), lowerOpen: true, upperOpen: true};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys > 'Monstrous Beaver'");
+ InspectorTest.log("-- Lower Bound: 'Monstrous Beaver' (open)");
+ InspectorTest.log("-- Upper Bound: -");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 1, "Should be 1 entry.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [1];
+ let expectedNamesOrderedByPrimaryKey = ["Thirsty Hampster"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // Keys <= "M"
+ keyRange = {upper: stringKeyWithString("M"), lowerOpen: true, upperOpen: false};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys <= 'M'");
+ InspectorTest.log("-- Lower Bound: -");
+ InspectorTest.log("-- Upper Bound: 'M' (closed)");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Should be 2 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 2];
+ let expectedNamesOrderedByPrimaryKey = ["Bustling Badger", "Jamming Peacock"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // Keys <= "Monstrous Beaver"
+ keyRange = {upper: stringKeyWithString("Monstrous Beaver"), lowerOpen: true, upperOpen: false};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys <= 'Monstrous Beaver'");
+ InspectorTest.log("-- Lower Bound: -");
+ InspectorTest.log("-- Upper Bound: 'Monstrous Beaver' (closed)");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 3, "Should be 3 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 2, 4];
+ let expectedNamesOrderedByPrimaryKey = ["Bustling Badger", "Jamming Peacock", "Monstrous Beaver"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // Keys < "M"
+ keyRange = {upper: stringKeyWithString("M"), lowerOpen: true, upperOpen: true};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- Keys < 'M'");
+ InspectorTest.log("-- Lower Bound: -");
+ InspectorTest.log("-- Upper Bound: 'M' (open)");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 2, "Should be 2 entries.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [3, 2];
+ let expectedNamesOrderedByPrimaryKey = ["Bustling Badger", "Jamming Peacock"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ // "Monstrous Beaver" <= Key <= "Monstrous Beaver"
+ keyRange = {lower: stringKeyWithString("Monstrous Beaver"), upper: stringKeyWithString("Monstrous Beaver"), lowerOpen: false, upperOpen: false};
+ IndexedDBAgent.requestData(securityOrigin, database.name, reviewersObjectStore.name, indexName, skipCount, pageSize, keyRange, (error, entries, hasMore) => {
+ InspectorTest.log("-- 'Monstrous Beaver' <= Key <= 'Monstrous Beaver'");
+ InspectorTest.log("-- Lower Bound: 'Monstrous Beaver' (closed)");
+ InspectorTest.log("-- Upper Bound: 'Monstrous Beaver' (closed)");
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === 1, "Should be 1 entry.");
+ InspectorTest.expectThat(!hasMore, "Should not have more entries.");
+
+ let expectedPrimaryKeyOrder = [4];
+ let expectedNamesOrderedByPrimaryKey = ["Monstrous Beaver"];
+ for (let i = 0; i < entries.length; ++i) {
+ let entryPayload = entries[i];
+ let primaryKey = WebInspector.RemoteObject.fromPayload(entryPayload.primaryKey);
+ let value = WebInspector.RemoteObject.fromPayload(entryPayload.value);
+ InspectorTest.expectThat(primaryKey.value === expectedPrimaryKeyOrder[i], `Primary key should be ordered by primary key: ${expectedPrimaryKeyOrder[i]}`);
+ InspectorTest.expectThat(objectPropertyPreview(value, "name").value === expectedNamesOrderedByPrimaryKey[i], `Value should be a remote object for: '${expectedNamesOrderedByPrimaryKey[i]}'`);
+ }
+ });
+
+ InspectorBackend.runAfterPendingDispatches(resolve);
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205041 => 205042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 20:59:13 UTC (rev 205042)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Test and address issues in IndexedDB.requestData
+ https://bugs.webkit.org/show_bug.cgi?id=161178
+ <rdar://problem/28002467>
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/indexeddb/requestData.html
+
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (idbKeyRangeFromKeyRange):
+ Parsing was too strict. "lower" and "upper" keys are optional.
+
+ (WebCore::DataLoader::execute):
+ Ensure the skip count is passed forward.
+
</ins><span class="cx"> 2016-08-25 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Provide a way to clear an IndexedDB object store
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (205041 => 205042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-08-26 20:59:09 UTC (rev 205041)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-08-26 20:59:13 UTC (rev 205042)
</span><span class="lines">@@ -335,19 +335,21 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<IDBKeyRange> idbKeyRangeFromKeyRange(const InspectorObject* keyRange)
</span><span class="cx"> {
</span><ins>+ RefPtr<IDBKey> idbLower;
</ins><span class="cx"> RefPtr<InspectorObject> lower;
</span><del>- if (!keyRange->getObject(ASCIILiteral("lower"), lower))
- return nullptr;
- RefPtr<IDBKey> idbLower = idbKeyFromInspectorObject(lower.get());
- if (!idbLower)
- return nullptr;
</del><ins>+ if (keyRange->getObject(ASCIILiteral("lower"), lower)) {
+ idbLower = idbKeyFromInspectorObject(lower.get());
+ if (!idbLower)
+ return nullptr;
+ }
</ins><span class="cx">
</span><ins>+ RefPtr<IDBKey> idbUpper;
</ins><span class="cx"> RefPtr<InspectorObject> upper;
</span><del>- if (!keyRange->getObject(ASCIILiteral("upper"), upper))
- return nullptr;
- RefPtr<IDBKey> idbUpper = idbKeyFromInspectorObject(upper.get());
- if (!idbUpper)
- return nullptr;
</del><ins>+ if (keyRange->getObject(ASCIILiteral("upper"), upper)) {
+ idbUpper = idbKeyFromInspectorObject(upper.get());
+ if (!idbUpper)
+ return nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> bool lowerOpen;
</span><span class="cx"> if (!keyRange->getBoolean(ASCIILiteral("lowerOpen"), lowerOpen))
</span><span class="lines">@@ -504,7 +506,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
</del><ins>+ Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), m_skipCount, m_pageSize);
</ins><span class="cx"> idbRequest->addEventListener(eventNames().successEvent, WTFMove(openCursorCallback), false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>