Bug 1910698 - Remove nsIScriptError.sourceLine. r=smaug,devtools-revi…

…ewers,webdriver-reviewers,necko-reviewers,nchevobbe,kershaw,jdescottes,credential-management-reviewers,dimi Afaict the source lines are not exposed anywhere in the UI. Differential Revision: https://phabricator.services.mozilla.com/D218115
mozilla · Aug 1, 2024 · e1ad629 · e1ad629
1 parent 198c331
commit e1ad629
Show file tree

Hide file tree

Showing 101 changed files with 341 additions and 573 deletions.
diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
@@ -522,7 +522,6 @@ var gXPInstallObserver = {
     consoleMsg.initWithWindowID(
       message,
       gBrowser.currentURI.spec,
-      null,
       0,
       0,
       Ci.nsIScriptError.warningFlag,

diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
@@ -464,7 +464,6 @@ var FullScreen = {
     consoleMsg.initWithWindowID(
       message,
       gBrowser.currentURI.spec,
-      null,
       0,
       0,
       Ci.nsIScriptError.warningFlag,

diff --git a/browser/modules/PermissionUI.sys.mjs b/browser/modules/PermissionUI.sys.mjs
@@ -706,7 +706,6 @@ class SitePermsAddonInstallRequest extends PermissionPromptForRequest {
         scriptError.initWithWindowID(
           errorMessage,
           null,
-          null,
           0,
           0,
           0,

diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
@@ -1151,12 +1151,11 @@ nsresult nsScriptSecurityManager::ReportError(const char* aMessageTag,
   // using category of "SOP" so we can link to MDN
   if (aInnerWindowID != 0) {
     rv = error->InitWithWindowID(
-        message, u""_ns, u""_ns, 0, 0, nsIScriptError::errorFlag, "SOP"_ns,
+        message, ""_ns, 0, 0, nsIScriptError::errorFlag, "SOP"_ns,
         aInnerWindowID, true /* From chrome context */);
   } else {
-    rv = error->Init(message, u""_ns, u""_ns, 0, 0, nsIScriptError::errorFlag,
-                     "SOP"_ns, aFromPrivateWindow,
-                     true /* From chrome context */);
+    rv = error->Init(message, ""_ns, 0, 0, nsIScriptError::errorFlag, "SOP"_ns,
+                     aFromPrivateWindow, true /* From chrome context */);
   }
   NS_ENSURE_SUCCESS(rv, rv);
   console->LogMessage(error);

diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
@@ -75,9 +75,9 @@ void nsChromeRegistry::LogMessageWithContext(nsIURI* aURL, uint32_t aLineNumber,
   nsCString spec;
   if (aURL) aURL->GetSpec(spec);
 
-  rv = error->Init(NS_ConvertUTF8toUTF16(formatted.get()),
-                   NS_ConvertUTF8toUTF16(spec), u""_ns, aLineNumber, 0, flags,
-                   "chrome registration"_ns, false /* from private window */,
+  rv = error->Init(NS_ConvertUTF8toUTF16(formatted.get()), spec, aLineNumber, 0,
+                   flags, "chrome registration"_ns,
+                   false /* from private window */,
                    true /* from chrome context */);
 
   if (NS_FAILED(rv)) return;

diff --git a/devtools/client/webconsole/test/browser/browser_console.js b/devtools/client/webconsole/test/browser/browser_console.js
@@ -181,7 +181,6 @@ async function testMessages() {
   scriptErrorMessage.initWithWindowID(
     "Error from Services.console.logMessage",
     gBrowser.currentURI.prePath,
-    null,
     0,
     0,
     Ci.nsIScriptError.warningFlag,

diff --git a/devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js b/devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js
@@ -23,7 +23,6 @@ rawPackets.set(`Unknown property ‘such-unknown-property’.  Declaration dropp
     "errorMessage": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 3,
     "columnNumber": 27,
     "category": "CSS Parser",
@@ -38,8 +37,8 @@ rawPackets.set(`Unknown property ‘such-unknown-property’.  Declaration dropp
     "chromeContext": false,
     "isForwardedFromContentProcess": false
   },
-  "resourceType": "css-message",
   "cssSelectors": "p",
+  "resourceType": "css-message",
   "isAlreadyExistingResource": false
 });
 
@@ -48,7 +47,6 @@ rawPackets.set(`Error in parsing value for ‘padding-top’.  Declaration dropp
     "errorMessage": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/stub-generators/test-css-message.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 3,
     "columnNumber": 18,
     "category": "CSS Parser",
@@ -63,8 +61,8 @@ rawPackets.set(`Error in parsing value for ‘padding-top’.  Declaration dropp
     "chromeContext": false,
     "isForwardedFromContentProcess": false
   },
-  "resourceType": "css-message",
   "cssSelectors": "p",
+  "resourceType": "css-message",
   "isAlreadyExistingResource": false
 });
 

diff --git a/devtools/client/webconsole/test/node/fixtures/stubs/pageError.js b/devtools/client/webconsole/test/node/fixtures/stubs/pageError.js
@@ -25,7 +25,6 @@ rawPackets.set(`ReferenceError: asdf is not defined`, {
     "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child1/source22",
-    "lineText": "",
     "lineNumber": 3,
     "columnNumber": 5,
     "category": "content javascript",
@@ -119,7 +118,6 @@ rawPackets.set(`SyntaxError: redeclaration of let a`, {
     "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Redeclared_parameter?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "  let a, a;",
     "lineNumber": 2,
     "columnNumber": 10,
     "category": "content javascript",
@@ -204,12 +202,11 @@ rawPackets.set(`TypeError longString message`, {
         "length": 110007,
         "initial": "Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon"
       },
-      "actorID": "server0.conn0.windowGlobal15032385537/longstractor23"
+      "actorID": "server0.conn0.process7//longstractor24"
     },
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child1/source23",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -296,7 +293,6 @@ rawPackets.set(`throw string with URL`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -354,7 +350,6 @@ rawPackets.set(`throw ""`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -412,7 +407,6 @@ rawPackets.set(`throw "tomato"`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -470,7 +464,6 @@ rawPackets.set(`throw false`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -528,7 +521,6 @@ rawPackets.set(`throw 0`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -586,7 +578,6 @@ rawPackets.set(`throw null`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -646,7 +637,6 @@ rawPackets.set(`throw undefined`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -706,7 +696,6 @@ rawPackets.set(`throw Symbol`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source27",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -768,7 +757,6 @@ rawPackets.set(`throw Object`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source31",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 1,
     "category": "content javascript",
@@ -850,7 +838,6 @@ rawPackets.set(`throw Error Object`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source41",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -929,7 +916,6 @@ rawPackets.set(`throw Error Object with custom name`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source43",
-    "lineText": "",
     "lineNumber": 2,
     "columnNumber": 15,
     "category": "content javascript",
@@ -1008,7 +994,6 @@ rawPackets.set(`throw Error Object with error cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source45",
-    "lineText": "",
     "lineNumber": 3,
     "columnNumber": 15,
     "category": "content javascript",
@@ -1106,7 +1091,6 @@ rawPackets.set(`throw Error Object with cause chain`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source48",
-    "lineText": "",
     "lineNumber": 5,
     "columnNumber": 13,
     "category": "content javascript",
@@ -1242,7 +1226,6 @@ rawPackets.set(`throw Error Object with cyclical cause chain`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source53",
-    "lineText": "",
     "lineNumber": 3,
     "columnNumber": 13,
     "category": "content javascript",
@@ -1378,7 +1361,6 @@ rawPackets.set(`throw Error Object with falsy cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source58",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -1460,7 +1442,6 @@ rawPackets.set(`throw Error Object with number cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source60",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -1540,7 +1521,6 @@ rawPackets.set(`throw Error Object with string cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source62",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -1620,7 +1600,6 @@ rawPackets.set(`throw Error Object with object cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source64",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
     "category": "content javascript",
@@ -1709,7 +1688,6 @@ rawPackets.set(`Promise reject ""`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -1767,7 +1745,6 @@ rawPackets.set(`Promise reject "tomato"`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -1825,7 +1802,6 @@ rawPackets.set(`Promise reject false`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -1883,7 +1859,6 @@ rawPackets.set(`Promise reject 0`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -1941,7 +1916,6 @@ rawPackets.set(`Promise reject null`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -2001,7 +1975,6 @@ rawPackets.set(`Promise reject undefined`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -2061,7 +2034,6 @@ rawPackets.set(`Promise reject Symbol`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -2123,7 +2095,6 @@ rawPackets.set(`Promise reject Object`, {
     "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": null,
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 9,
     "category": "content javascript",
@@ -2205,7 +2176,6 @@ rawPackets.set(`Promise reject Error Object`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source55",
-    "lineText": "",
     "lineNumber": 1,
     "columnNumber": 16,
     "category": "content javascript",
@@ -2284,7 +2254,6 @@ rawPackets.set(`Promise reject Error Object with custom name`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn4.child2/source57",
-    "lineText": "",
     "lineNumber": 2,
     "columnNumber": 15,
     "category": "content javascript",
@@ -2363,7 +2332,6 @@ rawPackets.set(`Promise reject Error Object with error cause`, {
     "errorMessageName": "",
     "sourceName": "https://example.com/browser/devtools/client/webconsole/test/browser/test-console-api.html",
     "sourceId": "server0.conn0.child4/source81",
-    "lineText": "",
     "lineNumber": 5,
     "columnNumber": 15,
     "category": "content javascript",

diff --git a/devtools/server/actors/resources/css-messages.js b/devtools/server/actors/resources/css-messages.js
@@ -5,9 +5,6 @@
 "use strict";
 
 const nsIConsoleListenerWatcher = require("resource://devtools/server/actors/resources/utils/nsi-console-listener-watcher.js");
-const {
-  DevToolsServer,
-} = require("resource://devtools/server/devtools-server.js");
 const {
   createStringGrip,
 } = require("resource://devtools/server/actors/object/utils.js");
@@ -90,14 +87,6 @@ class CSSMessageWatcher extends nsIConsoleListenerWatcher {
    */
   buildResource(targetActor, error) {
     const stack = this.prepareStackForRemote(targetActor, error.stack);
-    let lineText = error.sourceLine;
-    if (
-      lineText &&
-      lineText.length > DevToolsServer.LONG_STRING_INITIAL_LENGTH
-    ) {
-      lineText = lineText.substr(0, DevToolsServer.LONG_STRING_INITIAL_LENGTH);
-    }
-
     const notesArray = this.prepareNotesForRemote(targetActor, error.notes);
 
     // If there is no location information in the error but we have a stack,
@@ -114,7 +103,6 @@ class CSSMessageWatcher extends nsIConsoleListenerWatcher {
       errorMessage: createStringGrip(targetActor, error.errorMessage),
       sourceName,
       sourceId: getActorIdForInternalSourceId(targetActor, sourceId),
-      lineText,
       lineNumber,
       columnNumber,
       category: error.category,
-Original file line number
+Diff line change
@@ Expand Up @@
             scriptError.initWithWindowID(
               errorMessage,
               null,
-              null,
 ,
 ,
 ,
@@ Expand Down @@