[webkit-changes] [171417] branches/safari-600.1-branch/Source/WebInspectorUI

Tue, 22 Jul 2014 22:57:07 -0700

Title: [171417] branches/safari-600.1-branch/Source/WebInspectorUI

Diff

Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (171416 => 171417)


--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog	2014-07-23 05:53:50 UTC (rev 171416)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog	2014-07-23 05:56:43 UTC (rev 171417)
@@ -1,3 +1,23 @@
+2014-07-22  Dana Burkart  <dburk...@apple.com>
+
+        Merge r171227.
+
+    2014-07-18  Timothy Hatcher  <timo...@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  <timo...@apple.com>
 
         Make console.profile record to the Timeline.

Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (171416 => 171417)


--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js	2014-07-23 05:53:50 UTC (rev 171416)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js	2014-07-23 05:56:43 UTC (rev 171417)
@@ -409,15 +409,18 @@
                 var button = document.createElement("button");
                 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)
             delete this.expandAllButtonElement;

Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (171416 => 171417)


--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2014-07-23 05:53:50 UTC (rev 171416)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2014-07-23 05:56:43 UTC (rev 171417)
@@ -85,16 +85,9 @@
     if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
         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");
-    }
+    if (this._childrenListNode)
+        child._attach();
 
-    child._attach();
-
     if (this.treeOutline.onadd)
         this.treeOutline.onadd(child);
 
@@ -141,16 +134,9 @@
     if (child.hasChildren && child.treeOutline._treeElementsExpandedState[child.identifier] !== undefined)
         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");
-    }
+    if (this._childrenListNode)
+        child._attach();
 
-    child._attach();
-
     if (this.treeOutline.onadd)
         this.treeOutline.onadd(child);
 
@@ -358,6 +344,7 @@
         // again, to prevent infinite recursion.
         if (ancestors[i] === representedObject)
             continue;
+
         // FIXME: we could do something faster than findTreeElement since we will know the next
         // ancestor exists in the tree.
         item = this.findTreeElement(ancestors[i], isAncestor, getParent);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to