Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 35 insertions, 13 deletions

diff --git a/devtools/client/shared/test/browser_filter-editor-01.js b/devtools/client/shared/test/browser_filter-editor-01.js
index 557a02857c..106f89dbc4 100644
--- a/devtools/client/shared/test/browser_filter-editor-01.js
+++ b/devtools/client/shared/test/browser_filter-editor-01.js
@@ -10,15 +10,14 @@ const {
 } = require("resource://devtools/client/shared/widgets/FilterWidget.js");
 
 const TEST_URI = CHROME_URL_ROOT + "doc_filter-editor-01.html";
-const { getCSSLexer } = require("resource://devtools/shared/css/lexer.js");
 
 // Verify that the given string consists of a valid CSS URL token.
 // Return true on success, false on error.
 function verifyURL(string) {
-  const lexer = getCSSLexer(string);
+  const lexer = new InspectorCSSParser(string);
 
   const token = lexer.nextToken();
-  if (!token || token.tokenType !== "url") {
+  if (!token || token.tokenType !== "UnquotedUrl") {
     return false;
   }
 
diff --git a/devtools/client/shared/test/browser_outputparser.js b/devtools/client/shared/test/browser_outputparser.js
index 7e0c1b7e00..a2fcce8f78 100644
--- a/devtools/client/shared/test/browser_outputparser.js
+++ b/devtools/client/shared/test/browser_outputparser.js
@@ -700,6 +700,22 @@ function testParseVariable(doc, parser) {
           ")</span>" +
         "</span>",
     },
+    {
+      text: "rgb(var(--not-seen), 0, 0)",
+      variables: {},
+      expected:
+        // prettier-ignore
+        `rgb(` +
+          `<span>` +
+            `var(` +
+              `<span class="unmatched-class" data-variable="--not-seen is not set">` +
+                `--not-seen` +
+              `</span>` +
+            `)` +
+          `</span>` +
+          `, 0, 0` +
+        `)`,
+    },
   ];
 
   for (const test of TESTS) {
diff --git a/devtools/client/shared/test/xpcshell/test_parseDeclarations.js b/devtools/client/shared/test/xpcshell/test_parseDeclarations.js
index 593087d46b..373d5acc56 100644
--- a/devtools/client/shared/test/xpcshell/test_parseDeclarations.js
+++ b/devtools/client/shared/test/xpcshell/test_parseDeclarations.js
@@ -750,7 +750,7 @@ const TEST_DATA = [
     expected: [
       {
         name: "color",
-        value: "blue \\9 no_need",
+        value: "blue \\9 no\\_need",
         priority: "",
         offsets: [0, 23],
         declarationText: "color: blue \\9 no\\_need",
@@ -1609,18 +1609,27 @@ function assertOutput(input, actual, expected) {
         "Check that the output item has the expected name, " +
           "value and priority"
       );
-      Assert.equal(expected[i].name, actual[i].name);
-      Assert.equal(expected[i].value, actual[i].value);
-      Assert.equal(expected[i].priority, actual[i].priority);
-      deepEqual(expected[i].offsets, actual[i].offsets);
+      Assert.equal(actual[i].name, expected[i].name, "Expected name");
+      Assert.equal(actual[i].value, expected[i].value, "Expected value");
+      Assert.equal(
+        actual[i].priority,
+        expected[i].priority,
+        "Expected priority"
+      );
+      deepEqual(actual[i].offsets, expected[i].offsets, "Expected offsets");
       if ("commentOffsets" in expected[i]) {
-        deepEqual(expected[i].commentOffsets, actual[i].commentOffsets);
+        deepEqual(
+          actual[i].commentOffsets,
+          expected[i].commentOffsets,
+          "Expected commentOffsets"
+        );
       }
 
       if (expected[i].declarationText) {
         Assert.equal(
           input.substring(expected[i].offsets[0], expected[i].offsets[1]),
-          expected[i].declarationText
+          expected[i].declarationText,
+          "Expected declarationText"
         );
       }
     }
diff --git a/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js b/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js
index 228d2dc79d..9842db7c02 100644
--- a/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js
+++ b/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js
@@ -483,9 +483,7 @@ const TEST_DATA = [
       enabled: true,
     },
     expected: "something: \\\\;color: red;",
-    // The lexer rewrites the token before we see it.  However this is
-    // so obscure as to be inconsequential.
-    changed: { 0: "\uFFFD\\" },
+    changed: { 0: "\\\\" },
   },
 
   // Termination insertion corner case.