Changeset 248094 in webkit

Timestamp:

Jul 31, 2019 9:24:50 PM (5 years ago)

Author:

Devin Rousso

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.IssueMessages 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):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (3 diffs)
• UserInterface/Views/SourcesNavigationSidebarPanel.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-07-31  Devin Rousso  <drousso@apple.com>
+
+        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  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js

@@ -585 +585 @@
         var issues = WI.consoleManager.issuesForSourceCode(sourceCode);
         for (var issue of issues)
-            this._addIssue(issue);
+            this._addIssue(issue, sourceCode);
     }
 
@@ -1398 +1398 @@
     }
 
-    _addIssue(issueMessage)
+    _addIssue(issueMessage, sourceCode)
     {
         let issueTreeElement = this._scriptsContentTreeOutline.findTreeElement(issueMessage);
@@ -1404 +1404 @@
             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;

trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js

@@ -1026 +1026 @@
     }
 
-    _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;
@@ -1069 +1070 @@
     {
         for (let issue of WI.consoleManager.issuesForSourceCode(sourceCode))
-            this._addIssue(issue);
+            this._addIssue(issue, sourceCode);
     }