Title: [98240] trunk
Revision
98240
Author
pfeld...@chromium.org
Date
2011-10-24 08:14:46 -0700 (Mon, 24 Oct 2011)

Log Message

Web Inspector: do not force document loading on reload (should happen on demand).
https://bugs.webkit.org/show_bug.cgi?id=70724

Reviewed by Yury Semikhatsky.

Source/WebCore:

* inspector/front-end/ConsoleMessage.js:
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsNode):
* inspector/front-end/DOMAgent.js:
(WebInspector.DOMAgent.prototype._documentUpdated):
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype.wasShown):
* inspector/front-end/ElementsTreeOutline.js:
(WebInspector.ElementsTreeOutline.prototype.setVisible):

LayoutTests:

* inspector/debugger/dom-breakpoints.html:
* inspector/debugger/error-in-watch-expressions.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (98239 => 98240)


--- trunk/LayoutTests/ChangeLog	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/LayoutTests/ChangeLog	2011-10-24 15:14:46 UTC (rev 98240)
@@ -1,3 +1,13 @@
+2011-10-24  Pavel Feldman  <pfeld...@google.com>
+
+        Web Inspector: do not force document loading on reload (should happen on demand).
+        https://bugs.webkit.org/show_bug.cgi?id=70724
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/debugger/dom-breakpoints.html:
+        * inspector/debugger/error-in-watch-expressions.html:
+
 2011-10-24  Yury Semikhatsky  <yu...@chromium.org>
 
         Web Inspector: allow debugging dedicated worker initialization

Modified: trunk/LayoutTests/inspector/debugger/dom-breakpoints.html (98239 => 98240)


--- trunk/LayoutTests/inspector/debugger/dom-breakpoints.html	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/LayoutTests/inspector/debugger/dom-breakpoints.html	2011-10-24 15:14:46 UTC (rev 98240)
@@ -137,6 +137,11 @@
 
             function step3()
             {
+                InspectorTest.expandElementsTree(step4);
+            }
+
+            function step4()
+            {
                 InspectorTest.evaluateInPageWithTimeout("appendElement('rootElement', 'childElement')");
                 InspectorTest.addResult("Append childElement to rootElement.");
                 waitUntilPausedAndDumpStack(next);

Modified: trunk/Source/WebCore/ChangeLog (98239 => 98240)


--- trunk/Source/WebCore/ChangeLog	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/Source/WebCore/ChangeLog	2011-10-24 15:14:46 UTC (rev 98240)
@@ -1,3 +1,19 @@
+2011-10-24  Pavel Feldman  <pfeld...@google.com>
+
+        Web Inspector: do not force document loading on reload (should happen on demand).
+        https://bugs.webkit.org/show_bug.cgi?id=70724
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ConsoleMessage.js:
+        (WebInspector.ConsoleMessageImpl.prototype._formatParameterAsNode):
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMAgent.prototype._documentUpdated):
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.wasShown):
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeOutline.prototype.setVisible):
+
 2011-10-24  Eric Carlson  <eric.carl...@apple.com>
 
         Drop MutableTextTrack and make TextTrack always mutable

Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (98239 => 98240)


--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2011-10-24 15:14:46 UTC (rev 98240)
@@ -289,6 +289,7 @@
                 return;
             }
             var treeOutline = new WebInspector.ElementsTreeOutline(false, false, true);
+            treeOutline.setVisible(true);
             treeOutline.rootDOMNode = WebInspector.domAgent.nodeForId(nodeId);
             treeOutline.element.addStyleClass("outline-disclosure");
             if (!treeOutline.children[0].hasChildren)

Modified: trunk/Source/WebCore/inspector/front-end/DOMAgent.js (98239 => 98240)


--- trunk/Source/WebCore/inspector/front-end/DOMAgent.js	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/Source/WebCore/inspector/front-end/DOMAgent.js	2011-10-24 15:14:46 UTC (rev 98240)
@@ -726,7 +726,6 @@
     _documentUpdated: function()
     {
         this._setDocument(null);
-        this.requestDocument();
     },
 
     /**

Modified: trunk/Source/WebCore/inspector/front-end/ElementsPanel.js (98239 => 98240)


--- trunk/Source/WebCore/inspector/front-end/ElementsPanel.js	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/Source/WebCore/inspector/front-end/ElementsPanel.js	2011-10-24 15:14:46 UTC (rev 98240)
@@ -138,6 +138,9 @@
         this.treeOutline.updateSelection();
         this.treeOutline.setVisible(true);
 
+        if (!this.treeOutline.rootDOMNode)
+            WebInspector.domAgent.requestDocument();
+
         if (Preferences.nativeInstrumentationEnabled)
             this.sidebarElement.insertBefore(this.sidebarPanes.domBreakpoints.element, this.sidebarPanes.eventListeners.element);
     },
@@ -195,8 +198,13 @@
         this._reset();
         this.searchCanceled();
 
-        if (!inspectedRootDocument)
+        this.treeOutline.rootDOMNode = inspectedRootDocument;
+
+        if (!inspectedRootDocument) {
+            if (this.isShowing())
+                WebInspector.domAgent.requestDocument();
             return;
+        }
 
         if (Preferences.nativeInstrumentationEnabled)
             this.sidebarPanes.domBreakpoints.restoreBreakpoints();

Modified: trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js (98239 => 98240)


--- trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js	2011-10-24 14:56:39 UTC (rev 98239)
+++ trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js	2011-10-24 15:14:46 UTC (rev 98240)
@@ -80,11 +80,6 @@
         if (!this._visible)
             return;
 
-        if (!this.rootDOMNode) {
-            WebInspector.domAgent.requestDocument();
-            return;
-        }
-
         this._updateModifiedNodes();
     },
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to