Changeset 51601 in webkit

Timestamp:

Dec 2, 2009 10:32:08 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2009-12-02 Pavel Feldman <​pfeldman@dhcp-172-28-174-220.spb.corp.google.com>

Reviewed by Timothy Hatcher.

Web Inspector: DOM tree selection disappears upon page refresh.

​https://bugs.webkit.org/show_bug.cgi?id=31142

Test: inspector/elements-panel-selection-on-refresh.html

• inspector/InjectedScriptHost.cpp: (WebCore::InjectedScriptHost::pushNodeByPathToFrontend):
• inspector/InjectedScriptHost.h:
• inspector/InjectedScriptHost.idl:
• inspector/InspectorBackend.h:
• inspector/InspectorController.cpp: (WebCore::InspectorController::close): (WebCore::InspectorController::releaseDOMAgent): (WebCore::InspectorController::resetScriptObjects):
• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::~InspectorDOMAgent): (WebCore::InspectorDOMAgent::reset): (WebCore::InspectorDOMAgent::setDocument): (WebCore::InspectorDOMAgent::pushDocumentToFrontend): (WebCore::InspectorDOMAgent::nodeForPath): (WebCore::InspectorDOMAgent::pushNodePathToFrontend):
• inspector/InspectorDOMAgent.h:
• inspector/front-end/DOMAgent.js: (WebInspector.DOMNode.prototype._renumber): (WebInspector.DOMAgent.prototype._setDocument):
• inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel.prototype.reset): (WebInspector.ElementsPanel.prototype.setDocument.selectDefaultNode): (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode): (WebInspector.ElementsPanel.prototype.setDocument):
• inspector/front-end/InjectedScript.js: (InjectedScript.pushNodeByPathToFrontend):
• inspector/front-end/InjectedScriptAccess.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/elements-panel-selection-on-refresh-expected.txt (added)
• LayoutTests/inspector/elements-panel-selection-on-refresh.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InjectedScriptHost.cpp (modified) (1 diff)
• WebCore/inspector/InjectedScriptHost.h (modified) (1 diff)
• WebCore/inspector/InjectedScriptHost.idl (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (3 diffs)
• WebCore/inspector/InspectorDOMAgent.cpp (modified) (6 diffs)
• WebCore/inspector/InspectorDOMAgent.h (modified) (4 diffs)
• WebCore/inspector/front-end/DOMAgent.js (modified) (3 diffs)
• WebCore/inspector/front-end/ElementsPanel.js (modified) (3 diffs)
• WebCore/inspector/front-end/InjectedScript.js (modified) (1 diff)
• WebCore/inspector/front-end/InjectedScriptAccess.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-02  Pavel Feldman  <pfeldman@dhcp-172-28-174-220.spb.corp.google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: DOM tree selection disappears upon page refresh.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31142
+
+        * inspector/elements-panel-selection-on-refresh-expected.txt: Added.
+        * inspector/elements-panel-selection-on-refresh.html: Added.
+
 2009-12-02  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-02  Pavel Feldman  <pfeldman@dhcp-172-28-174-220.spb.corp.google.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: DOM tree selection disappears upon page refresh.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31142
+
+        Test: inspector/elements-panel-selection-on-refresh.html
+
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::pushNodeByPathToFrontend):
+        * inspector/InjectedScriptHost.h:
+        * inspector/InjectedScriptHost.idl:
+        * inspector/InspectorBackend.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::close):
+        (WebCore::InspectorController::releaseDOMAgent):
+        (WebCore::InspectorController::resetScriptObjects):
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::~InspectorDOMAgent):
+        (WebCore::InspectorDOMAgent::reset):
+        (WebCore::InspectorDOMAgent::setDocument):
+        (WebCore::InspectorDOMAgent::pushDocumentToFrontend):
+        (WebCore::InspectorDOMAgent::nodeForPath):
+        (WebCore::InspectorDOMAgent::pushNodePathToFrontend):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMNode.prototype._renumber):
+        (WebInspector.DOMAgent.prototype._setDocument):
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.reset):
+        (WebInspector.ElementsPanel.prototype.setDocument.selectDefaultNode):
+        (WebInspector.ElementsPanel.prototype.setDocument.selectLastSelectedNode):
+        (WebInspector.ElementsPanel.prototype.setDocument):
+        * inspector/front-end/InjectedScript.js:
+        (InjectedScript.pushNodeByPathToFrontend):
+        * inspector/front-end/InjectedScriptAccess.js:
+
 2009-12-01  Dave Hyatt  <hyatt@apple.com>
 

trunk/WebCore/inspector/InjectedScriptHost.cpp

@@ -124 +124 @@
 }
 
+long InjectedScriptHost::pushNodeByPathToFrontend(const String& path)
+{
+    InspectorDOMAgent* domAgent = inspectorDOMAgent();
+    if (!domAgent)
+        return 0;
+
+    Node* node = domAgent->nodeForPath(path);
+    if (!node)
+        return 0;
+
+    return domAgent->pushNodePathToFrontend(node);
+}
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 JavaScriptCallFrame* InjectedScriptHost::currentCallFrame() const

