Diff
Modified: trunk/LayoutTests/ChangeLog (112649 => 112650)
--- trunk/LayoutTests/ChangeLog 2012-03-30 10:06:49 UTC (rev 112649)
+++ trunk/LayoutTests/ChangeLog 2012-03-30 10:14:15 UTC (rev 112650)
@@ -1,3 +1,12 @@
+2012-03-29 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Take IndexedDB support out of experiments.
+ https://bugs.webkit.org/show_bug.cgi?id=82635
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/indexeddb/resources-panel.html: Renamed from LayoutTests/http/tests/inspector/indexeddb/resources-panel.html_disabled.
+
2012-03-30 Alexander Pavlov <[email protected]>
[Chromium] Unreviewed, more CRASH expectations for BUGWK82505 added.
Copied: trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html (from rev 112649, trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html_disabled) (0 => 112650)
--- trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html 2012-03-30 10:14:15 UTC (rev 112650)
@@ -0,0 +1,124 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+function test()
+{
+ var mainFrameId = WebInspector.resourceTreeModel.mainFrame.id;
+ var indexedDBModel;
+ var withoutIndexedDBURL = "http://localhost:8000/inspector/indexeddb/resources/without-indexed-db.html";
+ var originalURL = "http://127.0.0.1:8000/inspector/indexeddb/resources-panel.html";
+ var databaseName = "testDatabase";
+ var objectStoreName = "testObjectStore";
+ var indexName = "testIndexName";
+
+ function createDatabase(callback)
+ {
+ InspectorTest.createDatabase(mainFrameId, databaseName, step2);
+
+ function step2()
+ {
+ InspectorTest.createObjectStore(mainFrameId, databaseName, objectStoreName, "", false, step3);
+ }
+
+ function step3()
+ {
+ InspectorTest.createObjectStoreIndex(mainFrameId, databaseName, objectStoreName, indexName, "", false, false, callback);
+ }
+ }
+
+ function deleteDatabase(callback)
+ {
+ InspectorTest.deleteObjectStoreIndex(mainFrameId, databaseName, objectStoreName, indexName, step2);
+
+ function step2()
+ {
+ InspectorTest.deleteObjectStore(mainFrameId, databaseName, objectStoreName, step3);
+ }
+
+ function step3()
+ {
+ InspectorTest.deleteDatabase(mainFrameId, databaseName, callback);
+ }
+ }
+
+ WebInspector.showPanel("resources");
+
+ InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBAdded", indexedDBAdded, true);
+ function indexedDBAdded()
+ {
+ InspectorTest.addResult("Database added.");
+ }
+
+ InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBRemoved", indexedDBRemoved, true);
+ function indexedDBRemoved()
+ {
+ InspectorTest.addResult("Database removed.");
+ }
+
+ InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBLoaded", indexedDBLoaded, true);
+ function indexedDBLoaded()
+ {
+ InspectorTest.addResult("Database loaded.");
+ }
+
+ InspectorTest.addResult("Expanded IndexedDB tree element.");
+ WebInspector.panels.resources.indexedDBListTreeElement.expand();
+
+ InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseNamesLoaded", indexedDBTreeElementExpanded, false);
+ function indexedDBTreeElementExpanded()
+ {
+ indexedDBModel = WebInspector.panels.resources._indexedDBModel;
+ InspectorTest.dumpIndexedDBTree();
+ InspectorTest.addResult("Created database.");
+ createDatabase(databaseCreated);
+ }
+
+ function databaseCreated()
+ {
+ InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseLoaded", databaseLoaded, false);
+ WebInspector.panels.resources.indexedDBListTreeElement.refreshIndexedDB();
+ }
+
+ function databaseLoaded()
+ {
+ InspectorTest.dumpIndexedDBTree();
+ InspectorTest.addResult("Navigated to another security origin.");
+ InspectorTest.navigate(withoutIndexedDBURL, navigatedAway);
+ }
+
+ function navigatedAway()
+ {
+ InspectorTest.dumpIndexedDBTree();
+ InspectorTest.addResult("Navigated back.");
+ InspectorTest.navigate(originalURL, navigatedBack);
+ }
+
+ function navigatedBack()
+ {
+ InspectorTest.dumpIndexedDBTree();
+ InspectorTest.addResult("Deleted database.");
+ deleteDatabase(databaseDeleted);
+ }
+
+ function databaseDeleted()
+ {
+ WebInspector.panels.resources.indexedDBListTreeElement.refreshIndexedDB();
+ InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseNamesLoaded", databaseNamesLoadedAfterDeleting, false);
+ }
+
+ function databaseNamesLoadedAfterDeleting()
+ {
+ InspectorTest.dumpIndexedDBTree();
+ WebInspector.panels.resources.indexedDBListTreeElement.collapse();
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests IndexedDB tree element on resources panel.</p>
+</body>
+</html>
Property changes: trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html
Added: svn:eol-style
Deleted: trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html_disabled (112649 => 112650)
--- trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html_disabled 2012-03-30 10:06:49 UTC (rev 112649)
+++ trunk/LayoutTests/http/tests/inspector/indexeddb/resources-panel.html_disabled 2012-03-30 10:14:15 UTC (rev 112650)
@@ -1,124 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function test()
-{
- var mainFrameId = WebInspector.resourceTreeModel.mainFrame.id;
- var indexedDBModel;
- var withoutIndexedDBURL = "http://localhost:8000/inspector/indexeddb/resources/without-indexed-db.html";
- var originalURL = "http://127.0.0.1:8000/inspector/indexeddb/resources-panel.html";
- var databaseName = "testDatabase";
- var objectStoreName = "testObjectStore";
- var indexName = "testIndexName";
-
- function createDatabase(callback)
- {
- InspectorTest.createDatabase(mainFrameId, databaseName, step2);
-
- function step2()
- {
- InspectorTest.createObjectStore(mainFrameId, databaseName, objectStoreName, "", false, step3);
- }
-
- function step3()
- {
- InspectorTest.createObjectStoreIndex(mainFrameId, databaseName, objectStoreName, indexName, "", false, false, callback);
- }
- }
-
- function deleteDatabase(callback)
- {
- InspectorTest.deleteObjectStoreIndex(mainFrameId, databaseName, objectStoreName, indexName, step2);
-
- function step2()
- {
- InspectorTest.deleteObjectStore(mainFrameId, databaseName, objectStoreName, step3);
- }
-
- function step3()
- {
- InspectorTest.deleteDatabase(mainFrameId, databaseName, callback);
- }
- }
-
- WebInspector.showPanel("resources");
-
- InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBAdded", indexedDBAdded, true);
- function indexedDBAdded()
- {
- InspectorTest.addResult("Database added.");
- }
-
- InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBRemoved", indexedDBRemoved, true);
- function indexedDBRemoved()
- {
- InspectorTest.addResult("Database removed.");
- }
-
- InspectorTest.addSniffer(WebInspector.IndexedDBTreeElement.prototype, "_indexedDBLoaded", indexedDBLoaded, true);
- function indexedDBLoaded()
- {
- InspectorTest.addResult("Database loaded.");
- }
-
- InspectorTest.addResult("Expanded IndexedDB tree element.");
- WebInspector.panels.resources.indexedDBListTreeElement.expand();
-
- InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseNamesLoaded", indexedDBTreeElementExpanded, false);
- function indexedDBTreeElementExpanded()
- {
- indexedDBModel = WebInspector.panels.resources._indexedDBModel;
- InspectorTest.dumpIndexedDBTree();
- InspectorTest.addResult("Created database.");
- createDatabase(databaseCreated);
- }
-
- function databaseCreated()
- {
- InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseLoaded", databaseLoaded, false);
- WebInspector.panels.resources.indexedDBListTreeElement.refreshIndexedDB();
- }
-
- function databaseLoaded()
- {
- InspectorTest.dumpIndexedDBTree();
- InspectorTest.addResult("Navigated to another security origin.");
- InspectorTest.navigate(withoutIndexedDBURL, navigatedAway);
- }
-
- function navigatedAway()
- {
- InspectorTest.dumpIndexedDBTree();
- InspectorTest.addResult("Navigated back.");
- InspectorTest.navigate(originalURL, navigatedBack);
- }
-
- function navigatedBack()
- {
- InspectorTest.dumpIndexedDBTree();
- InspectorTest.addResult("Deleted database.");
- deleteDatabase(databaseDeleted);
- }
-
- function databaseDeleted()
- {
- WebInspector.panels.resources.indexedDBListTreeElement.refreshIndexedDB();
- InspectorTest.addSniffer(WebInspector.IndexedDBDispatcher.prototype, "databaseNamesLoaded", databaseNamesLoadedAfterDeleting, false);
- }
-
- function databaseNamesLoadedAfterDeleting()
- {
- InspectorTest.dumpIndexedDBTree();
- WebInspector.panels.resources.indexedDBListTreeElement.collapse();
- InspectorTest.completeTest();
- }
-}
-
-</script>
-</head>
-<body _onload_="runTest()">
-<p>Tests IndexedDB tree element on resources panel.</p>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (112649 => 112650)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 10:06:49 UTC (rev 112649)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 10:14:15 UTC (rev 112650)
@@ -1,3 +1,18 @@
+2012-03-29 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Take IndexedDB support out of experiments.
+ https://bugs.webkit.org/show_bug.cgi?id=82635
+
+ Reviewed by Pavel Feldman.
+
+ This patch takes inspector IndexedDB support out of experiments and enables tests.
+
+ Test: http/tests/inspector/indexeddb/resources-panel.html
+
+ * inspector/front-end/ResourcesPanel.js:
+ * inspector/front-end/Settings.js:
+ (WebInspector.ExperimentsSettings):
+
2012-03-30 Patrick Gansterer <[email protected]>
Build fix after r112482.
Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (112649 => 112650)
--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2012-03-30 10:06:49 UTC (rev 112649)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2012-03-30 10:14:15 UTC (rev 112650)
@@ -52,10 +52,8 @@
this.databasesListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Databases"), "Databases", ["database-storage-tree-item"]);
this.sidebarTree.appendChild(this.databasesListTreeElement);
- if (WebInspector.experimentsSettings.showIndexedDB.isEnabled()) {
- this.indexedDBListTreeElement = new WebInspector.IndexedDBTreeElement(this);
- this.sidebarTree.appendChild(this.indexedDBListTreeElement);
- }
+ this.indexedDBListTreeElement = new WebInspector.IndexedDBTreeElement(this);
+ this.sidebarTree.appendChild(this.indexedDBListTreeElement);
this.localStorageListTreeElement = new WebInspector.StorageCategoryTreeElement(this, WebInspector.UIString("Local Storage"), "LocalStorage", ["domstorage-storage-tree-item", "local-storage"]);
this.sidebarTree.appendChild(this.localStorageListTreeElement);
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (112649 => 112650)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2012-03-30 10:06:49 UTC (rev 112649)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2012-03-30 10:14:15 UTC (rev 112650)
@@ -175,8 +175,6 @@
// Add currently running experiments here.
this.timelineVerticalOverview = this._createExperiment("timelineStartAtZero", "Enable vertical overview mode in the Timeline panel");
- // FIXME: Enable http/tests/inspector/indexeddb/resources-panel.html when removed from experiments.
- this.showIndexedDB = this._createExperiment("showIndexedDB", "Show IndexedDB in Resources panel");
this.showShadowDOM = this._createExperiment("showShadowDOM", "Show shadow DOM");
this.snippetsSupport = this._createExperiment("snippetsSupport", "Snippets support");
