Title: [209257] trunk/Source/WebInspectorUI
- Revision
- 209257
- Author
- nvasil...@apple.com
- Date
- 2016-12-02 12:59:00 -0800 (Fri, 02 Dec 2016)
Log Message
REGRESSION (r192344): Web Inspector: Turning off Code Coverage or Type Profiler logs an error
https://bugs.webkit.org/show_bug.cgi?id=164804
<rdar://problem/29278028>
Reviewed by Matt Baker.
BasicBlockAnnotator and TypeTokenAnnotator were instanciated for a resource in an inactive Debugger tab.
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement):
Don't show any content view if we are not in a selected tab.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (209256 => 209257)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-02 20:31:58 UTC (rev 209256)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-02 20:59:00 UTC (rev 209257)
@@ -1,3 +1,17 @@
+2016-12-02 Nikita Vasilyev <nvasil...@apple.com>
+
+ REGRESSION (r192344): Web Inspector: Turning off Code Coverage or Type Profiler logs an error
+ https://bugs.webkit.org/show_bug.cgi?id=164804
+ <rdar://problem/29278028>
+
+ Reviewed by Matt Baker.
+
+ BasicBlockAnnotator and TypeTokenAnnotator were instanciated for a resource in an inactive Debugger tab.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement):
+ Don't show any content view if we are not in a selected tab.
+
2016-12-01 Matt Baker <mattba...@apple.com>
Web Inspector: Show async stack traces for workers
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (209256 => 209257)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-12-02 20:31:58 UTC (rev 209256)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-12-02 20:59:00 UTC (rev 209257)
@@ -213,6 +213,11 @@
let contentView = this.contentBrowser.contentViewForRepresentedObject(treeElement.representedObject);
if (contentView && contentView.parentContainer && contentView.parentContainer !== this.contentBrowser.contentViewContainer)
return false;
+
+ // contentView.parentContainer may be null. Check for selected tab, too.
+ let selectedTabContentView = WebInspector.tabBrowser.selectedTabContentView;
+ if (selectedTabContentView && selectedTabContentView.contentBrowser !== this.contentBrowser)
+ return false;
}
let contentView = this.contentBrowser.showContentViewForRepresentedObject(treeElement.representedObject);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
