Attachment 369057 Details for Bug 196662 – Patch

[patch] Patch

bug-196662-20190503224045.patch (text/plain), 4.45 KB, created by Devin Rousso on 2019-05-03 22:40:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-05-03 22:40:46 PDT

Size: 4.45 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 97206c896b10ddf3ad958b68b3f8bce3e8085713..5cee040c748cab81e6a15eeab9ff46159d2ac676 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-05-03  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 NOBODY (OOPS!).
>+
>+        * 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-03  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: DOM: rename "low power" to "display composited"
>diff --git a/Source/WebInspectorUI/UserInterface/Base/Main.js b/Source/WebInspectorUI/UserInterface/Base/Main.js
>index 0875955f1f4db37a2e2332b8f50f17cbf5c09ecc..625dd8c4df9cbaf3e7a98e9315f23004d892cb36 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/Main.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/Main.js
>@@ -2849,17 +2849,20 @@ WI.createSourceCodeLocationLink = function(sourceCodeLocation, options = {})
> WI.linkifyLocation = function(url, sourceCodePosition, options = {})
> {
>     var sourceCode = WI.sourceCodeForURL(url);
>+    if (sourceCode)
>+        return WI.linkifySourceCode(sourceCode);
> 
>-    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;
>-    }
>+    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, {
>         ...options,
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
>index 23ac06cf9a8971530e86de37cdd18e9151f8523c..7f6f93bc0a6ae98a732a629d04f5cd8662021e3d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
>@@ -376,7 +376,11 @@ WI.ConsoleMessageView = class ConsoleMessageView extends WI.Object
>                 if (result === WI.RemoteObject.SourceCodeLocationPromise.NoSourceFound || result === WI.RemoteObject.SourceCodeLocationPromise.MissingObjectId)
>                     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");
> 
>                 if (this._element.hasChildNodes())
>@@ -766,16 +770,6 @@ WI.ConsoleMessageView = class ConsoleMessageView extends WI.Object
>         return url === "undefined" || url === "[native code]";
>     }
> 
>-    _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)
>     {
>         if (!columnNamesArgument)

Actions: View | Formatted Diff | Diff

Attachments on bug 196662: 369056 | 369057 | 369068