Title: [222585] trunk/Source/WebInspectorUI
- Revision
- 222585
- Author
- [email protected]
- Date
- 2017-09-27 16:54:41 -0700 (Wed, 27 Sep 2017)
Log Message
Web Inspector: Missing checks in DebuggerSidebarPanel for DOM debugging support
https://bugs.webkit.org/show_bug.cgi?id=177574
Reviewed by Joseph Pecoraro.
Check before using class members that are conditionally constructed based
on DOM debugging support.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WI.DebuggerSidebarPanel.prototype.closed):
(WI.DebuggerSidebarPanel.prototype.restoreStateFromCookie):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (222584 => 222585)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-09-27 23:50:21 UTC (rev 222584)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-09-27 23:54:41 UTC (rev 222585)
@@ -1,5 +1,19 @@
2017-09-27 Matt Baker <[email protected]>
+ Web Inspector: Missing checks in DebuggerSidebarPanel for DOM debugging support
+ https://bugs.webkit.org/show_bug.cgi?id=177574
+
+ Reviewed by Joseph Pecoraro.
+
+ Check before using class members that are conditionally constructed based
+ on DOM debugging support.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WI.DebuggerSidebarPanel.prototype.closed):
+ (WI.DebuggerSidebarPanel.prototype.restoreStateFromCookie):
+
+2017-09-27 Matt Baker <[email protected]>
+
Web Inspector: Create ResourceCollectionContentView and make CollectionContentView easier to extend
https://bugs.webkit.org/show_bug.cgi?id=177419
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (222584 => 222585)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-09-27 23:50:21 UTC (rev 222584)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-09-27 23:54:41 UTC (rev 222585)
@@ -267,8 +267,10 @@
{
super.closed();
- this._domBreakpointTreeController.disconnect();
- this._domBreakpointTreeController = null;
+ if (this._domBreakpointTreeController) {
+ this._domBreakpointTreeController.disconnect();
+ this._domBreakpointTreeController = null;
+ }
WI.Frame.removeEventListener(null, null, this);
WI.debuggerManager.removeEventListener(null, null, this);
@@ -376,7 +378,8 @@
else if (cookie[WI.DebuggerSidebarPanel.SelectedAssertionsCookieKey])
this._assertionsBreakpointTreeElement.revealAndSelect();
else if (cookie[WI.DebuggerSidebarPanel.SelectedAllRequestsCookieKey])
- this._xhrBreakpointTreeController.revealAndSelect(WI.domDebuggerManager.allRequestsBreakpoint);
+ if (this._xhrBreakpointTreeController)
+ this._xhrBreakpointTreeController.revealAndSelect(WI.domDebuggerManager.allRequestsBreakpoint);
else
super.restoreStateFromCookie(cookie, relaxedMatchDelay);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
