Title: [185485] trunk/Source/WebInspectorUI
- Revision
- 185485
- Author
- [email protected]
- Date
- 2015-06-11 19:59:59 -0700 (Thu, 11 Jun 2015)
Log Message
Web Inspector: CSS Regions not displaying DOM Trees in inspector
https://bugs.webkit.org/show_bug.cgi?id=145903
Patch by Joseph Pecoraro <[email protected]> on 2015-06-11
Reviewed by Timothy Hatcher.
* UserInterface/Controllers/DOMTreeManager.js:
(WebInspector.DOMTreeManager.prototype._updateContentFlowFromPayload):
Fix function inside the assertion to actually return a value.
* UserInterface/Views/DOMTreeOutline.js:
(WebInspector.DOMTreeOutline.prototype.update):
For DOMTreeOutlines without a root node, don't clear the tree on updates,
since that will clear the nodes that have already been added explicitly.
* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype._treeElementSelected):
* UserInterface/Views/ResourcesTabContentView.js:
(WebInspector.ResourcesTabContentView.prototype.canShowRepresentedObject):
ResourceTab and sidebar can deal with ContentFlow related views.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (185484 => 185485)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-12 02:49:12 UTC (rev 185484)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-12 02:59:59 UTC (rev 185485)
@@ -1,5 +1,27 @@
2015-06-11 Joseph Pecoraro <[email protected]>
+ Web Inspector: CSS Regions not displaying DOM Trees in inspector
+ https://bugs.webkit.org/show_bug.cgi?id=145903
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype._updateContentFlowFromPayload):
+ Fix function inside the assertion to actually return a value.
+
+ * UserInterface/Views/DOMTreeOutline.js:
+ (WebInspector.DOMTreeOutline.prototype.update):
+ For DOMTreeOutlines without a root node, don't clear the tree on updates,
+ since that will clear the nodes that have already been added explicitly.
+
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype._treeElementSelected):
+ * UserInterface/Views/ResourcesTabContentView.js:
+ (WebInspector.ResourcesTabContentView.prototype.canShowRepresentedObject):
+ ResourceTab and sidebar can deal with ContentFlow related views.
+
+2015-06-11 Joseph Pecoraro <[email protected]>
+
Web Inspector: IndexedDB data not showing for MDN example page
https://bugs.webkit.org/show_bug.cgi?id=145851
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (185484 => 185485)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-06-12 02:49:12 UTC (rev 185484)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-06-12 02:59:59 UTC (rev 185485)
@@ -435,7 +435,7 @@
_updateContentFlowFromPayload(contentFlow, flowPayload)
{
console.assert(contentFlow.contentNodes.length === flowPayload.content.length);
- console.assert(contentFlow.contentNodes.every(function(node, i) { node.id === flowPayload.content[i]; }));
+ console.assert(contentFlow.contentNodes.every(function(node, i) { return node.id === flowPayload.content[i]; }));
// FIXME: Collect the regions from the payload.
contentFlow.overset = flowPayload.overset;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (185484 => 185485)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-06-12 02:49:12 UTC (rev 185484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2015-06-12 02:59:59 UTC (rev 185485)
@@ -161,11 +161,11 @@
{
var selectedNode = this.selectedTreeElement ? this.selectedTreeElement.representedObject : null;
- this.removeChildren();
-
if (!this.rootDOMNode)
return;
+ this.removeChildren();
+
var treeElement;
if (this._includeRootDOMNode) {
treeElement = new WebInspector.DOMTreeElement(this.rootDOMNode);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (185484 => 185485)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-06-12 02:49:12 UTC (rev 185484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-06-12 02:59:59 UTC (rev 185485)
@@ -335,7 +335,9 @@
if (treeElement instanceof WebInspector.FolderTreeElement)
return;
- if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement) {
+ if (treeElement instanceof WebInspector.ResourceTreeElement
+ || treeElement instanceof WebInspector.ScriptTreeElement
+ || treeElement instanceof WebInspector.ContentFlowTreeElement) {
WebInspector.showRepresentedObject(treeElement.representedObject);
return;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js (185484 => 185485)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js 2015-06-12 02:49:12 UTC (rev 185484)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js 2015-06-12 02:59:59 UTC (rev 185485)
@@ -49,7 +49,10 @@
canShowRepresentedObject: function(representedObject)
{
- return representedObject instanceof WebInspector.Frame || representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.Script;
+ return representedObject instanceof WebInspector.Frame
+ || representedObject instanceof WebInspector.Resource
+ || representedObject instanceof WebInspector.Script
+ || representedObject instanceof WebInspector.ContentFlow;
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
