Changeset 144057 in webkit

Timestamp:

Feb 26, 2013, 7:57:50 AM (14 years ago)

Author:

Antoine Quint

Message:

Web Inspector: Cannot deep expand an element that has previously been partially expanded
​https://bugs.webkit.org/show_bug.cgi?id=110424

In the case where the children from the provided node have already been pushed, traverse children at the depth provided until we find children that have not been pushed yet.

Reviewed by Pavel Feldman.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector-protocol/dom-request-child-nodes-depth-expected.txt (modified) (1 diff)
• LayoutTests/inspector-protocol/dom-request-child-nodes-depth.html (modified) (5 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-25  Antoine Quint  <graouts@apple.com>
+
+        Web Inspector: Cannot deep expand an element that has previously been partially expanded
+        https://bugs.webkit.org/show_bug.cgi?id=110424
+
+        Update existing test for InspectorDOMAgent::requestChildNodes to cover the case
+        where we want to request children for a node that already has had children pushed
+        but may not have pushed children at the depth requested.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector-protocol/dom-request-child-nodes-depth-expected.txt:
+        * inspector-protocol/dom-request-child-nodes-depth.html:
+
 2013-02-26  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/inspector-protocol/dom-request-child-nodes-depth-expected.txt

@@ -10 +10 @@
 PASS: First child has no .children property
 
-=== Get all children of div#depth-1 ===
+=== Get children of div#depth-1 three levels deep ===
+
+PASS: div#depth-1 has nodes 3 levels deep
+
+=== Get all children of body ===
 
 PASS: div#depth-1 has nodes 9 levels deep

trunk/LayoutTests/inspector-protocol/dom-request-child-nodes-depth.html

@@ -6 +6 @@
 function test()
 {
-
+    var firstDiv;
     var eventsCount = 0;
 
@@ -18 +18 @@
             gotImmediateChildren(messageObject);
         else if (eventsCount === 2)
+            gotAdditionalChildren(messageObject);
+        else if (eventsCount === 3)
             gotAllChildren(messageObject);
+        else
+            InspectorTest.log(JSON.stringify(messageObject, null, "    "));
     };
     
@@ -44 +48 @@
     function gotImmediateChildren(messageObject)
     {
-        var firstChild = messageObject.params.nodes[0];
-        assert("First child is a div", firstChild.localName, "div");
-        assert("First child is div#depth-1", firstChild.attributes[1], "depth-1");
-        assert("First child has one child", firstChild.childNodeCount, 1);
-        assert("First child has no .children property", firstChild.children, undefined);
+        firstDiv = messageObject.params.nodes[0];
+        assert("First child is a div", firstDiv.localName, "div");
+        assert("First child is div#depth-1", firstDiv.attributes[1], "depth-1");
+        assert("First child has one child", firstDiv.childNodeCount, 1);
+        assert("First child has no .children property", firstDiv.children, undefined);
 
         step({
-            name: "Get all children of div#depth-1",
+            name: "Get children of div#depth-1 three levels deep",
             command: "DOM.requestChildNodes",
-            parameters: {"nodeId": firstChild.nodeId, "depth": -1}
+            parameters: {"nodeId": firstDiv.nodeId, "depth": 3}
+        });
+    };
+
+    function gotAdditionalChildren(messageObject)
+    {
+        var depth = 1;
+        var firstChild = messageObject.params.nodes[0];
+        var node = firstChild;
+        while (node && node.children) {
+            depth++;
+            node = node.children[0];
+        }
+
+        assert("div#depth-1 has nodes 3 levels deep", depth, 3);
+
+        step({
+            name: "Get all children of body",
+            command: "DOM.requestChildNodes",
+            parameters: {"nodeId": firstDiv.nodeId, "depth": -1}
         });
     };
@@ -67 +90 @@
         }
 
-        assert("div#depth-1 has nodes 9 levels deep", depth, 9);
+        // We have requested nodes 3-level deep so far, so
+        // we should have gotten an additional 6 levels of depth.
+        assert("div#depth-1 has nodes 9 levels deep", depth, 6);
 
         step({
             name: "Pass an invalid depth",
             command: "DOM.requestChildNodes",
-            parameters: {"nodeId": firstChild.nodeId, "depth": 0},
+            parameters: {"nodeId": firstDiv.nodeId, "depth": 0},
             callback: finishTest
         });
@@ -79 +104 @@
     function finishTest()
     {
-        assert("Expected number of setChildNodes events", eventsCount, 2);
+        assert("Expected number of setChildNodes events", eventsCount, 3);
         
         InspectorTest.completeTest();

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Antoine Quint  <graouts@apple.com>
+
+        Web Inspector: Cannot deep expand an element that has previously been partially expanded
+        https://bugs.webkit.org/show_bug.cgi?id=110424
+
+        In the case where the children from the provided node have already been pushed, traverse
+        children at the depth provided until we find children that have not been pushed yet.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
+
 2013-02-26  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -444 +444 @@
     if (!node || (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE && node->nodeType() != Node::DOCUMENT_FRAGMENT_NODE))
         return;
-    if (m_childrenRequested.contains(nodeId))
-        return;
 
     NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
+
+    if (m_childrenRequested.contains(nodeId)) {
+        if (depth <= 1)
+            return;
+
+        depth--;
+
+        for (node = innerFirstChild(node); node; node = innerNextSibling(node)) {
+            int childNodeId = nodeMap->get(node);
+            ASSERT(childNodeId);
+            pushChildNodesToFrontend(childNodeId, depth);
+        }
+
+        return;
+    }
+
     RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = buildArrayForContainerChildren(node, depth, nodeMap);
     m_frontend->setChildNodes(nodeId, children.release());