Title: [183766] trunk/Source/WebInspectorUI
- Revision
- 183766
- Author
- [email protected]
- Date
- 2015-05-04 13:34:56 -0700 (Mon, 04 May 2015)
Log Message
REGRESSION: Web Inspector: FrameTreeElement does not folders properly when loading a page
https://bugs.webkit.org/show_bug.cgi?id=144535
Reviewed by Joseph Pecoraro.
* UserInterface/Views/FolderizedTreeElement.js:
(WebInspector.FolderizedTreeElement.prototype.addChildForRepresentedObject): Fix an exception if not in a tree.
(WebInspector.FolderizedTreeElement.prototype.prepareToPopulate):
(WebInspector.FolderizedTreeElement.prototype._populateFromNewChildQueue):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183765 => 183766)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-04 20:27:50 UTC (rev 183765)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-04 20:34:56 UTC (rev 183766)
@@ -1,5 +1,17 @@
2015-05-04 Timothy Hatcher <[email protected]>
+ REGRESSION: Web Inspector: FrameTreeElement does not folders properly when loading a page
+ https://bugs.webkit.org/show_bug.cgi?id=144535
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/FolderizedTreeElement.js:
+ (WebInspector.FolderizedTreeElement.prototype.addChildForRepresentedObject): Fix an exception if not in a tree.
+ (WebInspector.FolderizedTreeElement.prototype.prepareToPopulate):
+ (WebInspector.FolderizedTreeElement.prototype._populateFromNewChildQueue):
+
+2015-05-04 Timothy Hatcher <[email protected]>
+
Web Inspector: Allow closing and reopening the Timelines tab
https://bugs.webkit.org/show_bug.cgi?id=144520
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js (183765 => 183766)
--- trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2015-05-04 20:27:50 UTC (rev 183765)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FolderizedTreeElement.js 2015-05-04 20:34:56 UTC (rev 183766)
@@ -96,6 +96,12 @@
return;
}
+ if (!this.treeOutline) {
+ // Just mark as needing to update to avoid doing work that might not be needed.
+ this.shouldRefreshChildren = true;
+ return;
+ }
+
var childTreeElement = this.treeOutline.getCachedTreeElement(representedObject);
if (!childTreeElement)
childTreeElement = new settings.treeElementConstructor(representedObject);
@@ -154,8 +160,12 @@
prepareToPopulate()
{
- if (!this._groupedIntoFolders && this._shouldGroupIntoFolders())
+ if (!this._groupedIntoFolders && this._shouldGroupIntoFolders()) {
this._groupedIntoFolders = true;
+ return true;
+ }
+
+ return false;
}
// Private
@@ -177,7 +187,12 @@
return;
}
- this.prepareToPopulate();
+ if (this.prepareToPopulate()) {
+ // Will now folderize, repopulate children.
+ this._clearNewChildQueue();
+ this.shouldRefreshChildren = true;
+ return;
+ }
for (var i = 0; i < this._newChildQueue.length; ++i)
this.addChildForRepresentedObject(this._newChildQueue[i]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