trunk/WebCore/inspector/InjectedScriptHost.h

@@ -64 +64 @@
     ScriptValue unwrapObject(const String& objectId);
     long pushNodePathToFrontend(Node* node, bool selectInUI);
+
     void addNodesToSearchResult(const String& nodeIds);
+    long pushNodeByPathToFrontend(const String& path);
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     JavaScriptCallFrame* currentCallFrame() const;

trunk/WebCore/inspector/InjectedScriptHost.idl

@@ -42 +42 @@
         [Custom] DOMObject unwrapObject(in long objectId);
         [Custom] int pushNodePathToFrontend(in DOMObject node, in boolean selectInUI);
+
         void addNodesToSearchResult(in DOMString nodeIds);
+        long pushNodeByPathToFrontend(in DOMString path);
 
 #if defined(ENABLE_JAVASCRIPT_DEBUGGER) && ENABLE_JAVASCRIPT_DEBUGGER

trunk/WebCore/inspector/InspectorController.cpp

@@ -625 +625 @@
     closeWindow();
 
-    m_frontend.set(0);
     m_injectedScriptObj = ScriptObject();
     releaseDOMAgent();
+    m_frontend.set(0);
     m_timelineAgent = 0;
     m_scriptState = 0;
@@ -665 +665 @@
     // no references to the DOM agent from the DOM tree.
     if (m_domAgent)
-        m_domAgent->setDocument(0);
+        m_domAgent->reset();
     m_domAgent = 0;
 }
@@ -728 +728 @@
 
     m_frontend->reset();
-    m_domAgent->setDocument(0);
+    m_domAgent->reset();
     m_objectGroups.clear();
     m_idToWrappedObject.clear();

trunk/WebCore/inspector/InspectorDOMAgent.cpp

@@ -69 +69 @@
 InspectorDOMAgent::~InspectorDOMAgent()
 {
-    setDocument(0);
-}
-
-void InspectorDOMAgent::setDocument(Document* doc)
-{
-    if (doc == mainFrameDocument())
-        return;
+    reset();
+}
+
+void InspectorDOMAgent::reset()
+{
     discardBindings();
 
@@ -83 +81 @@
 
     ASSERT(!m_documents.size());
+}
+
+void InspectorDOMAgent::setDocument(Document* doc)
+{
+    if (doc == mainFrameDocument())
+        return;
+
+    reset();
 
     if (doc) {
         startListening(doc);
-        if (doc->documentElement()) {
+        if (doc->documentElement())
             pushDocumentToFrontend();
-        }
-    }
+    } else
+        m_frontend->setDocument(ScriptObject());
 }
 
@@ -240 +246 @@
 }
 
-void InspectorDOMAgent::pushDocumentToFrontend()
+bool InspectorDOMAgent::pushDocumentToFrontend()
 {
     Document* document = mainFrameDocument();
+    if (!document)
+        return false;
     if (!m_documentNodeToIdMap.contains(document))
         m_frontend->setDocument(buildObjectForNode(document, 2, &m_documentNodeToIdMap));
+    return true;
 }
 
@@ -280 +289 @@
 }
 
+Node* InspectorDOMAgent::nodeForPath(const String& path)
+{
+    // The path is of form "1,HTML,2,BODY,1,DIV"
+    Node* node = mainFrameDocument();
+    if (!node)
+        return 0;
+
+    Vector<String> pathTokens;
+    path.split(",", false, pathTokens);
+    for (size_t i = 0; i < pathTokens.size() - 1; i += 2) {
+        bool success = true;
+        unsigned childNumber = pathTokens[i].toUInt(&success);
+        if (!success)
+            return 0;
+        if (childNumber >= innerChildNodeCount(node))
+            return 0;
+
+        Node* child = innerFirstChild(node);
+        String childName = pathTokens[i + 1];
+        for (size_t j = 0; child && j < childNumber; ++j)
+            child = innerNextSibling(child);
+
+        if (!child || child->nodeName() != childName)
+            return 0;
+        node = child;
+    }
+    return node;
+}
+
 void InspectorDOMAgent::getChildNodes(long callId, long nodeId)
 {
@@ -291 +329 @@
 
     // If we are sending information to the client that is currently being created. Send root node first.
-    pushDocumentToFrontend();
+    if (!pushDocumentToFrontend())
+        return 0;
 
     // Return id in case the node is known.
@@ -571 +610 @@
 }
 
