Changeset 75949 in webkit

Timestamp:

Jan 17, 2011 8:42:38 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-01-17 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: restore dom and network state upon frontend reuse.
​https://bugs.webkit.org/show_bug.cgi?id=52574

• inspector/Inspector.idl:
• inspector/InspectorController.cpp: (WebCore::InspectorController::restoreInspectorStateFromCookie): (WebCore::InspectorController::populateScriptObjects): (WebCore::InspectorController::pushDataCollectedOffline): (WebCore::InspectorController::didCommitLoad):
• inspector/InspectorController.h:
• inspector/front-end/NetworkManager.js: (WebInspector.NetworkManager.prototype.reset):
• inspector/front-end/NetworkPanel.js: (WebInspector.NetworkPanel.prototype.clear): (WebInspector.NetworkPanel.prototype.mainResourceChanged):
• inspector/front-end/ResourceTreeModel.js: (WebInspector.ResourceTreeModel): (WebInspector.ResourceTreeModel.prototype.reloadCachedResources):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.clear):
• inspector/front-end/inspector.js: (WebInspector.frontendReused):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.idl (modified) (2 diffs)
• inspector/InspectorController.cpp (modified) (4 diffs)
• inspector/InspectorController.h (modified) (1 diff)
• inspector/front-end/DOMAgent.js (modified) (2 diffs)
• inspector/front-end/NetworkManager.js (modified) (1 diff)
• inspector/front-end/NetworkPanel.js (modified) (1 diff)
• inspector/front-end/ResourceTreeModel.js (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-17  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: restore dom and network state upon frontend reuse.
+        https://bugs.webkit.org/show_bug.cgi?id=52574
+
+        * inspector/Inspector.idl:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::restoreInspectorStateFromCookie):
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::pushDataCollectedOffline):
+        (WebCore::InspectorController::didCommitLoad):
+        * inspector/InspectorController.h:
+        * inspector/front-end/NetworkManager.js:
+        (WebInspector.NetworkManager.prototype.reset):
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype.clear):
+        (WebInspector.NetworkPanel.prototype.mainResourceChanged):
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.ResourceTreeModel):
+        (WebInspector.ResourceTreeModel.prototype.reloadCachedResources):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.clear):
+        * inspector/front-end/inspector.js:
+        (WebInspector.frontendReused):
+
 2011-01-17  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/inspector/Inspector.idl

@@ -49 +49 @@
         [domain=Inspector] void openInInspectedWindow(in String url);
         [domain=Inspector] void setSearchingForNode(in boolean enabled, out boolean newState);
+        [notify, domain=Inspector] void frontendReused();
         [notify, domain=Inspector] void addNodesToSearchResult(out Array nodeIds);
         [notify, domain=Inspector] void bringToFront();
@@ -186 +187 @@
         [notify, domain=DOM] void childNodeInserted(out long parentId, out long prevId, out Object node);
         [notify, domain=DOM] void childNodeRemoved(out long parentId, out long id);
-        [notify, domain=DOM] void didCommitLoad();
 
         ///////////////////////////////////////////////////////////////////////

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -227 +227 @@
     m_state->restoreFromInspectorCookie(inspectorStateCookie);
 
-    if (!m_frontend)
+    if (!m_frontend) {
         connectFrontend();
+        m_frontend->frontendReused();
+        m_frontend->inspectedURLChanged(m_inspectedPage->mainFrame()->loader()->url().string());
+        m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
+        pushDataCollectedOffline();
+    }
 
     if (m_state->getBoolean(InspectorState::timelineProfilerEnabled))
@@ -547 +552 @@
 #endif
 
-    m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
+    pushDataCollectedOffline();
 
     if (m_nodeToFocus)
         focusNode();
+
+    // Dispatch pending frontend commands
+    for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
+        m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
+    m_pendingEvaluateTestCommands.clear();
+
+    restoreDebugger();
+    restoreProfiler(ProfilerRestoreNoAction);
+}
+
+void InspectorController::pushDataCollectedOffline()
+{
+    m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
 
 #if ENABLE(DATABASE)
@@ -569 +587 @@
     }
 #endif
-
-    // Dispatch pending frontend commands
-    for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
-        m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
-    m_pendingEvaluateTestCommands.clear();
-
-    restoreDebugger();
-    restoreProfiler(ProfilerRestoreNoAction);
 }
 
@@ -668 +678 @@
 #endif
 
-        if (m_frontend) {
-            m_frontend->didCommitLoad();
+        if (m_frontend)
             m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
-        }
     }
 }

trunk/Source/WebCore/inspector/InspectorController.h

@@ -258 +258 @@
 
     void populateScriptObjects();
+    void pushDataCollectedOffline();
     void restoreDebugger();
     enum ProfilerRestoreAction {

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

@@ -374 +374 @@
     },
 
-    _didCommitLoad: function()
-    {
-        // Cleanup elements panel early on inspected page refresh.
-        this._setDocument(null);
-    },
-
     _setDocument: function(payload)
     {
@@ -502 +496 @@
     {
         this._domAgent._childNodeRemoved(parentId, nodeId);
-    },
-
-    didCommitLoad: function()
-    {
-        this._domAgent._didCommitLoad();
     }
 }

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

@@ -88 +88 @@
 
 WebInspector.NetworkManager.prototype = {
+    reset: function()
+    {
+        WebInspector.panels.network.clear();
+        WebInspector.panels.resources.clear();
+        this._resourceTreeModel.reloadCachedResources();
+    },
+
     identifierForInitialRequest: function(identifier, url, loader, callStack)
     {

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

@@ -805 +805 @@
     },
 
+    clear: function()
+    {
+        if (this._preserveLogToggle.toggled)
+            return;
+
+        this._reset();
+    },
+
     mainResourceChanged: function()
     {
-        if (this._preserveLogToggle.toggled)
-            return;
-
-        this._reset();
+        this.clear();
         // Now resurrect the main resource along with all redirects that lead to it.
         var resourcesToAppend = (WebInspector.mainResource.redirects || []).concat(WebInspector.mainResource);

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

@@ -32 +32 @@
 WebInspector.ResourceTreeModel = function()
 {
-    this._resourcesByURL = {};
-    this._resourcesByFrameId = {};
-    this._subframes = {};
-    InspectorBackend.cachedResources(this._processCachedResources.bind(this));
+    this.reloadCachedResources();
 }
 
 WebInspector.ResourceTreeModel.prototype = {
+    reloadCachedResources: function()
+    {
+        this._resourcesByURL = {};
+        this._resourcesByFrameId = {};
+        this._subframes = {};
+        InspectorBackend.cachedResources(this._processCachedResources.bind(this));
+    },
+
     addOrUpdateFrame: function(frame)
     {

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

@@ -166 +166 @@
     },
 
+    clear: function()
+    {
+        this.resourcesListTreeElement.removeChildren();
+        this.reset();
+    },
+
     addOrUpdateFrame: function(parentFrameId, frameId, title, subtitle)
     {

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

@@ -1651 +1651 @@
     this.currentPanel.currentQuery = query;
     this.currentPanel.performSearch(query);
+}
+
+WebInspector.frontendReused = function()
+{
+    this.networkManager.reset();
+    this.reset();
 }