Title: [248094] trunk/Source/WebInspectorUI
Revision
248094
Author
[email protected]
Date
2019-07-31 21:24:50 -0700 (Wed, 31 Jul 2019)

Log Message

Web Inspector: Uncaught Exception: TypeError: null is not an object (evaluating 'issueMessage.sourceCodeLocation.sourceCode')
https://bugs.webkit.org/show_bug.cgi?id=200296

Reviewed by Joseph Pecoraro.

When fetching all `WI.IssueMessage`s for a given `WI.SourceCode`, the `WI.IssueMessage` may
be associated in a different way (e.g. by url, instead of `WI.SourceCodeLocation`). As such,
we should pass the `WI.SourceCode` along, and use it when adding the `WI.IssueTreeElement`.

* UserInterface/Views/DebuggerSidebarPanel.js:
(WI.DebuggerSidebarPanel.prototype._addIssuesForSourceCode):
(WI.DebuggerSidebarPanel.prototype._addIssue):

* UserInterface/Views/SourcesNavigationSidebarPanel.js:
(WI.SourcesNavigationSidebarPanel.prototype._addIssue):
(WI.SourcesNavigationSidebarPanel.prototype._addIssuesForSourceCode):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (248093 => 248094)


--- trunk/Source/WebInspectorUI/ChangeLog	2019-08-01 01:23:14 UTC (rev 248093)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-08-01 04:24:50 UTC (rev 248094)
@@ -1,5 +1,24 @@
 2019-07-31  Devin Rousso  <[email protected]>
 
+        Web Inspector: Uncaught Exception: TypeError: null is not an object (evaluating 'issueMessage.sourceCodeLocation.sourceCode')
+        https://bugs.webkit.org/show_bug.cgi?id=200296
+
+        Reviewed by Joseph Pecoraro.
+
+        When fetching all `WI.IssueMessage`s for a given `WI.SourceCode`, the `WI.IssueMessage` may
+        be associated in a different way (e.g. by url, instead of `WI.SourceCodeLocation`). As such,
+        we should pass the `WI.SourceCode` along, and use it when adding the `WI.IssueTreeElement`.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WI.DebuggerSidebarPanel.prototype._addIssuesForSourceCode):
+        (WI.DebuggerSidebarPanel.prototype._addIssue):
+
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel.prototype._addIssue):
+        (WI.SourcesNavigationSidebarPanel.prototype._addIssuesForSourceCode):
+
+2019-07-31  Devin Rousso  <[email protected]>
+
         Web Inspector: DOM: provide a way to disable/breakpoint all event listeners for a given DOM node or event type
         https://bugs.webkit.org/show_bug.cgi?id=200233
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (248093 => 248094)


--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js	2019-08-01 01:23:14 UTC (rev 248093)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js	2019-08-01 04:24:50 UTC (rev 248094)
@@ -584,7 +584,7 @@
     {
         var issues = WI.consoleManager.issuesForSourceCode(sourceCode);
         for (var issue of issues)
-            this._addIssue(issue);
+            this._addIssue(issue, sourceCode);
     }
 
     _addTreeElementForSourceCodeToTreeOutline(sourceCode, treeOutline)
@@ -1397,13 +1397,14 @@
         this._pauseReasonLinkContainerElement.appendChild(linkElement);
     }
 
-    _addIssue(issueMessage)
+    _addIssue(issueMessage, sourceCode)
     {
         let issueTreeElement = this._scriptsContentTreeOutline.findTreeElement(issueMessage);
         if (issueTreeElement)
             return issueTreeElement;
 
-        let parentTreeElement = this._addTreeElementForSourceCodeToTreeOutline(issueMessage.sourceCodeLocation.sourceCode, this._scriptsContentTreeOutline);
+        console.assert(sourceCode || (issueMessage.sourceCodeLocation && issueMessage.sourceCodeLocation.sourceCode));
+        let parentTreeElement = this._addTreeElementForSourceCodeToTreeOutline(sourceCode || issueMessage.sourceCodeLocation.sourceCode, this._scriptsContentTreeOutline);
         if (!parentTreeElement)
             return null;
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js (248093 => 248094)


--- trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js	2019-08-01 01:23:14 UTC (rev 248093)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js	2019-08-01 04:24:50 UTC (rev 248094)
@@ -1025,11 +1025,12 @@
         return breakpoints;
     }
 
-    _addIssue(issueMessage)
+    _addIssue(issueMessage, sourceCode)
     {
         let issueTreeElement = this._resourcesTreeOutline.findTreeElement(issueMessage);
         if (!issueTreeElement) {
-            let parentTreeElement = this._resourcesTreeOutline.findTreeElement(issueMessage.sourceCodeLocation.sourceCode);
+            console.assert(sourceCode || (issueMessage.sourceCodeLocation && issueMessage.sourceCodeLocation.sourceCode));
+            let parentTreeElement = this._resourcesTreeOutline.findTreeElement(sourceCode || issueMessage.sourceCodeLocation.sourceCode);
             if (!parentTreeElement)
                 return null;
 
@@ -1068,7 +1069,7 @@
     _addIssuesForSourceCode(sourceCode)
     {
         for (let issue of WI.consoleManager.issuesForSourceCode(sourceCode))
-            this._addIssue(issue);
+            this._addIssue(issue, sourceCode);
     }
 
     _updateTemporarilyDisabledBreakpointsButtons()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to