Title: [218356] trunk/Source/WebInspectorUI
- Revision
- 218356
- Author
- commit-qu...@webkit.org
- Date
- 2017-06-15 14:26:33 -0700 (Thu, 15 Jun 2017)
Log Message
Uncaught Exception: TypeError: null is not an object (evaluating 'this.contentBrowser.contentViewForRepresentedObject')
https://bugs.webkit.org/show_bug.cgi?id=173425
<rdar://problem/32744172>
Patch by Joseph Pecoraro <pecor...@apple.com> on 2017-06-15
Reviewed by Devin Rousso.
* UserInterface/Views/ContentBrowserTabContentView.js:
(WebInspector.ContentBrowserTabContentView.prototype.shown):
Reorder slightly so the NavigationSidebar has its ContentBrowser set
before anyone tries to restore views in the sidebar.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype.showDefaultContentView):
Try to select a script/resource content view instead of nothing.
(WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
When a resource is selected, save it using the normal path.
* UserInterface/Views/NetworkSidebarPanel.js:
(WebInspector.NetworkSidebarPanel.prototype.canShowDifferentContentView):
Remove a reference to an unused / stale member variable.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (218355 => 218356)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-06-15 21:19:08 UTC (rev 218355)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-06-15 21:26:33 UTC (rev 218356)
@@ -1,3 +1,27 @@
+2017-06-15 Joseph Pecoraro <pecor...@apple.com>
+
+ Uncaught Exception: TypeError: null is not an object (evaluating 'this.contentBrowser.contentViewForRepresentedObject')
+ https://bugs.webkit.org/show_bug.cgi?id=173425
+ <rdar://problem/32744172>
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/ContentBrowserTabContentView.js:
+ (WebInspector.ContentBrowserTabContentView.prototype.shown):
+ Reorder slightly so the NavigationSidebar has its ContentBrowser set
+ before anyone tries to restore views in the sidebar.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.showDefaultContentView):
+ Try to select a script/resource content view instead of nothing.
+
+ (WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
+ When a resource is selected, save it using the normal path.
+
+ * UserInterface/Views/NetworkSidebarPanel.js:
+ (WebInspector.NetworkSidebarPanel.prototype.canShowDifferentContentView):
+ Remove a reference to an unused / stale member variable.
+
2017-06-14 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Pretty print / type info / code coverage buttons disappear after switching tabs
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (218355 => 218356)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2017-06-15 21:19:08 UTC (rev 218355)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2017-06-15 21:26:33 UTC (rev 218356)
@@ -92,14 +92,16 @@
shown()
{
+ if (this.navigationSidebarPanel) {
+ if (!this.navigationSidebarPanel.contentBrowser)
+ this.navigationSidebarPanel.contentBrowser = this._contentBrowser;
+ }
+
super.shown();
this._contentBrowser.shown();
if (this.navigationSidebarPanel) {
- if (!this.navigationSidebarPanel.contentBrowser)
- this.navigationSidebarPanel.contentBrowser = this._contentBrowser;
-
if (!this._contentBrowser.currentContentView)
this.navigationSidebarPanel.showDefaultContentView();
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (218355 => 218356)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-06-15 21:19:08 UTC (rev 218355)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-06-15 21:26:33 UTC (rev 218356)
@@ -280,7 +280,13 @@
showDefaultContentView()
{
- var currentTreeElement = this._contentTreeOutline.children[0];
+ if (WebInspector.frameResourceManager.mainFrame) {
+ let mainTreeElement = this._scriptsContentTreeOutline.findTreeElement(WebInspector.frameResourceManager.mainFrame.mainResource);
+ if (mainTreeElement && this.showDefaultContentViewForTreeElement(mainTreeElement))
+ return;
+ }
+
+ let currentTreeElement = this._scriptsContentTreeOutline.children[0];
while (currentTreeElement && !currentTreeElement.root) {
if (currentTreeElement instanceof WebInspector.ResourceTreeElement || currentTreeElement instanceof WebInspector.ScriptTreeElement) {
if (this.showDefaultContentViewForTreeElement(currentTreeElement))
@@ -330,8 +336,10 @@
console.assert(cookie);
var selectedTreeElement = this._breakpointsContentTreeOutline.selectedTreeElement;
- if (!selectedTreeElement)
+ if (!selectedTreeElement) {
+ super.saveStateToCookie(cookie);
return;
+ }
var representedObject = selectedTreeElement.representedObject;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (218355 => 218356)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-06-15 21:19:08 UTC (rev 218355)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-06-15 21:26:33 UTC (rev 218356)
@@ -62,7 +62,7 @@
if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
return false;
- return !this.restoringState || !this._restoredShowingNetworkGridContentView;
+ return !this.restoringState;
}
// Protected
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
