Changeset 245165 in webkit

Timestamp:

May 9, 2019 5:12:31 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Uncaught Exception: null is not an object (evaluating 'url.startsWith')
​https://bugs.webkit.org/show_bug.cgi?id=196662
<rdar://problem/49659633>

Reviewed by Timothy Hatcher.

• UserInterface/Views/ConsoleMessageView.js:

(WI.ConsoleMessageView.prototype._appendLocationLink):
(WI.ConsoleMessageView.prototype._linkifyLocation): Deleted.

• UserInterface/Base/Main.js:

(WI.linkifyLocation):
(WI.linkifySourceCode): Added.
Split the logic into two functions, as there's no need to re-fetch the SourceCode from a
given url if you already have the SourceCode in the caller.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/ConsoleMessageView.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-05-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Uncaught Exception: null is not an object (evaluating 'url.startsWith')
+        https://bugs.webkit.org/show_bug.cgi?id=196662
+        <rdar://problem/49659633>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/ConsoleMessageView.js:
+        (WI.ConsoleMessageView.prototype._appendLocationLink):
+        (WI.ConsoleMessageView.prototype._linkifyLocation): Deleted.
+
+        * UserInterface/Base/Main.js:
+        (WI.linkifyLocation):
+        (WI.linkifySourceCode): Added.
+        Split the logic into two functions, as there's no need to re-fetch the `SourceCode` from a
+        given url if you already have the `SourceCode` in the caller.
+
 2019-05-08  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -2850 +2850 @@
 {
     var sourceCode = WI.sourceCodeForURL(url);
-
-    if (!sourceCode) {
-        var anchor = document.createElement("a");
-        anchor.href = url;
-        anchor.lineNumber = sourceCodePosition.lineNumber;
-        if (options.className)
-            anchor.className = options.className;
-        anchor.append(WI.displayNameForURL(url) + ":" + sourceCodePosition.lineNumber);
-        return anchor;
-    }
-
+    if (sourceCode)
+        return WI.linkifySourceCode(sourceCode);
+
+    var anchor = document.createElement("a");
+    anchor.href = url;
+    anchor.lineNumber = sourceCodePosition.lineNumber;
+    if (options.className)
+        anchor.className = options.className;
+    anchor.append(WI.displayNameForURL(url) + ":" + sourceCodePosition.lineNumber);
+    return anchor;
+};
+
+WI.linkifySourceCode = function(sourceCode, sourceCodePosition, options = {})
+{
     let sourceCodeLocation = sourceCode.createSourceCodeLocation(sourceCodePosition.lineNumber, sourceCodePosition.columnNumber);
     let linkElement = WI.createSourceCodeLocationLink(sourceCodeLocation, {

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

@@ -377 +377 @@
                     return;
 
-                var link = this._linkifyLocation(result.sourceCode.sourceURL || result.sourceCode.url, result.lineNumber, result.columnNumber);
+                let link = WI.linkifySourceCode(result.sourceCode, new WI.SourceCodePosition(result.lineNumber, result.columnNumber), {
+                    className: "console-message-url",
+                    ignoreNetworkTab: true,
+                    ignoreSearchTab: true,
+                });
                 link.classList.add("console-message-location");
 
@@ -767 +771 @@
     }
 
-    _linkifyLocation(url, lineNumber, columnNumber)
-    {
-        const options = {
-            className: "console-message-url",
-            ignoreNetworkTab: true,
-            ignoreSearchTab: true,
-        };
-        return WI.linkifyLocation(url, new WI.SourceCodePosition(lineNumber, columnNumber), options);
-    }
-
     _userProvidedColumnNames(columnNamesArgument)
     {