Changeset 84905 in webkit

Timestamp:

Apr 26, 2011 5:25:05 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-26 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: introduce DOMStorage::enable and disable.
​https://bugs.webkit.org/show_bug.cgi?id=59445

• inspector/Inspector.json:
• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent): (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
• inspector/InspectorDOMStorageAgent.cpp: (WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent): (WebCore::InspectorDOMStorageAgent::restore): (WebCore::InspectorDOMStorageAgent::enable): (WebCore::InspectorDOMStorageAgent::disable):
• inspector/InspectorDOMStorageAgent.h: (WebCore::InspectorDOMStorageAgent::create):
• inspector/front-end/DOMStorage.js: (WebInspector.DOMStorageDispatcher.prototype.addDOMStorage):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype._reset):
• inspector/front-end/inspector.js:

Location:

trunk

Files:

• LayoutTests/inspector/extensions/extensions-events-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (1 diff)
• Source/WebCore/inspector/InspectorAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (modified) (3 diffs)
• Source/WebCore/inspector/InspectorDOMStorageAgent.h (modified) (4 diffs)
• Source/WebCore/inspector/front-end/inspector.js (modified) (1 diff)

trunk/LayoutTests/inspector/extensions/extensions-events-expected.txt

@@ -6 +6 @@
 Page reloaded.
 Page reloaded.
+Navigated to: extensions-events.html
 Navigated to: extensions-events.html?navigated
-Navigated to: extensions-events.html
 RUNNING TEST: extension_testOnResourceFinished
 onFinished fired

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-26  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: introduce DOMStorage::enable and disable.
+        https://bugs.webkit.org/show_bug.cgi?id=59445
+
+        * inspector/Inspector.json:
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
+        * inspector/InspectorDOMStorageAgent.cpp:
+        (WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
+        (WebCore::InspectorDOMStorageAgent::restore):
+        (WebCore::InspectorDOMStorageAgent::enable):
+        (WebCore::InspectorDOMStorageAgent::disable):
+        * inspector/InspectorDOMStorageAgent.h:
+        (WebCore::InspectorDOMStorageAgent::create):
+        * inspector/front-end/DOMStorage.js:
+        (WebInspector.DOMStorageDispatcher.prototype.addDOMStorage):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._reset):
+        * inspector/front-end/inspector.js:
+
 2011-04-26  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/Inspector.json

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

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -121 +121 @@
 #endif
 #if ENABLE(DOM_STORAGE)
-    , m_domStorageAgent(InspectorDOMStorageAgent::create(m_instrumentingAgents.get()))
+    , m_domStorageAgent(InspectorDOMStorageAgent::create(m_instrumentingAgents.get(), m_state.get()))
 #endif
     , m_timelineAgent(InspectorTimelineAgent::create(m_instrumentingAgents.get(), m_state.get()))
@@ -202 +202 @@
 #if ENABLE(DATABASE)
     m_databaseAgent->restore();
+#endif
+
+#if ENABLE(DOM_STORAGE)
+    m_domStorageAgent->restore();
 #endif
 

trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp

@@ -39 +39 @@
 #include "InspectorDOMStorageResource.h"
 #include "InspectorFrontend.h"
+#include "InspectorState.h"
 #include "InspectorValues.h"
 #include "InstrumentingAgents.h"
@@ -49 +50 @@
 namespace WebCore {
 
+namespace DOMStorageAgentState {
+static const char domStorageAgentEnabled[] = "domStorageAgentEnabled";
+};
+
 typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
 
-InspectorDOMStorageAgent::InspectorDOMStorageAgent(InstrumentingAgents* instrumentingAgents)
+InspectorDOMStorageAgent::InspectorDOMStorageAgent(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     : m_instrumentingAgents(instrumentingAgents)
+    , m_inspectorState(state)
     , m_frontend(0)
+    , m_enabled(false)
 {
     m_instrumentingAgents->setInspectorDOMStorageAgent(this);
@@ -78 +85 @@
         it->second->unbind();
     m_frontend = 0;
+}
+
+void InspectorDOMStorageAgent::restore()
+{
+    m_enabled =  m_inspectorState->getBoolean(DOMStorageAgentState::domStorageAgentEnabled);
+}
+
+void InspectorDOMStorageAgent::enable(ErrorString*)
+{
+    if (m_enabled)
+        return;
+    m_enabled = true;
+    m_inspectorState->setBoolean(DOMStorageAgentState::domStorageAgentEnabled, m_enabled);
+
+    DOMStorageResourcesMap::iterator resourcesEnd = m_resources.end();
+    for (DOMStorageResourcesMap::iterator it = m_resources.begin(); it != resourcesEnd; ++it)
+        it->second->bind(m_frontend);
+}
+
+void InspectorDOMStorageAgent::disable(ErrorString*)
+{
+    if (!m_enabled)
+        return;
+    m_enabled = false;
+    m_inspectorState->setBoolean(DOMStorageAgentState::domStorageAgentEnabled, m_enabled);
 }
 

trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h

@@ -40 +40 @@
 class InspectorDOMStorageResource;
 class InspectorFrontend;
+class InspectorState;
 class InstrumentingAgents;
 class Storage;
@@ -48 +49 @@
 class InspectorDOMStorageAgent {
 public:
-    static PassOwnPtr<InspectorDOMStorageAgent> create(InstrumentingAgents* instrumentingAgents)
+    static PassOwnPtr<InspectorDOMStorageAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     {
-        return adoptPtr(new InspectorDOMStorageAgent(instrumentingAgents));
+        return adoptPtr(new InspectorDOMStorageAgent(instrumentingAgents, state));
     }
     ~InspectorDOMStorageAgent();
@@ -58 +59 @@
 
     void clearResources();
+    void restore();
 
     // Called from the front-end.
+    void enable(ErrorString*);
+    void disable(ErrorString*);
     void getDOMStorageEntries(ErrorString*, int storageId, RefPtr<InspectorArray>* entries);
     void setDOMStorageItem(ErrorString*, int storageId, const String& key, const String& value, bool* success);
@@ -71 +75 @@
 
 private:
-    explicit InspectorDOMStorageAgent(InstrumentingAgents*);
+    InspectorDOMStorageAgent(InstrumentingAgents*, InspectorState*);
 
     InspectorDOMStorageResource* getDOMStorageResourceForId(int storageId);
 
     InstrumentingAgents* m_instrumentingAgents;
+    InspectorState* m_inspectorState;
     typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
     DOMStorageResourcesMap m_resources;
     InspectorFrontend* m_frontend;
+    bool m_enabled;
 };
 

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

@@ -501 +501 @@
 
     DatabaseAgent.enable();
+    DOMStorageAgent.enable();
 
     WebInspector.showPanel(WebInspector.settings.lastActivePanel);