Changeset 169735 in webkit

Timestamp:

Jun 9, 2014 5:46:21 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION: Web Inspector: Exception showing the DOM tree for a node with too many children
​https://bugs.webkit.org/show_bug.cgi?id=129696

Fix issue where sometimes inspecting an element will try to attach the "show all nodes" button
before the expand function is called in TreeElement before _childrenListNode has been set.

Patch by Jono Wells <​jonowells@apple.com> on 2014-06-09
Reviewed by Joseph Pecoraro.

• UserInterface/Views/TreeOutline.js:

(TreeOutline.prototype.appendChild):
(TreeOutline.prototype.insertChild):
Added check for existance of this._childrenListNode.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/TreeOutline.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-06-09  Jono Wells  <jonowells@apple.com>
+
+        REGRESSION: Web Inspector: Exception showing the DOM tree for a node with too many children
+        https://bugs.webkit.org/show_bug.cgi?id=129696
+
+        Fix issue where sometimes inspecting an element will try to attach the "show all nodes" button
+        before the expand function is called in TreeElement before _childrenListNode has been set.
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/TreeOutline.js:
+        (TreeOutline.prototype.appendChild):
+        (TreeOutline.prototype.insertChild):
+        Added check for existance of this._childrenListNode.
+
 2014-05-29  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js

@@ -86 +86 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    if (this._childrenListNode)
-        child._attach();
+    if (!this._childrenListNode) {
+        this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
+        this._childrenListNode.parentTreeElement = this;
+        this._childrenListNode.classList.add("children");
+        if (this.hidden)
+            this._childrenListNode.classList.add("hidden");
+    }
+
+    child._attach();
 
     if (this.treeOutline.onadd)
@@ -135 +142 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    if (this._childrenListNode)
-        child._attach();
+    if (!this._childrenListNode) {
+        this._childrenListNode = this.treeOutline._childrenListNode.ownerDocument.createElement("ol");
+        this._childrenListNode.parentTreeElement = this;
+        this._childrenListNode.classList.add("children");
+        if (this.hidden)
+            this._childrenListNode.classList.add("hidden");
+    }
+
+    child._attach();
 
     if (this.treeOutline.onadd)