Changeset 171227 in webkit

Timestamp:

Jul 18, 2014 11:20:54 AM (10 years ago)

Author:

timothy@apple.com

Message:

Revert r169735 since it broke Timeline, and fix bug 129696 in a more targeted way.

REGRESSION (r169735): Web Inspector: Timeline tree outline missing data until collapse-expand.
​https://bugs.webkit.org/show_bug.cgi?id=134845

Reviewed by Joseph Pecoraro.

• UserInterface/Views/DOMTreeElement.js:

(WebInspector.DOMTreeElement.prototype.adjustCollapsedRange): Use button isteand of assuming
item.listItemElement will be ready to use. The listItemElement node is lazily created.

• UserInterface/Views/TreeOutline.js:

(TreeOutline.prototype.appendChild): Don't attach unless _childrenListNode exists.
(TreeOutline.prototype.insertChild): Ditto.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-07-18  Timothy Hatcher  <timothy@apple.com>
+
+        Revert r169735 since it broke Timeline, and fix bug 129696 in a more targeted way.
+
+        REGRESSION (r169735): Web Inspector: Timeline tree outline missing data until collapse-expand.
+        https://bugs.webkit.org/show_bug.cgi?id=134845
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/DOMTreeElement.js:
+        (WebInspector.DOMTreeElement.prototype.adjustCollapsedRange): Use button isteand of assuming
+        item.listItemElement will be ready to use. The listItemElement node is lazily created.
+        * UserInterface/Views/TreeOutline.js:
+        (TreeOutline.prototype.appendChild): Don't attach unless _childrenListNode exists.
+        (TreeOutline.prototype.insertChild): Ditto.
+
 2014-07-17  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -410 +410 @@
                 button.className = "show-all-nodes";
                 button.value = "";
+
                 var item = new TreeElement(button, null, false);
                 item.selectable = false;
                 item.expandAllButton = true;
+
                 this.insertChild(item, targetButtonIndex);
-                this.expandAllButtonElement = item.listItemElement.firstChild;
+                this.expandAllButtonElement = button;
                 this.expandAllButtonElement.__treeElement = item;
                 this.expandAllButtonElement.addEventListener("click", this.handleLoadAllChildren.bind(this), false);
             } else if (!this.expandAllButtonElement.__treeElement.parent)
                 this.insertChild(this.expandAllButtonElement.__treeElement, targetButtonIndex);
+
             this.expandAllButtonElement.textContent = WebInspector.UIString("Show All Nodes (%d More)").format(childNodeCount - expandedChildCount);
         } else if (this.expandAllButtonElement)

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

@@ -86 +86 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    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._childrenListNode)
+        child._attach();
 
     if (this.treeOutline.onadd)
@@ -142 +135 @@
         child.expanded = child.treeOutline._treeElementsExpandedState[child.identifier];
 
-    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._childrenListNode)
+        child._attach();
 
     if (this.treeOutline.onadd)
@@ -359 +345 @@
         if (ancestors[i] === representedObject)
             continue;
+
         // FIXME: we could do something faster than findTreeElement since we will know the next
         // ancestor exists in the tree.