From 53e274102299c545927457fb3c402cb5bfe0e163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Wed, 8 May 2024 17:57:30 +0000
Subject: [PATCH] Revert tests/assets/wpt/ and browser_patches/

---
 .../firefox/juggler/content/main.js           |  2 +-
 .../firefox/juggler/protocol/PageHandler.js   |  2 +-
 .../firefox/patches/bootstrap.diff            | 12 +++----
 .../embedder/Playwright/win/DialogHelper.h    |  4 +--
 tests/assets/wpt/accname/name/comp_label.html | 32 +++++++++----------
 .../accname/name/comp_name_from_content.html  | 10 +++---
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/browser_patches/firefox/juggler/content/main.js b/browser_patches/firefox/juggler/content/main.js
index e0c4f7e91a..022b1e3a5e 100644
--- a/browser_patches/firefox/juggler/content/main.js
+++ b/browser_patches/firefox/juggler/content/main.js
@@ -106,7 +106,7 @@ function initialize(browsingContext, docShell, actor) {
     },
 
     ensurePermissions() {
-      // noop, just a roundtrip.
+      // noop, just a rountrip.
     },
 
     hasFailedToOverrideTimezone() {
diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
index a1e908b939..a893e1593b 100644
--- a/browser_patches/firefox/juggler/protocol/PageHandler.js
+++ b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -318,7 +318,7 @@ class PageHandler {
     const rect = new DOMRect(clip.x, clip.y, clip.width, clip.height);
 
     const browsingContext = this._pageTarget.linkedBrowser().browsingContext;
-    // `win.devicePixelRatio` returns a non-overridden value to privileged code.
+    // `win.devicePixelRatio` returns a non-overriden value to priveleged code.
     // See https://bugzilla.mozilla.org/show_bug.cgi?id=1761032
     // See https://phabricator.services.mozilla.com/D141323
     const devicePixelRatio = browsingContext.overrideDPPX || this._pageTarget._window.devicePixelRatio;
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 98b927a0de..9de655e886 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1248,7 +1248,7 @@ index 11ca350f483458ba11f0ee170ce38e9785e8c70f..6bb310f6e96239388b4c92bd7bdf2d69
 +      ScrollAxis(WhereToScroll::Center, WhenToScroll::IfNotFullyVisible),
 +      ScrollFlags::ScrollOverflowHidden);
 +  // If a _visual_ scroll update is pending, cancel it; otherwise, it will
-+  // clobber next scroll (e.g. subsequent window.scrollTo(0, 0) will break).
++  // clobber next scroll (e.g. subsequent window.scrollTo(0, 0) wlll break).
 +  if (presShell->GetPendingVisualScrollUpdate()) {
 +    presShell->AcknowledgePendingVisualScrollUpdate();
 +    presShell->ClearPendingVisualScrollUpdate();
@@ -2722,11 +2722,11 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
 +    nsCOMPtr<nsIFile> fileToUse;
 +    rv = interceptor->InterceptDownloadRequest(this, request, mBrowsingContext, getter_AddRefs(fileToUse), &isIntercepted);
 +    if (!NS_SUCCEEDED(rv)) {
-+      LOG(("    failed to call nsIDownloadInterceptor.interceptDownloadRequest"));
++      LOG(("    failed to call nsIDowloadInterceptor.interceptDownloadRequest"));
 +      return rv;
 +    }
 +    if (isIntercepted) {
-+      LOG(("    request interceped by nsIDownloadInterceptor"));
++      LOG(("    request interceped by nsIDowloadInterceptor"));
 +      if (fileToUse) {
 +        mTempFile = fileToUse;
 +        rv = mTempFile->GetLeafName(mTempLeafName);
@@ -2768,7 +2768,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
 +    if (interceptor) {
 +      nsCString noError;
 +      nsresult rv = interceptor->OnDownloadComplete(this, noError);
-+      MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to call nsIDownloadInterceptor.OnDownloadComplete");
++      MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to call nsIDowloadInterceptor.OnDownloadComplete");
 +      Unused << rv;
 +    }
 +  }
@@ -2785,7 +2785,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
 +    nsCString errorName;
 +    GetErrorName(aReason, errorName);
 +    nsresult rv = interceptor->OnDownloadComplete(this, errorName);
-+    MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed notify nsIDownloadInterceptor about cancel");
++    MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed notify nsIDowloadInterceptor about cancel");
 +    Unused << rv;
 +  }
 +
@@ -2978,7 +2978,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
              !aEvent.IsShift()
                  ? ToObjcSelectorPtr(@selector(moveToBeginningOfDocument:))
                  : ToObjcSelectorPtr(
--                      @selector(moveToBeginningOfDocumentAndModifySelection:)),
+-                      @selector(moveToBegginingOfDocumentAndModifySelection:)),
 +                      @selector(moveToBeginningOfDocumentAndModifySelection:)),
              aCommands);
          break;
