Changeset 87681 in webkit

Timestamp:

May 30, 2011 2:18:16 AM (13 years ago)

Author:

caseq@chromium.org

Message:

011-05-30 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: do not issue frontendReused for reload or navigation.
​https://bugs.webkit.org/show_bug.cgi?id=61192

• only issue frontendReused when inspector is attached after main resource committed load
• upon committing loading main resource, reset agents before sending FrameNavigated to page agent
• Ensure main resource is set early so that abbreviations of URLs in resource tree are consistent after reload
• do not enable agents explicitly in frontendReused (this is done by backend when resotring state from cookie)

• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent): (WebCore::InspectorAgent::restore): (WebCore::InspectorAgent::clearFrontend): (WebCore::InspectorAgent::didCommitLoad):
• inspector/InspectorAgent.h:
• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::didCommitLoadImpl):
• inspector/front-end/NetworkManager.js:
• inspector/front-end/ResourceTreeModel.js: (WebInspector.ResourceTreeModel.prototype._processCachedResources): (WebInspector.ResourceTreeModel.prototype._frameNavigated): (WebInspector.ResourceTreeModel.prototype._cleanupFramesAfterNavigation): (WebInspector.ResourceTreeModel.prototype._addFramesRecursively):
• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.reset): (WebInspector.ResourcesPanel.prototype._resetResourcesTree): (WebInspector.DatabaseTreeElement.prototype.onpopulate): (WebInspector.SearchResultsTreeElementsTraverser.prototype._lastTreeElement):
• inspector/front-end/inspector.js: (WebInspector.reset): (WebInspector.frontendReused):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorAgent.cpp (modified) (3 diffs)
• inspector/InspectorAgent.h (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• inspector/front-end/NetworkManager.js (modified) (1 diff)
• inspector/front-end/ResourceTreeModel.js (modified) (7 diffs)
• inspector/front-end/ResourcesPanel.js (modified) (5 diffs)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-30  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: do not issue frontendReused for reload or navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=61192
+
+       - only issue frontendReused when inspector is attached after main resource committed load
+       - upon committing loading main resource, reset agents before sending FrameNavigated to page agent
+       - Ensure main resource is set early so that abbreviations of URLs in resource tree are consistent after reload
+       - do not enable agents explicitly in frontendReused (this is done by backend when resotring state from cookie)
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::restore):
+        (WebCore::InspectorAgent::clearFrontend):
+        (WebCore::InspectorAgent::didCommitLoad):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        * inspector/front-end/NetworkManager.js:
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.ResourceTreeModel.prototype._processCachedResources):
+        (WebInspector.ResourceTreeModel.prototype._frameNavigated):
+        (WebInspector.ResourceTreeModel.prototype._cleanupFramesAfterNavigation):
+        (WebInspector.ResourceTreeModel.prototype._addFramesRecursively):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.reset):
+        (WebInspector.ResourcesPanel.prototype._resetResourcesTree):
+        (WebInspector.DatabaseTreeElement.prototype.onpopulate):
+        (WebInspector.SearchResultsTreeElementsTraverser.prototype._lastTreeElement):
+        * inspector/front-end/inspector.js:
+        (WebInspector.reset):
+        (WebInspector.frontendReused):
+
 2011-05-30  Ryan Sleevi  <rsleevi@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -68 +68 @@
     , m_injectedScriptManager(injectedScriptManager)
     , m_canIssueEvaluateForTestInFrontend(false)
+    , m_didCommitLoadFired(false)
 {
     ASSERT_ARG(page, page);
@@ -91 +92 @@
 void InspectorAgent::restore()
 {
-    m_frontend->inspector()->frontendReused();
+    if (m_didCommitLoadFired)
+        m_frontend->inspector()->frontendReused();
 }
 
@@ -128 +130 @@
     m_pendingEvaluateTestCommands.clear();
     m_frontend = 0;
+    m_didCommitLoadFired = false;
 }
 
 void InspectorAgent::didCommitLoad()
 {
+    m_didCommitLoadFired = true;
     if (m_frontend)
         m_frontend->inspector()->reset();

trunk/Source/WebCore/inspector/InspectorAgent.h

@@ -125 +125 @@
 #endif
     bool m_canIssueEvaluateForTestInFrontend;
+    bool m_didCommitLoadFired;
 };
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -574 +574 @@
         return;
 
+    Frame* mainFrame = page->mainFrame();
+    if (loader->frame() == mainFrame) {
+        if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
+            consoleAgent->reset();
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+        if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
+            KURL url = inspectorAgent->inspectedURLWithoutFragment();
+            debuggerAgent->inspectedURLChanged(url);
+        }
+#endif
+#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
+        if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) {
+            profilerAgent->stopUserInitiatedProfiling(true);
+            profilerAgent->resetState();
+        }
+#endif
+        if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
+            cssAgent->reset();
+#if ENABLE(DATABASE)
+        if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
+            databaseAgent->clearResources();
+#endif
+#if ENABLE(DOM_STORAGE)
+        if (InspectorDOMStorageAgent* domStorageAgent = instrumentingAgents->inspectorDOMStorageAgent())
+            domStorageAgent->clearResources();
+#endif
+        if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
+            domAgent->setDocument(mainFrame->document());
+
+        inspectorAgent->didCommitLoad();
+    }
     if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
         pageAgent->frameNavigated(loader);
