Diff
Modified: trunk/LayoutTests/ChangeLog (205040 => 205041)
--- trunk/LayoutTests/ChangeLog 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/LayoutTests/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
@@ -1,5 +1,16 @@
2016-08-25 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: Provide a way to clear an IndexedDB object store
+ https://bugs.webkit.org/show_bug.cgi?id=161167
+ <rdar://problem/27996932>
+
+ Reviewed by Brian Burg.
+
+ * inspector/indexeddb/clearObjectStore-expected.txt: Added.
+ * inspector/indexeddb/clearObjectStore.html: Added.
+
+2016-08-25 Joseph Pecoraro <pecor...@apple.com>
+
Web Inspector: Test IndexedDB.requestDatabase
https://bugs.webkit.org/show_bug.cgi?id=161122
Added: trunk/LayoutTests/inspector/indexeddb/clearObjectStore-expected.txt (0 => 205041)
--- trunk/LayoutTests/inspector/indexeddb/clearObjectStore-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/indexeddb/clearObjectStore-expected.txt 2016-08-26 20:59:09 UTC (rev 205041)
@@ -0,0 +1,19 @@
+CONSOLE MESSAGE: line 18: Created Database 'CompleteDatabase'
+CONSOLE MESSAGE: line 9: Created Database 'EmptyDatabase'
+
+== Running test suite: IndexedDB.clearObjectStore
+-- Running test case: ClearDatabases
+-- Running test case: CreateDatabaseAndClearObjectStore
+PASS: 'Empty' object store should always be empty.
+PASS: 'Reviewers' object store should start with 4 entries.
+PASS: 'Stats' object store should start with 4 entries.
+PASS: 'Empty' object store should always be empty.
+PASS: 'Reviewers' object store should have been cleared.
+PASS: 'Stats' object store remain unchanged with 4 entries.
+PASS: 'Empty' object store should always be empty.
+PASS: 'Reviewers' object store should have been cleared.
+PASS: 'Stats' object store should have been cleared.
+
+-- Running test case: NoSuchObjectStore
+PASS: Should be an error attempting to clear an object store that does not exist.
+
Added: trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html (0 => 205041)
--- trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html (rev 0)
+++ trunk/LayoutTests/inspector/indexeddb/clearObjectStore.html 2016-08-26 20:59:09 UTC (rev 205041)
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("IndexedDB.clearObjectStore");
+
+ 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: "CreateDatabaseAndClearObjectStore",
+ description: "Ensure that clearing an object store clears entries in that object store.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createDatabaseWithStores('CompleteDatabase', 1)");
+ IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "CompleteDatabase", (error, database) => {
+ InspectorTest.expectNoError(error);
+
+ function expectObjectStoreEntryCount(objectStore, expectedCount, message) {
+ const securityOrigin = WebInspector.frameResourceManager.mainFrame.securityOrigin;
+ const indexName = "";
+ const skipCount = 0;
+ const pageSize = 10;
+ IndexedDBAgent.requestData(securityOrigin, database.name, objectStore.name, indexName, skipCount, pageSize, (error, entries, hasMore) => {
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(entries.length === expectedCount, message);
+ });
+ }
+
+ let securityOrigin = WebInspector.frameResourceManager.mainFrame.securityOrigin;
+ let [emptyObjectStore, reviewersObjectStore, statsObjectStore] = database.objectStores;
+
+ expectObjectStoreEntryCount(emptyObjectStore, 0, "'Empty' object store should always be empty.");
+ expectObjectStoreEntryCount(reviewersObjectStore, 4, "'Reviewers' object store should start with 4 entries.");
+ expectObjectStoreEntryCount(statsObjectStore, 4, "'Stats' object store should start with 4 entries.");
+
+ IndexedDBAgent.clearObjectStore(securityOrigin, database.name, reviewersObjectStore.name, (error) => {
+ InspectorTest.expectNoError(error);
+ });
+
+ expectObjectStoreEntryCount(emptyObjectStore, 0, "'Empty' object store should always be empty.");
+ expectObjectStoreEntryCount(reviewersObjectStore, 0, "'Reviewers' object store should have been cleared.");
+ expectObjectStoreEntryCount(statsObjectStore, 4, "'Stats' object store remain unchanged with 4 entries.");
+
+ IndexedDBAgent.clearObjectStore(securityOrigin, database.name, statsObjectStore.name, (error) => {
+ InspectorTest.expectNoError(error);
+ });
+
+ expectObjectStoreEntryCount(emptyObjectStore, 0, "'Empty' object store should always be empty.");
+ expectObjectStoreEntryCount(reviewersObjectStore, 0, "'Reviewers' object store should have been cleared.");
+ expectObjectStoreEntryCount(statsObjectStore, 0, "'Stats' object store should have been cleared.");
+
+ InspectorBackend.runAfterPendingDispatches(resolve);
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "NoSuchObjectStore",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createEmptyDatabase('EmptyDatabase', 1)");
+ IndexedDBAgent.requestDatabase(WebInspector.frameResourceManager.mainFrame.securityOrigin, "EmptyDatabase", (error, database) => {
+ IndexedDBAgent.clearObjectStore(WebInspector.frameResourceManager.mainFrame.securityOrigin, database.name, "NoSuchObjectStore", (error) => {
+ InspectorTest.expectThat(error, "Should be an error attempting to clear an object store that does not exist.");
+ resolve();
+ });
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body _onload_="runTest()">
+</body>
+</html>
Modified: trunk/Source/_javascript_Core/ChangeLog (205040 => 205041)
--- trunk/Source/_javascript_Core/ChangeLog 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
@@ -1,3 +1,14 @@
+2016-08-25 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Provide a way to clear an IndexedDB object store
+ https://bugs.webkit.org/show_bug.cgi?id=161167
+ <rdar://problem/27996932>
+
+ Reviewed by Brian Burg.
+
+ * inspector/protocol/IndexedDB.json:
+ Cleanup the protocol file.
+
2016-08-26 Devin Rousso <dcrousso+web...@gmail.com>
Web Inspector: Some CSS selectors in the UI aren't escaped
Modified: trunk/Source/_javascript_Core/inspector/protocol/IndexedDB.json (205040 => 205041)
--- trunk/Source/_javascript_Core/inspector/protocol/IndexedDB.json 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/_javascript_Core/inspector/protocol/IndexedDB.json 2016-08-26 20:59:09 UTC (rev 205041)
@@ -90,6 +90,7 @@
},
{
"name": "requestDatabaseNames",
+ "description": "Requests database names for given security origin.",
"async": true,
"parameters": [
{ "name": "securityOrigin", "type": "string", "description": "Security origin." }
@@ -96,11 +97,11 @@
],
"returns": [
{ "name": "databaseNames", "type": "array", "items": { "type": "string" }, "description": "Database names for origin." }
- ],
- "description": "Requests database names for given security origin."
+ ]
},
{
"name": "requestDatabase",
+ "description": "Requests database with given name in given frame.",
"async": true,
"parameters": [
{ "name": "securityOrigin", "type": "string", "description": "Security origin." },
@@ -108,11 +109,11 @@
],
"returns": [
{ "name": "databaseWithObjectStores", "$ref": "DatabaseWithObjectStores", "description": "Database with an array of object stores." }
- ],
- "description": "Requests database with given name in given frame."
+ ]
},
{
"name": "requestData",
+ "description": "Requests data from object store or index.",
"async": true,
"parameters": [
{ "name": "securityOrigin", "type": "string", "description": "Security origin." },
@@ -126,20 +127,17 @@
"returns": [
{ "name": "objectStoreDataEntries", "type": "array", "items": { "$ref": "DataEntry" }, "description": "Array of object store data entries." },
{ "name": "hasMore", "type": "boolean", "description": "If true, there are more entries to fetch in the given range." }
- ],
- "description": "Requests data from object store or index."
+ ]
},
{
"name": "clearObjectStore",
+ "description": "Clears all entries from an object store.",
"async": true,
"parameters": [
{ "name": "securityOrigin", "type": "string", "description": "Security origin." },
{ "name": "databaseName", "type": "string", "description": "Database name." },
{ "name": "objectStoreName", "type": "string", "description": "Object store name." }
- ],
- "returns": [
- ],
- "description": "Clears all entries from an object store."
+ ]
}
]
}
Modified: trunk/Source/WebCore/ChangeLog (205040 => 205041)
--- trunk/Source/WebCore/ChangeLog 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
@@ -1,3 +1,17 @@
+2016-08-25 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Provide a way to clear an IndexedDB object store
+ https://bugs.webkit.org/show_bug.cgi?id=161167
+ <rdar://problem/27996932>
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/indexeddb/clearObjectStore.html
+
+ * inspector/InspectorIndexedDBAgent.cpp:
+ Make the transaction for clearing an object store readwrite
+ instead of readonly, and activate it.
+
2016-08-26 Chris Dumez <cdu...@apple.com>
Calling crossOriginWindow.toString() should not be allowed
Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (205040 => 205041)
--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-08-26 20:59:09 UTC (rev 205041)
@@ -477,6 +477,7 @@
m_requestCallback->sendFailure("Could not get transaction");
return;
}
+
RefPtr<IDBObjectStore> idbObjectStore = objectStoreForTransaction(idbTransaction.get(), m_objectStoreName);
if (!idbObjectStore) {
m_requestCallback->sendFailure("Could not get object store");
@@ -706,7 +707,7 @@
if (!requestCallback().isActive())
return;
- RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(&database, m_objectStoreName);
+ RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(&database, m_objectStoreName, IDBTransaction::modeReadWrite());
if (!idbTransaction) {
m_requestCallback->sendFailure("Could not get transaction");
return;
@@ -718,6 +719,7 @@
return;
}
+ TransactionActivator activator(idbTransaction.get());
ExceptionCodeWithMessage ec;
JSC::ExecState* exec = context() ? context()->execState() : nullptr;
RefPtr<IDBRequest> idbRequest = exec ? idbObjectStore->clear(*exec, ec) : nullptr;
@@ -726,6 +728,7 @@
m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), ec.code));
return;
}
+
idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback.copyRef()), false);
}
Modified: trunk/Source/WebInspectorUI/ChangeLog (205040 => 205041)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-26 20:59:09 UTC (rev 205041)
@@ -1,3 +1,24 @@
+2016-08-25 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Provide a way to clear an IndexedDB object store
+ https://bugs.webkit.org/show_bug.cgi?id=161167
+ <rdar://problem/27996932>
+
+ Reviewed by Brian Burg.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ "Clear object store".
+
+ * UserInterface/Controllers/StorageManager.js:
+ (WebInspector.StorageManager.prototype.clearObjectStore):
+ Provide a wrapper for clearing an object store.
+
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+ (WebInspector.IndexedDatabaseObjectStoreContentView):
+ (WebInspector.IndexedDatabaseObjectStoreContentView.prototype.get navigationItems):
+ (WebInspector.IndexedDatabaseObjectStoreContentView.prototype._clearButtonClicked):
+ Add a navigation button on ObjectStore content views to clear the object store.
+
2016-08-26 Devin Rousso <dcrousso+web...@gmail.com>
Web Inspector: Some CSS selectors in the UI aren't escaped
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (205040 => 205041)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-26 20:59:09 UTC (rev 205041)
@@ -144,6 +144,7 @@
localizedStrings["Clear Timeline"] = "Clear Timeline";
localizedStrings["Clear focus"] = "Clear focus";
localizedStrings["Clear log (%s or %s)"] = "Clear log (%s or %s)";
+localizedStrings["Clear object store"] = "Clear object store";
localizedStrings["Clear samples"] = "Clear samples";
localizedStrings["Clear watch expressions"] = "Clear watch expressions";
localizedStrings["Click Listener"] = "Click Listener";
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js (205040 => 205041)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2016-08-26 20:59:09 UTC (rev 205041)
@@ -138,8 +138,6 @@
this.dispatchEventToListeners(WebInspector.StorageManager.Event.DOMStorageObjectWasInspected, {domStorage});
}
- // Protected
-
requestIndexedDatabaseData(objectStore, objectStoreIndex, startEntryIndex, maximumEntryCount, callback)
{
console.assert(window.IndexedDBAgent);
@@ -178,6 +176,15 @@
IndexedDBAgent.requestData.invoke(requestArguments, processData);
}
+ clearObjectStore(objectStore)
+ {
+ let securityOrigin = objectStore.parentDatabase.securityOrigin;
+ let databaseName = objectStore.parentDatabase.name;
+ let objectStoreName = objectStore.name;
+
+ IndexedDBAgent.clearObjectStore(securityOrigin, databaseName, objectStoreName);
+ }
+
// Private
_domStorageForIdentifier(id)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (205040 => 205041)
--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-08-26 20:59:04 UTC (rev 205040)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-08-26 20:59:09 UTC (rev 205041)
@@ -79,6 +79,9 @@
this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
+
+ this._clearButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-clear", WebInspector.UIString("Clear object store"), "Images/NavigationItemTrash.svg", 15, 15);
+ this._clearButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearButtonClicked, this);
}
// Public
@@ -85,7 +88,7 @@
get navigationItems()
{
- return [this._refreshButtonNavigationItem];
+ return [this._refreshButtonNavigationItem, this._clearButtonNavigationItem];
}
closed()
@@ -160,4 +163,10 @@
this._reset();
this._fetchMoreData();
}
+
+ _clearButtonClicked()
+ {
+ WebInspector.storageManager.clearObjectStore(this._objectStore);
+ this._reset();
+ }
};
