Changeset 83849 in webkit

Timestamp:

Apr 14, 2011 6:35:54 AM (13 years ago)

Author:

loislo@chromium.org

Message:

2011-04-14 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: The list of Database entries is empty if the page opens a database just before Web Inspector.
​https://bugs.webkit.org/show_bug.cgi?id=57833

• inspector/Inspector.json:
• inspector/InspectorDatabaseAgent.cpp: (WebCore::InspectorDatabaseAgent::didOpenDatabase): (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent): (WebCore::InspectorDatabaseAgent::setFrontend): (WebCore::InspectorDatabaseAgent::enable): (WebCore::InspectorDatabaseAgent::disable): (WebCore::InspectorDatabaseAgent::getDatabaseTableNames): (WebCore::InspectorDatabaseAgent::executeSQL):
• inspector/InspectorDatabaseAgent.h:
• inspector/front-end/inspector.js:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (1 diff)
• inspector/InspectorDatabaseAgent.cpp (modified) (5 diffs)
• inspector/InspectorDatabaseAgent.h (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: The list of Database entries is empty if the page opens a database just before Web Inspector.
+        https://bugs.webkit.org/show_bug.cgi?id=57833
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDatabaseAgent.cpp:
+        (WebCore::InspectorDatabaseAgent::didOpenDatabase):
+        (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
+        (WebCore::InspectorDatabaseAgent::setFrontend):
+        (WebCore::InspectorDatabaseAgent::enable):
+        (WebCore::InspectorDatabaseAgent::disable):
+        (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+        (WebCore::InspectorDatabaseAgent::executeSQL):
+        * inspector/InspectorDatabaseAgent.h:
+        * inspector/front-end/inspector.js:
+
 2011-04-14  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -565 +565 @@
         "types": [],
         "commands": [
+            {
+                "name": "enable",
+                "description": "Enables database tracking, database events will now be delivered to the client."
+            },
+            {
+                "name": "disable",
+                "description": "Disables database tracking, prevents database events from being sent to the client."
+            },
             {
                 "name": "getDatabaseTableNames",

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

@@ -229 +229 @@
     m_resources.set(resource->id(), resource);
     // Resources are only bound while visible.
-    if (m_frontendProvider)
+    if (m_frontendProvider && m_enabled)
         resource->bind(m_frontendProvider->frontend());
 }
@@ -240 +240 @@
 InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents* instrumentingAgents)
     : m_instrumentingAgents(instrumentingAgents)
+    , m_enabled(false)
 {
     m_instrumentingAgents->setInspectorDatabaseAgent(this);
@@ -252 +253 @@
 {
     m_frontendProvider = FrontendProvider::create(frontend);
+}
+
+void InspectorDatabaseAgent::clearFrontend()
+{
+    m_frontendProvider->clearFrontend();
+    m_frontendProvider.clear();
+}
+
+void InspectorDatabaseAgent::enable(ErrorString*)
+{
+    if (m_enabled)
+        return;
+    m_enabled = true;
+
     DatabaseResourcesMap::iterator databasesEnd = m_resources.end();
     for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != databasesEnd; ++it)
@@ -257 +272 @@
 }
 
-void InspectorDatabaseAgent::clearFrontend()
-{
-    m_frontendProvider->clearFrontend();
-    m_frontendProvider.clear();
-}
-
-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names)
-{
+void InspectorDatabaseAgent::disable(ErrorString*)
+{
+    if (!m_enabled)
+        return;
+    m_enabled = false;
+}
+
+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, int databaseId, RefPtr<InspectorArray>* names)
+{
+    if (!m_enabled) {
+        *error = "Database agent is not enabled";
+        return;
+    }
+
     Database* database = databaseForId(databaseId);
     if (database) {
@@ -274 +295 @@
 }
 
-void InspectorDatabaseAgent::executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId)
-{
+void InspectorDatabaseAgent::executeSQL(ErrorString* error, int databaseId, const String& query, bool* success, int* transactionId)
+{
+    if (!m_enabled) {
+        *error = "Database agent is not enabled";
+        return;
+    }
+
     Database* database = databaseForId(databaseId);
     if (!database) {

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h

@@ -60 +60 @@
 
     // Called from the front-end.
+    void enable(ErrorString*);
+    void disable(ErrorString*);
     void getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>* names);
     void executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId);
@@ -77 +79 @@
     DatabaseResourcesMap m_resources;
     RefPtr<FrontendProvider> m_frontendProvider;
+    bool m_enabled;
 };
 

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -508 +508 @@
         ConsoleAgent.setMonitoringXHREnabled(true);
     ConsoleAgent.enable(this.console.setConsoleMessageExpiredCount.bind(this.console));
+
+    DatabaseAgent.enable();
 
     WebInspector.showPanel(WebInspector.settings.lastActivePanel);