-
-    Frame* mainFrame = page->mainFrame();
-    if (loader->frame() != mainFrame)
-        return;
-
-    if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
-        consoleAgent->reset();
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent()) {
-        KURL url = inspectorAgent->inspectedURLWithoutFragment();
-        debuggerAgent->inspectedURLChanged(url);
-    }
-#endif
-#if ENABLE(JAVASCRIPT_DEBUGGER) && USE(JSC)
-    if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) {
-        profilerAgent->stopUserInitiatedProfiling(true);
-        profilerAgent->resetState();
-    }
-#endif
-    if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
-        cssAgent->reset();
-#if ENABLE(DATABASE)
-    if (InspectorDatabaseAgent* databaseAgent = instrumentingAgents->inspectorDatabaseAgent())
-        databaseAgent->clearResources();
-#endif
-#if ENABLE(DOM_STORAGE)
-    if (InspectorDOMStorageAgent* domStorageAgent = instrumentingAgents->inspectorDOMStorageAgent())
-        domStorageAgent->clearResources();
-#endif
-    if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
-        domAgent->setDocument(mainFrame->document());
-
-    inspectorAgent->didCommitLoad();
 }
 

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

@@ -43 +43 @@
 
 WebInspector.NetworkManager.prototype = {
-    frontendReused: function()
-    {
-        NetworkAgent.enable();
-    },
-
     requestContent: function(resource, base64Encode, callback)
     {

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

@@ -74 +74 @@
 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources);
-        WebInspector.mainResource = this._addFramesRecursively(mainFramePayload);
+        this._addFramesRecursively(mainFramePayload);
         this._dispatchInspectedURLChanged(WebInspector.mainResource.url);
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded);
@@ -102 +102 @@
     },
 
-    frames: function(parentFrameId)
-    {
-        return this._subframes[parentFrameId] || [];
-    },
-
     subframes: function(parentFrameId)
     {
@@ -123 +118 @@
     _frameNavigated: function(frame, loaderId)
     {
+        var isMainFrame = !frame.parentId;
+
+        if (isMainFrame) {
+            this._cleanupFramesAfterNavigation(frame);
+            if (this.resourceForURL(frame.url))
+                WebInspector.mainResource = this.resourceForURL(frame.url);
+        }
         // Do nothing unless cached resource tree is processed - it will overwrite everything.
         if (!this._cachedResourcesProcessed)
@@ -130 +132 @@
         if (!this._frameIds[frame.id])
             this._addFrame(frame);
-        else
+        else {
             this._clearChildFramesAndResources(frame.id, loaderId);
-
-
-        var isMainFrame = !frame.parentId;
-
+            frame.parentId = frame.parentId || "";
+            this._frameIds[frame.id] = frame;
+        }
         // Dispatch frame navigated event to clients prior to filling it with the resources. 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, { frame: frame, loaderId: loaderId, isMainFrame: isMainFrame });
@@ -146 +147 @@
         }
 
-        // Update main frame, issue top-level navigate events. 
-        if (isMainFrame && this.resourceForURL(frame.url)) {
-            WebInspector.mainResource = this.resourceForURL(frame.url);
+        if (isMainFrame)
             this._dispatchInspectedURLChanged(frame.url);
+    },
+
+    _cleanupFramesAfterNavigation: function(newMainFrame)
+    {
+        for (var frameId in this._frameIds) {
+            if (frameId !== newMainFrame.id)
+                this._frameDetached(frameId);
         }
     },
@@ -318 +324 @@
         frameResource.finished = true;
 
+        if (!framePayload.parentId)
+            WebInspector.mainResource = frameResource;
         this._addFrame(framePayload);
         this._addResourceToFrame(frameResource);
@@ -335 +343 @@
             this._addResourceToFrame(resource);
         }
-        return frameResource;
     },
 

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

@@ -131 +131 @@
     },
 
-    _reset: function()
+    reset: function()
     {
         delete this._initializedDefaultSelection;
@@ -256 +256 @@
         this.resourcesListTreeElement.removeChildren();
         this._treeElementForFrameId = {};
-        this._reset();
+        this.reset();
     },
 
@@ -1027 +1027 @@
     }
 }
+
 WebInspector.StorageCategoryTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
 
@@ -1455 +1456 @@
         this._database.getTableNames(tableNamesCallback.bind(this));
     }
-
-}
+}
+
 WebInspector.DatabaseTreeElement.prototype.__proto__ = WebInspector.BaseStorageTreeElement.prototype;
 
@@ -1730 +1731 @@
             treeElement = nextTreeElement;
         return treeElement;        
-    },
-}
+    }
+}

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

@@ -974 +974 @@
 {
     this.debuggerModel.reset();
-
     for (var panelName in this.panels) {
         var panel = this.panels[panelName];
@@ -1357 +1356 @@
 WebInspector.frontendReused = function()
 {
-    ConsoleAgent.enable(this.console.setConsoleMessageExpiredCount.bind(this.console));
-    DatabaseAgent.enable();
-    DOMStorageAgent.enable();
-
-    this.networkManager.frontendReused();
     this.resourceTreeModel.frontendReused();
-    WebInspector.panels.network.clear();
     this.reset();
 }