Title: [183214] trunk/Source/WebInspectorUI
- Revision
- 183214
- Author
- [email protected]
- Date
- 2015-04-23 15:00:08 -0700 (Thu, 23 Apr 2015)
Log Message
Web Inspector: Fix layering issues with ApplicationCacheFrameTreeElement
https://bugs.webkit.org/show_bug.cgi?id=144113
Reviewed by Joseph Pecoraro.
* UserInterface/Views/ApplicationCacheFrameTreeElement.js:
(WebInspector.ApplicationCacheFrameTreeElement.prototype.updateTitles):
(WebInspector.ApplicationCacheFrameTreeElement):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (183213 => 183214)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-23 21:58:48 UTC (rev 183213)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-23 22:00:08 UTC (rev 183214)
@@ -1,3 +1,14 @@
+2015-04-23 Timothy Hatcher <[email protected]>
+
+ Web Inspector: Fix layering issues with ApplicationCacheFrameTreeElement
+ https://bugs.webkit.org/show_bug.cgi?id=144113
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ApplicationCacheFrameTreeElement.js:
+ (WebInspector.ApplicationCacheFrameTreeElement.prototype.updateTitles):
+ (WebInspector.ApplicationCacheFrameTreeElement):
+
2015-04-22 Matt Baker <[email protected]>
Web Inspector: clicking Timelines tree view nodes should not change the current content view
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js (183213 => 183214)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js 2015-04-23 21:58:48 UTC (rev 183213)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameTreeElement.js 2015-04-23 22:00:08 UTC (rev 183214)
@@ -47,10 +47,18 @@
// and it doesn't match the mainTitle.
var subtitle = WebInspector.displayNameForHost(parsedURL.host);
- // FIXME: This is bad layering. We should not be calling a global object to get this.
- var manifestTreeElement = WebInspector.resourceSidebarPanel.treeElementForRepresentedObject(this.representedObject.manifest);
+ var manifestTreeElement = null;
+ var currentAncestor = this.parent;
+ while (currentAncestor && !currentAncestor.root) {
+ if (currentAncestor instanceof WebInspector.ApplicationCacheManifestTreeElement) {
+ manifestTreeElement = currentAncestor;
+ break;
+ }
- var subtitleIsDuplicate = subtitle === this._mainTitle || subtitle === manifestTreeElement.subtitle;
+ currentAncestor = currentAncestor.parent;
+ }
+
+ var subtitleIsDuplicate = subtitle === this._mainTitle || manifestTreeElement ? subtitle === manifestTreeElement.subtitle : false;
this.subtitle = subtitleIsDuplicate ? null : subtitle;
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
