Changeset 84134 in webkit

Timestamp:

Apr 18, 2011 5:25:43 AM (13 years ago)

Author:

loislo@chromium.org

Message:

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

Reviewed by Yury Semikhatsky.

Web Inspector: Database agent stops to propagate it's events after navigation.
​https://bugs.webkit.org/show_bug.cgi?id=58776

• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent): (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
• inspector/InspectorDatabaseAgent.cpp: (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent): (WebCore::InspectorDatabaseAgent::clearFrontend): (WebCore::InspectorDatabaseAgent::enable): (WebCore::InspectorDatabaseAgent::disable): (WebCore::InspectorDatabaseAgent::restore):
• inspector/InspectorDatabaseAgent.h: (WebCore::InspectorDatabaseAgent::create):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorAgent.cpp (modified) (2 diffs)
• inspector/InspectorDatabaseAgent.cpp (modified) (6 diffs)
• inspector/InspectorDatabaseAgent.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Database agent stops to propagate it's events after navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=58776
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
+        * inspector/InspectorDatabaseAgent.cpp:
+        (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
+        (WebCore::InspectorDatabaseAgent::clearFrontend):
+        (WebCore::InspectorDatabaseAgent::enable):
+        (WebCore::InspectorDatabaseAgent::disable):
+        (WebCore::InspectorDatabaseAgent::restore):
+        * inspector/InspectorDatabaseAgent.h:
+        (WebCore::InspectorDatabaseAgent::create):
+
 2011-04-18  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -117 +117 @@
     , m_cssAgent(new InspectorCSSAgent(m_instrumentingAgents.get(), m_domAgent.get()))
 #if ENABLE(DATABASE)
-    , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get()))
+    , m_databaseAgent(InspectorDatabaseAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #endif
 #if ENABLE(DOM_STORAGE)
@@ -196 +196 @@
     m_resourceAgent->restore();
     m_timelineAgent->restore();
+
+#if ENABLE(DATABASE)
+    m_databaseAgent->restore();
+#endif
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

@@ -37 +37 @@
 #include "InspectorDatabaseResource.h"
 #include "InspectorFrontend.h"
+#include "InspectorState.h"
 #include "InspectorValues.h"
 #include "InstrumentingAgents.h"
@@ -52 +53 @@
 
 namespace WebCore {
+
+namespace DatabaseAgentState {
+static const char databaseAgentEnabled[] = "databaseAgentEnabled";
+};
 
 class InspectorDatabaseAgent::FrontendProvider : public RefCounted<InspectorDatabaseAgent::FrontendProvider> {
@@ -238 +243 @@
 }
 
-InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents* instrumentingAgents)
+InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     : m_instrumentingAgents(instrumentingAgents)
+    , m_inspectorState(state)
     , m_enabled(false)
 {
@@ -259 +265 @@
     m_frontendProvider->clearFrontend();
     m_frontendProvider.clear();
-    m_enabled = false;
+    disable(0);
 }
 
@@ -267 +273 @@
         return;
     m_enabled = true;
+    m_inspectorState->setBoolean(DatabaseAgentState::databaseAgentEnabled, m_enabled);
 
     DatabaseResourcesMap::iterator databasesEnd = m_resources.end();
@@ -278 +285 @@
         return;
     m_enabled = false;
+    m_inspectorState->setBoolean(DatabaseAgentState::databaseAgentEnabled, m_enabled);
+}
+
+void InspectorDatabaseAgent::restore()
+{
+    m_enabled =  m_inspectorState->getBoolean(DatabaseAgentState::databaseAgentEnabled);
 }
 

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h

@@ -40 +40 @@
 class InspectorDatabaseResource;
 class InspectorFrontend;
+class InspectorState;
 class InstrumentingAgents;
 
@@ -48 +49 @@
     class FrontendProvider;
 
-    static PassOwnPtr<InspectorDatabaseAgent> create(InstrumentingAgents* instrumentingAgents)
+    static PassOwnPtr<InspectorDatabaseAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     {
-        return adoptPtr(new InspectorDatabaseAgent(instrumentingAgents));
+        return adoptPtr(new InspectorDatabaseAgent(instrumentingAgents, state));
     }
     ~InspectorDatabaseAgent();
@@ -58 +59 @@
 
     void clearResources();
+    void restore();
 
     // Called from the front-end.
@@ -70 +72 @@
     void didOpenDatabase(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
 private:
-    explicit InspectorDatabaseAgent(InstrumentingAgents*);
+    explicit InspectorDatabaseAgent(InstrumentingAgents*, InspectorState*);
 
     Database* databaseForId(int databaseId);
@@ -76 +78 @@
 
     InstrumentingAgents* m_instrumentingAgents;
+    InspectorState* m_inspectorState;
     typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
     DatabaseResourcesMap m_resources;