-int InspectorDOMAgent::innerChildNodeCount(Node* node)
-{
-    int count = 0;
+unsigned InspectorDOMAgent::innerChildNodeCount(Node* node)
+{
+    unsigned count = 0;
     Node* child = innerFirstChild(node);
     while (child) {

trunk/WebCore/inspector/InspectorDOMAgent.h

@@ -84 +84 @@
         ~InspectorDOMAgent();
 
+        void reset();
+
         virtual bool operator==(const EventListener& other);
 
@@ -98 +100 @@
 
         Node* nodeForId(long nodeId);
+        Node* nodeForPath(const String& path);
         long pushNodePathToFrontend(Node* node);
 
@@ -110 +113 @@
         void unbind(Node* node, NodeToIdMap* nodesMap);
 
-        void pushDocumentToFrontend();
+        bool pushDocumentToFrontend();
         void pushChildNodesToFrontend(long nodeId);
 
@@ -124 +127 @@
         Node* innerNextSibling(Node* node);
         Node* innerPreviousSibling(Node* node);
-        int innerChildNodeCount(Node* node);
+        unsigned innerChildNodeCount(Node* node);
         Node* innerParentNode(Node* node);
         bool isWhitespace(Node* node);

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

@@ -180 +180 @@
         for (var i = 0; i < this._childNodeCount; ++i) {
             var child = this.children[i];
+            child.index = i;
             child.nextSibling = i + 1 < this._childNodeCount ? this.children[i + 1] : null;
             child.prevSibling = i - 1 >= 0 ? this.children[i - 1] : null;
@@ -374 +375 @@
     {
         this._idToDOMNode = {};
-        if (payload) {
+        if (payload && "id" in payload) {
             this.document = new WebInspector.DOMDocument(this, this._window, payload);
             this._idToDOMNode[payload.id] = this.document;
@@ -380 +381 @@
         } else
             this.document = null;
-        WebInspector.panels.elements.reset();
+        WebInspector.panels.elements.setDocument(this.document);
     },
 

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

@@ -165 +165 @@
     reset: function()
     {
+        if (this.focusedDOMNode) {
+            this._selectedPathOnReset = [];
+            var node = this.focusedDOMNode;
+            while ("index" in node) {
+                this._selectedPathOnReset.push(node.nodeName);
+                this._selectedPathOnReset.push(node.index);
+                node = node.parentNode;
+            }
+            this._selectedPathOnReset.reverse();
+        }
+
         this.rootDOMNode = null;
         this.focusedDOMNode = null;
@@ -179 +190 @@
         delete this.currentQuery;
         this.searchCanceled();
-
-        var domWindow = WebInspector.domAgent.domWindow;
-        if (!domWindow || !domWindow.document || !domWindow.document.firstChild)
-            return;
-
-        var inspectedRootDocument = domWindow.document;
+    },
+
+    setDocument: function(inspectedRootDocument)
+    {
+        this.reset();
+
+        if (!inspectedRootDocument)
+            return;
+
         inspectedRootDocument.addEventListener("DOMNodeInserted", this._nodeInserted.bind(this));
         inspectedRootDocument.addEventListener("DOMNodeRemoved", this._nodeRemoved.bind(this));
@@ -190 +204 @@
         this.treeOutline.suppressSelectHighlight = true;
         this.rootDOMNode = inspectedRootDocument;
-
-        var canidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
-        if (canidateFocusNode) {
-            this.focusedDOMNode = canidateFocusNode;
-
-            if (this.treeOutline.selectedTreeElement)
-                this.treeOutline.selectedTreeElement.expand();
-        }
         this.treeOutline.suppressSelectHighlight = false;
+
+        function selectDefaultNode()
+        {
+            this.treeOutline.suppressSelectHighlight = true;
+            var candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
+            if (candidateFocusNode) {
+                this.focusedDOMNode = candidateFocusNode;
+
+                if (this.treeOutline.selectedTreeElement)
+                    this.treeOutline.selectedTreeElement.expand();
+            }
+        }
+
+        function selectLastSelectedNode(nodeId)
+        {
+            var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : 0;
+            if (!node) {
+                selectDefaultNode.call(this);
+                return;
+            }
+
+            this.treeOutline.suppressSelectHighlight = true;
+            this.focusedDOMNode = node;
+            this.treeOutline.suppressSelectHighlight = false;
+        }
+
+        if (this._selectedPathOnReset)
+            InjectedScriptAccess.nodeByPath(this._selectedPathOnReset, selectLastSelectedNode.bind(this));
+        else
+            selectDefaultNode.call(this);
+        delete this._selectedPathOnReset;
     },
 

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

@@ -1051 +1051 @@
 }
 
+InjectedScript.nodeByPath = function(path)
+{
+    // We make this call through the injected script only to get a nice
+    // callback for it.
+    return InjectedScriptHost.pushNodeByPathToFrontend(path.join(","));
+}
+
 // Called from within InspectorController on the 'inspected page' side.
 InjectedScript.createProxyObject = function(object, objectId, abbreviate)

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

@@ -71 +71 @@
 InjectedScriptAccess._installHandler("performSearch");
 InjectedScriptAccess._installHandler("pushNodeToFrontend");
+InjectedScriptAccess._installHandler("nodeByPath");
 InjectedScriptAccess._installHandler("searchCanceled");
 InjectedScriptAccess._installHandler("setPropertyValue");