Merging upstream version 125.0.1.

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

6 files changed, 6 insertions, 6 deletions

diff --git a/parser/htmlparser/tests/crashtests/crashtests.list b/parser/htmlparser/tests/crashtests/crashtests.list
index 1c786b7acc..392713c289 100644
--- a/parser/htmlparser/tests/crashtests/crashtests.list
+++ b/parser/htmlparser/tests/crashtests/crashtests.list
@@ -30,7 +30,7 @@ load 269095-1.html
 load 286733-1.html
 load 286733-2.html
 load 299036-1.html
-skip-if(cocoaWidget&&browserIsRemote) load 328751-1.html # Bug 849747
+skip-if(cocoaWidget) load 328751-1.html # Bug 849747
 load 408939-1.html
 load 423373-1.html
 load 445171-1.html
diff --git a/parser/htmlparser/tests/mochitest/parser_datreader.js b/parser/htmlparser/tests/mochitest/parser_datreader.js
index d3d3ea2c89..081e326724 100644
--- a/parser/htmlparser/tests/mochitest/parser_datreader.js
+++ b/parser/htmlparser/tests/mochitest/parser_datreader.js
@@ -13,7 +13,7 @@
 /**
  * A few utility functions.
  */
-function log(entry) {}
+function log() {}
 
 function startsWith(s, s2) {
   return s.indexOf(s2) == 0;
diff --git a/parser/htmlparser/tests/mochitest/parser_web_testrunner.js b/parser/htmlparser/tests/mochitest/parser_web_testrunner.js
index 5a0cfc64c8..49c09d484a 100644
--- a/parser/htmlparser/tests/mochitest/parser_web_testrunner.js
+++ b/parser/htmlparser/tests/mochitest/parser_web_testrunner.js
@@ -60,7 +60,7 @@ function writeErrorSummary(input, expected, got, isTodo) {
  * event handler returned by makeTestChecker() or the callback returned by
  * makeFragmentTestChecker() until the 'testcases' iterator is spent.
  */
-function makeTestChecker(input, expected, errors) {
+function makeTestChecker(input, expected) {
   return function (e) {
     var domAsString = docToTestOutput(e.target.contentDocument);
     if (html5Exceptions[input]) {
diff --git a/parser/htmlparser/tests/mochitest/test_bug1646140-1.html b/parser/htmlparser/tests/mochitest/test_bug1646140-1.html
index 8592d0d17f..5dfe7cd8e8 100644
--- a/parser/htmlparser/tests/mochitest/test_bug1646140-1.html
+++ b/parser/htmlparser/tests/mochitest/test_bug1646140-1.html
@@ -7,7 +7,7 @@
 SimpleTest.waitForExplicitFinish();
 
 window.svgRanScript = false;
-const o = new MutationObserver(mutations => {
+const o = new MutationObserver(() => {
   o.disconnect();
   setTimeout(() => {
     ok(!svgRanScript, "svg onload must not fire");
diff --git a/parser/htmlparser/tests/mochitest/test_bug1646140-2.html b/parser/htmlparser/tests/mochitest/test_bug1646140-2.html
index 11c370d401..9ea4f305a4 100644
--- a/parser/htmlparser/tests/mochitest/test_bug1646140-2.html
+++ b/parser/htmlparser/tests/mochitest/test_bug1646140-2.html
@@ -10,7 +10,7 @@ document.addEventListener("copy", ev => {
   ev.preventDefault();
   ev.clipboardData.setData('text/html', "<svg><style><svg/onload=\"window.svgRanScript=true\">");
 });
-const o = new MutationObserver(mutations => {
+const o = new MutationObserver(() => {
   o.disconnect();
   setTimeout(() => {
     ok(!svgRanScript, "svg onload must not fire");
diff --git a/parser/htmlparser/tests/reftest/reftest.list b/parser/htmlparser/tests/reftest/reftest.list
index 6607a6112c..d4fbca2835 100644
--- a/parser/htmlparser/tests/reftest/reftest.list
+++ b/parser/htmlparser/tests/reftest/reftest.list
@@ -4,7 +4,7 @@
 == bug569229-1.xml bug569229-1-ref.xml
 == bug577418-1.html bug577418-1-ref.html
 == bug582788-1.html bug582788-1-ref.html
-fuzzy(0-2,0-5) skip-if(OSX) == bug582940-1.html bug582940-1-ref.html
+fuzzy(0-2,0-5) skip-if(cocoaWidget) == bug582940-1.html bug582940-1-ref.html
 == bug592656-1.html bug592656-1-ref.html
 fuzzy(0-1,0-5) == bug599320-1.html bug599320-1-ref.html
 fuzzy(0-2,0-5) == bug608373-1.html bug608373-1-ref.html