diff --git a/browser_patches/webkit/embedder/Playwright/win/DialogHelper.h b/browser_patches/webkit/embedder/Playwright/win/DialogHelper.h
index eb98f2c716..6590fe0025 100644
--- a/browser_patches/webkit/embedder/Playwright/win/DialogHelper.h
+++ b/browser_patches/webkit/embedder/Playwright/win/DialogHelper.h
@@ -33,11 +33,11 @@ class Dialog {
 public:
     bool run(HINSTANCE hInst, HWND hwnd, int dialogId)
     {
-        auto result = DialogBoxParam(hInst, MAKEINTRESOURCE(dialogId), hwnd, dialogProc, reinterpret_cast<LPARAM>(this));
+        auto result = DialogBoxParam(hInst, MAKEINTRESOURCE(dialogId), hwnd, doalogProc, reinterpret_cast<LPARAM>(this));
         return (result > 0);
     }
 
-    static INT_PTR CALLBACK dialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+    static INT_PTR CALLBACK doalogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     {
         if (message == WM_INITDIALOG)
             SetWindowLongPtr(hDlg, DWLP_USER, lParam);
diff --git a/tests/assets/wpt/accname/name/comp_label.html b/tests/assets/wpt/accname/name/comp_label.html
index c9a420d11b..373940c04d 100644
--- a/tests/assets/wpt/accname/name/comp_label.html
+++ b/tests/assets/wpt/accname/name/comp_label.html
@@ -157,15 +157,15 @@
 <h2>Name computation precedence tests</h2>
 <!-- Name computation: https://w3c.github.io/accname/#computation-steps -->
 
-<!-- Step 2A: Hidden Not Referenced supersedes 2D: AriaLabel, also see wpt/accname/name/comp_hidden_not_referenced.html -->
-<button aria-labelledby="span1" aria-label="foo" data-expectedlabel="label" data-testname="button's hidden referenced name (display:none) supersedes aria-label" class="ex">
+<!-- Step 2A: Hidden Not Referenced supercedes 2D: AriaLabel, also see wpt/accname/name/comp_hidden_not_referenced.html -->
+<button aria-labelledby="span1" aria-label="foo" data-expectedlabel="label" data-testname="button's hidden referenced name (display:none) supercedes aria-label" class="ex">
   <span id="span1" style="display:none;">
     <span id="span2" style="display:none;">label</span>
   </span>
 x
 </button>
 
-<button aria-labelledby="span3" aria-label="foo" data-expectedlabel="label" data-testname="button's hidden referenced name (visibility:hidden) supersedes aria-label" class="ex">
+<button aria-labelledby="span3" aria-label="foo" data-expectedlabel="label" data-testname="button's hidden referenced name (visibility:hidden) supercedes aria-label" class="ex">
   <span id="span3" style="visibility:hidden;">
     <span id="span4" style="visibility:hidden;">label</span>
   </span>
@@ -185,34 +185,34 @@ x
 </button>
 </span>
 
-<!-- Step 2B: LabelledBy supersedes 2D: AriaLabel, also see wpt/accname/name/comp_labelledby.html -->
-<a href="#" aria-labelledby="span7" aria-label="foo" data-expectedlabel="label" data-testname="link's aria-labelledby name supersedes aria-label" class="ex">x</a>
+<!-- Step 2B: LabelledBy supercedes 2D: AriaLabel, also see wpt/accname/name/comp_labelledby.html -->
+<a href="#" aria-labelledby="span7" aria-label="foo" data-expectedlabel="label" data-testname="link's aria-labelledby name supercedes aria-label" class="ex">x</a>
 <span id="span7">label</span>
 
-<!-- Step 2C: Embedded Control labelling supersedes 2D: AriaLabel, see wpt/accname/name/comp_embedded_control.html -->
+<!-- Step 2C: Embedded Control labelling supercedes 2D: AriaLabel, see wpt/accname/name/comp_embedded_control.html -->
 
-<!-- Step 2E: Host Language Label is superseded by 2D: AriaLabel, also see wpt/accname/name/comp_host_language_label.html -->
-<img alt="alt" aria-label="foo" data-expectedlabel="foo" data-testname="img's aria-label supersedes alt attribute" class="ex" />
+<!-- Step 2E: Host Language Label is superceded by 2D: AriaLabel, also see wpt/accname/name/comp_host_language_label.html -->
+<img alt="alt" aria-label="foo" data-expectedlabel="foo" data-testname="img's aria-label supercedes alt attribute" class="ex" />
 
-<svg aria-label="foo" data-expectedlabel="foo" data-testname="svg's aria-label supersedes title tag" class="ex">
+<svg aria-label="foo" data-expectedlabel="foo" data-testname="svg's aria-label supercedes title tag" class="ex">
   <circle cx="5" cy="5" r="4">
     <title>circle</title>
   </circle>
 </svg>
 
 <label for="input1">label</label>
-<input type="text" id="input1" aria-label="foo" data-expectedlabel="foo" data-testname="input with label for association is superseded by aria-label" class="ex" />
+<input type="text" id="input1" aria-label="foo" data-expectedlabel="foo" data-testname="input with label for association is superceded by aria-label" class="ex" />
 
-<!-- Step 2F: Name From Content is superseded by 2D: AriaLabel, also see wpt/accname/name/comp_name_from_content.html -->
-<button aria-label="label" data-expectedlabel="label" data-testname="button name from contents is superseded by aria-label" class="ex">x</button>
+<!-- Step 2F: Name From Content is superceded by 2D: AriaLabel, also see wpt/accname/name/comp_name_from_content.html -->
+<button aria-label="label" data-expectedlabel="label" data-testname="button name from contents is superceded by aria-label" class="ex">x</button>
 
-<!-- Step 2G: Text Node is superseded by 2D: AriaLabel, also see wpt/accname/name/comp_text_node.html -->
-<h1 aria-label="label" data-expectedlabel="label" data-testname="h1 text is superseded by aria-label" class="ex">x</h1>
+<!-- Step 2G: Text Node is superceded by 2D: AriaLabel, also see wpt/accname/name/comp_text_node.html -->
+<h1 aria-label="label" data-expectedlabel="label" data-testname="h1 text is superceded by aria-label" class="ex">x</h1>
 
 <!-- Step 2H: Recursive Name from Content, see wpt/accname/name/comp_name_from_content.html  -->
 
-<!-- Step 2I: Tooltip is superseded by 2D: AriaLabel, also see wpt/accname/name/comp_tooltip.html -->
-<button aria-label="label" title="foo" data-expectedlabel="label" data-testname="button with title is superseded by aria-label" class="ex">x</button>
+<!-- Step 2I: Tooltip is superceded by 2D: AriaLabel, also see wpt/accname/name/comp_tooltip.html -->
+<button aria-label="label" title="foo" data-expectedlabel="label" data-testname="button with title is superceded by aria-label" class="ex">x</button>
 
 <h2>Empty/whitespace aria-label tests</h2>
 <!--
diff --git a/tests/assets/wpt/accname/name/comp_name_from_content.html b/tests/assets/wpt/accname/name/comp_name_from_content.html
index 5dd4b5bc8b..3504658ea4 100644
--- a/tests/assets/wpt/accname/name/comp_name_from_content.html
+++ b/tests/assets/wpt/accname/name/comp_name_from_content.html
@@ -232,28 +232,28 @@
   </a>
 </h3>
 
-<!-- cross-referential edge case-->
+<!-- cross-referencial edge case-->
 <h1>heading with link referencing image using aria-labelledby, that in turn references text element via aria-labelledby</h1>
 <h3 data-expectedlabel="image link" data-testname="heading with link referencing image using aria-labelledby, that in turn references text element via aria-labelledby" class="ex">
   <a href="#" aria-labelledby="nested_image_label3">
     <span class="note" id="crossref_link">link</span><!-- this text is skipped the first time around because of aria-labelledby on parent element -->
   </a>
-  <!-- but it's picked up again in inverse order b/c of cross-referential aria-labelledby edge case -->
+  <!-- but it's picked up again in inverse order b/c of cross-referencial aria-labelledby edge case -->
   <img id="nested_image_label_3" alt="image" aria-labelledby="crossref_link" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==">
 </h3>
 
-<!-- self-referential edge case-->
+<!-- self-referencial edge case-->
 <h1>heading with link referencing image using aria-labelledby, that in turn references itself and another element via aria-labelledby</h1>
 <h3 data-expectedlabel="image link" data-testname="heading with link referencing image using aria-labelledby, that in turn references itself and another element via aria-labelledby" class="ex">
   <a href="#" aria-labelledby="nested_image_label4">
     <span class="note" id="crossref_link2">link</span><!-- this text is skipped the first time around because of aria-labelledby on parent element -->
   </a>
-  <!-- but it's picked up again (after the self-referential image alt) in inverse order b/c of cross-referential aria-labelledby edge case -->
+  <!-- but it's picked up again (after the self-referencial image alt) in inverse order b/c of cross-referencial aria-labelledby edge case -->
   <img id="nested_image_label4" alt="image" aria-labelledby="nested_image_label4 crossref_link2" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==">
 </h3>
 
 
-<!-- Note: The following test is out of line with the spec, but matching two out of three implementations at the time of writing, and spec changes are expected. -->
+<!-- Note: The following test is out of line with the spec, but matching two out of three implementations at the time of writing, and spec changes are expeected. -->
 <!-- See details in https://github.com/w3c/accname/issues/205 -->
 <!-- Final spec resolution will be addressed in AccName Whitespace Project: https://github.com/w3c/accname/projects/1#card-42288231 -->
 <h1>simple w/ for each child (w/o spaces and display:inline)</h1>