diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1a219c88..4192682e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -79,7 +79,7 @@ on: default: "6" type: string ref: - description: "Commit to test; defaults to the calling workflow's ref" + description: "Commit to test; defaults to the calling workflow's commit" required: false type: string secrets: @@ -127,7 +127,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} fetch-depth: 0 - uses: actions/setup-python@v5 with: @@ -241,7 +241,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} # Full history: config-keys-are-never-deleted checks every key # browser/settings/properties.json has ever declared. fetch-depth: 0 @@ -311,7 +311,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} @@ -358,7 +358,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: actions/setup-python@v5 with: # Not PYTHON_VERSION: the golden fixtures are regenerated from this @@ -425,7 +425,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -485,7 +485,7 @@ jobs: # Checkout first, because the cache key below is a hash of the tree. - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - name: Hash the inputs that can change compiled output id: native @@ -728,7 +728,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} @@ -811,7 +811,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -872,7 +872,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -930,7 +930,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -976,7 +976,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -1043,7 +1043,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -1104,7 +1104,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -1137,7 +1137,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: ./.github/actions/prepare-browser with: python-version: ${{ env.PYTHON_VERSION }} @@ -1189,7 +1189,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ inputs.ref || github.ref }} + ref: ${{ inputs.ref || github.sha }} - uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} diff --git a/AGENTS.md b/AGENTS.md index 3edbc0a6..f7f463a1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -231,7 +231,8 @@ this section in step with the launcher options. - **Leave the viewport alone.** When the window size is spoofed, new pages default to `no_viewport=True`; forcing a `viewport` asks the window to resize to something the identity does not claim. - **`is_mobile` is ignored** (with a warning). Camoufox has desktop identities only. - **Persistent contexts** need `persistent_context=True` and `user_data_dir`, and cannot be served by `launch_server`. -- **`headless="virtual"`** needs Linux, `Xvfb` and `setpriv` from util-linux (`CannotFindXvfb`, `VirtualDisplayNotSupported` otherwise). +- **`headless="virtual"`** needs Linux, `Xvfb` and `setpriv` from util-linux (`CannotFindXvfb`, `VirtualDisplayNotSupported` otherwise). Xvfb has no GPU, so canvas and WebGL render in software. +- **`headless="virtual-gpu"`** renders on one GPU, named by `gpu=` or `CAMOUFOX_GPU` (a PCI address is the stable choice); several GPUs and no selector raise `AmbiguousGpuSelection`. Without root it needs Xorg.wrap allowed to start Xorg as root for any user, and the card's config in `/etc/X11`; `python -m camoufox gpu-setup | sudo sh` does both, and every failure that setup would fix ends with that command. A browser that does not render on the card raises `GpuSoftwareFallback` (`require_gpu=False` warns). Every error is a `VirtualDisplayError`. `gpu` and `require_gpu` are not `launch_options()` arguments. - **`os` values are lowercase** `windows`, `macos`, `linux`; anything else raises `InvalidOS`. - **`geoip` in Python needs the extra**: `pip install "camoufox[geoip]"`, else `NotInstalledGeoIPExtra`. - **`InvalidIP`** is raised when the public-IP or proxy exit-IP lookup fails, or when `webrtc_ip` is not a valid IPv4/IPv6 address. Pass `webrtc_ip` and `timezone_id` to `NewContext` to skip the lookup. diff --git a/README.md b/README.md index 0db840cc..08b050c0 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ Special codes for Camoufox users:
• CAMOUFOX35 - 35% off to Mobile and Residential Proxies
• CAMOUFOX40 - 40% off to ISP (Static) Proxies
+ Check Nodemaven's new GitHub for more web scraping and automation solutions - https://github.com/nodemaven @@ -523,6 +524,7 @@ claims the host's OS. Details are in | Timezone, locale, geolocation and WebRTC IP from the proxy's exit IP | `proxy=..., geoip=True` | | Locale chosen by the languages spoken in the IP's region | `geoip=True` without `locale` | | Headed browser on a private Xvfb display (Linux) | `headless="virtual"` | +| Headed browser on a private Xorg display that renders on a named GPU (Linux) | `headless="virtual-gpu"` | | Remote Playwright server for other languages | `launch_server()`, `camoufox server` | | Install, pin and switch browser builds | `camoufox fetch`, `set`, `list`, `remove` | | Core count that a page can measure | `pin_cpu_cores=True` | diff --git a/browser/additions/juggler/content/FrameTree.js b/browser/additions/juggler/content/FrameTree.js index ee75df7e..ab31ba70 100644 --- a/browser/additions/juggler/content/FrameTree.js +++ b/browser/additions/juggler/content/FrameTree.js @@ -510,7 +510,7 @@ class Frame { }); }, - frameReceived: (webSocketSerialID, frame) => { + frameReceived: (webSocketSerialID, httpChannelId, frame) => { // Report only text and binary frames. if (frame.opCode !== 1 && frame.opCode !== 2) return; @@ -521,7 +521,7 @@ class Frame { info.pendingIncomingFrames.push(frame); }, - frameSent: (webSocketSerialID, frame) => { + frameSent: (webSocketSerialID, httpChannelId, frame) => { // Report only text and binary frames. if (frame.opCode !== 1 && frame.opCode !== 2) return; diff --git a/browser/additions/juggler/content/Runtime.js b/browser/additions/juggler/content/Runtime.js index ce662eb8..9d2bc05e 100644 --- a/browser/additions/juggler/content/Runtime.js +++ b/browser/additions/juggler/content/Runtime.js @@ -543,7 +543,9 @@ class Runtime { resolve = a; reject = b; }); - this._pendingPromises.set(obj.promiseID, {resolve, reject, executionContext, exceptionDetails, promiseObj: obj}); + // Keyed by the Debugger.Object, which is unique per promise: Firefox 158 + // removed Debugger.Object.promiseID (bug 2044184). + this._pendingPromises.set(obj, {resolve, reject, executionContext, exceptionDetails}); // Firefox 156 removed Debugger.onPromiseSettled (bug 2044167). As upstream // Juggler does, attach reactions inside the debuggee that hit a `debugger;` // statement when the promise settles, and sweep the pending promises from @@ -556,11 +558,10 @@ class Runtime { } _onDebuggerStatement() { - for (const [promiseID, pendingPromise] of this._pendingPromises) { - const obj = pendingPromise.promiseObj; + for (const [obj, pendingPromise] of this._pendingPromises) { if (obj.promiseState === 'pending') continue; - this._pendingPromises.delete(promiseID); + this._pendingPromises.delete(obj); if (obj.promiseState === 'fulfilled') { pendingPromise.resolve({success: true, obj: obj.promiseValue}); continue; @@ -597,10 +598,10 @@ class Runtime { // destroyed event -- announcing the death of a context the client never saw // would be worse than saying nothing. _destroyMainWorldContext(context) { - for (const [promiseID, {reject, executionContext}] of this._pendingPromises) { + for (const [obj, {reject, executionContext}] of this._pendingPromises) { if (executionContext === context) { reject(new Error('Execution context was destroyed!')); - this._pendingPromises.delete(promiseID); + this._pendingPromises.delete(obj); } } if (!this._pendingPromises.size) @@ -613,10 +614,10 @@ class Runtime { this._destroyMainWorldContext(destroyedContext._mainWorldContext); destroyedContext._mainWorldContext = null; } - for (const [promiseID, {reject, executionContext}] of this._pendingPromises) { + for (const [obj, {reject, executionContext}] of this._pendingPromises) { if (executionContext === destroyedContext) { reject(new Error('Execution context was destroyed!')); - this._pendingPromises.delete(promiseID); + this._pendingPromises.delete(obj); } } if (!this._pendingPromises.size) diff --git a/browser/additions/juggler/input/cursory/README.md b/browser/additions/juggler/input/cursory/README.md index b59a6b7d..5e1945ff 100644 --- a/browser/additions/juggler/input/cursory/README.md +++ b/browser/additions/juggler/input/cursory/README.md @@ -1,8 +1,8 @@ # cursory-js (vendored) -Camoufox's copy of [cursory-js](https://github.com/JWriter20/cursory-js) v2.0.2, +Camoufox's copy of [cursory-js](https://github.com/JWriter20/cursory-js) v2.1.0, a TypeScript port of [Vinyzu's Cursory](https://github.com/Vinyzu/cursory) -v2.0.1. It generates the cursor paths `humanize=True` moves along. +v2.1.0. It generates the cursor paths `humanize=True` moves along. Licensing and provenance are in `NOTICE`; the licence text is in `LICENSE`. **These files are LGPLv3-or-later, not MPL-2.0 like the rest of Camoufox.** @@ -56,7 +56,7 @@ The port reproduces the Python original bit for bit, which is worth keeping true: it is what lets a bug here be reproduced against `pip install cursory`. Upstream's `test/fixtures/parity.json` is recorded Python output — run this port against it after any change to these files. Last checked against cursory -2.0.1 / numpy 2.3.5: RNG streams identical for all 12 seeds, all 149 recorded -trajectories' timings identical, worst coordinate gap 1.36e-12 px (V8 and +2.1.0 / numpy 2.3.5: RNG streams identical for all 12 seeds, all 149 recorded +trajectories' timings identical, worst coordinate gap 9.09e-13 px (V8 and glibc round `exp`, `atan2` and friends differently; nothing a cursor can express). diff --git a/browser/additions/juggler/input/cursory/trajectorySelection.js b/browser/additions/juggler/input/cursory/trajectorySelection.js index d9e171c7..ec524c81 100644 --- a/browser/additions/juggler/input/cursory/trajectorySelection.js +++ b/browser/additions/juggler/input/cursory/trajectorySelection.js @@ -192,17 +192,12 @@ export function jitterTrajectory(points, trajectoryLength, rng, scale = 0.01) { const averageGap = ((i > 0 ? gaps[i - 1] : 0) + (i < count - 1 ? gaps[i] : 0)) / 2; adaptiveScales[i] = scale * (averageGap / Math.max(averageGap, 1)) * lengthScale; } + const weights = endpointWeights(points); + for (let i = 0; i < count; i += 1) { + adaptiveScales[i] *= weights[i]; + } // Unit normal at each point, from the local tangent. - // - // On whole-pixel input the normals are truncated towards zero, leaving only - // 0 and +/-1. That is not a simplification: numpy types an array of recorded - // integer coordinates as int64, so the original's `np.zeros_like(tangents)` - // is an integer array and storing a unit vector in it rounds it off. Most - // recordings in the database are whole-pixel, so this shapes most of the - // jitter Cursory actually produces, and dropping it would put this port on a - // different path from the Python original for the same seed. - const quantizeNormals = isWholePixelPath(points); const normalX = new Float64Array(count); const normalY = new Float64Array(count); for (let i = 0; i < count; i += 1) { @@ -214,10 +209,6 @@ export function jitterTrajectory(points, trajectoryLength, rng, scale = 0.01) { if (tangentLength > EPSILON) { normalX[i] = -tangentY / tangentLength; normalY[i] = tangentX / tangentLength; - if (quantizeNormals) { - normalX[i] = Math.trunc(normalX[i]); - normalY[i] = Math.trunc(normalY[i]); - } } } @@ -261,7 +252,7 @@ export function generateMiddleBiasedPoint(x1, y1, x2, y2, rng, biasFactor = 2.0) /** * Bend the path towards a few random points, as if the hand had drifted on its * way across. Displacements are square-rooted so near points are pulled far less - * than the raw pull would suggest. + * than the raw pull would suggest, and fade out towards both ends of the path. */ export function knotTrajectory( points, @@ -307,15 +298,38 @@ export function knotTrajectory( } } + const weights = endpointWeights(points); return points.map((point, i) => [ - point[0] + signedSqrt(offsetX[i]), - point[1] + signedSqrt(offsetY[i]), + point[0] + signedSqrt(offsetX[i]) * weights[i], + point[1] + signedSqrt(offsetY[i]) * weights[i], ]); } -/** Whether numpy would have typed these coordinates as integers rather than floats. */ -function isWholePixelPath(points) { - return points.every((point) => Number.isInteger(point[0]) && Number.isInteger(point[1])); +/** + * How much added displacement each point may take: zero, with zero slope, at + * both ends of the path, rising to one halfway along it by distance travelled. + * A path that never moves gets no displacement at all. + */ +function endpointWeights(points) { + const count = points.length; + const progress = new Float64Array(count); + for (let i = 1; i < count; i += 1) { + const dx = points[i][0] - points[i - 1][0]; + const dy = points[i][1] - points[i - 1][1]; + progress[i] = progress[i - 1] + Math.sqrt(dx * dx + dy * dy); + } + + const weights = new Float64Array(count); + const total = count > 0 ? progress[count - 1] : 0; + if (total === 0) { + return weights; + } + for (let i = 0; i < count; i += 1) { + const fraction = progress[i] / total; + const weight = 4 * fraction * (1 - fraction); + weights[i] = weight * weight; + } + return weights; } /** `np.copysign(np.sqrt(np.abs(x)), x)`. */ @@ -325,8 +339,8 @@ function signedSqrt(value) { } /** - * Select a recording for this movement, then jitter, knot and morph it onto the - * requested endpoints. + * Select a recording for this movement, morph it onto the requested endpoints, + * then jitter and knot it there. */ export function findTrajectory(targetStart, targetEnd, rng, directness = 0.65) { const { trajectory, dxTarget, dyTarget, lengthTarget } = findClosestTrajectory( @@ -347,8 +361,17 @@ export function findTrajectory(targetStart, targetEnd, rng, directness = 0.65) { timings = timings.map((timing) => startTime + (timing - startTime) * timeScale); } - const jittered = jitterTrajectory(trajectory.points, lengthTarget, rng); - const knotted = knotTrajectory(jittered, targetStart, targetEnd, rng); - const points = morphTrajectory(knotted, targetStart, targetEnd, dxTarget, dyTarget, lengthTarget); + // Add the noise in target coordinates, so where the recording sat on its + // original screen cannot change the shape it ends up with. + const morphed = morphTrajectory( + trajectory.points, + targetStart, + targetEnd, + dxTarget, + dyTarget, + lengthTarget, + ); + const jittered = jitterTrajectory(morphed, lengthTarget, rng); + const points = knotTrajectory(jittered, targetStart, targetEnd, rng); return { points, timings }; } diff --git a/browser/patches/anti-font-fingerprinting.patch b/browser/patches/anti-font-fingerprinting.patch index c9683bfa..175ed3f7 100644 --- a/browser/patches/anti-font-fingerprinting.patch +++ b/browser/patches/anti-font-fingerprinting.patch @@ -1,8 +1,8 @@ diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp -index 345455c14e..f46f13ebf6 100644 +index 8250ac8f6d..eb153b69f7 100644 --- a/dom/canvas/OffscreenCanvas.cpp +++ b/dom/canvas/OffscreenCanvas.cpp -@@ -655,6 +655,15 @@ void OffscreenCanvas::ReportBlockedFontFamily(const nsCString& aMsg) const { +@@ -660,6 +660,15 @@ void OffscreenCanvas::ReportBlockedFontFamily(const nsCString& aMsg) const { } } @@ -19,10 +19,10 @@ index 345455c14e..f46f13ebf6 100644 if (NS_IsMainThread()) { nsCOMPtr win = do_QueryInterface(GetRelevantGlobal()); diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h -index b38f31f547..2321f5acd5 100644 +index 4a2be53538..57f89b7fc3 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h -@@ -1161,8 +1161,6 @@ class WorkerPrivate final +@@ -1162,8 +1162,6 @@ class WorkerPrivate final void WorkerScriptLoaded(); @@ -32,10 +32,10 @@ index b38f31f547..2321f5acd5 100644 void UpdateContextOptions(const JS::ContextOptions& aContextOptions); diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp -index a0b8c260c4..2ea46a9810 100644 +index cabecffc5c..849b3af462 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp -@@ -455,6 +455,7 @@ class ListFontsVisibilityProvider final : public FontVisibilityProvider { +@@ -454,6 +454,7 @@ class ListFontsVisibilityProvider final : public FontVisibilityProvider { return mozilla::Nothing(); } void UserFontSetUpdated(gfxUserFontEntry*) override {} @@ -44,35 +44,46 @@ index a0b8c260c4..2ea46a9810 100644 private: diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp -index f2c42a498e..bc887921c8 100644 +index 39153aa9bd..77699420a4 100644 --- a/gfx/thebes/gfxTextRun.cpp +++ b/gfx/thebes/gfxTextRun.cpp -@@ -33,6 +33,8 @@ +@@ -33,6 +33,9 @@ #include "nsStyleConsts.h" #include "nsStyleUtil.h" #include "nsUnicodeProperties.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/RoverfoxStorageManager.h" ++#include "mozilla/dom/WorkerPrivate.h" #ifdef XP_WIN # include "gfxWindowsPlatform.h" -@@ -1871,6 +1873,11 @@ gfxFontGroup::gfxFontGroup(FontVisibilityProvider* aFontVisibilityProvider, +@@ -1871,6 +1874,21 @@ gfxFontGroup::gfxFontGroup(FontVisibilityProvider* aFontVisibilityProvider, mFontVariantEmoji(aVariantEmoji) { // We don't use SetUserFontSet() here, as we want to unconditionally call // EnsureFontList() rather than only do UpdateUserFonts() if it changed. + + if (mFontVisibilityProvider) { -+ mUserContextId = mozilla::dom::RoverfoxStorageManager::UserContextId( -+ mFontVisibilityProvider->GetDocument()); ++ mozilla::dom::Document* doc = mFontVisibilityProvider->GetDocument(); ++ mUserContextId = ++ mozilla::dom::RoverfoxStorageManager::UserContextId(doc); ++ // An OffscreenCanvas in a worker has no document, so its font group ran ++ // as context 0 -- launch-wide fonts only -- while the page's main thread ++ // used the context's own list, and a page could compare the two ++ // (lang315/camoufox#44). The worker knows its context. ++ if (!doc && !NS_IsMainThread()) { ++ if (auto* worker = mozilla::dom::GetCurrentThreadWorkerPrivate()) { ++ mUserContextId = worker->GetOriginAttributes().mUserContextId; ++ } ++ } + } } gfxFontGroup::~gfxFontGroup() { diff --git a/gfx/thebes/gfxTextRun.h b/gfx/thebes/gfxTextRun.h -index f04c835506..10ddd68fc1 100644 +index 75f380ce26..b3d6fb4cda 100644 --- a/gfx/thebes/gfxTextRun.h +++ b/gfx/thebes/gfxTextRun.h -@@ -1433,6 +1433,8 @@ class gfxFontGroup final : public gfxTextRunFactory { +@@ -1434,6 +1434,8 @@ class gfxFontGroup final : public gfxTextRunFactory { uint32_t mFontListGeneration = 0; // platform font list generation for this // fontgroup @@ -82,10 +93,10 @@ index f04c835506..10ddd68fc1 100644 * Textrun creation short-cuts for special cases where we don't need to * call a font shaper to generate glyphs. diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp -index 02a771ca93..8d6bbebed3 100644 +index 2419d4eace..ee075c09d3 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp -@@ -426,6 +426,10 @@ bool nsPresContext::IsChrome() const { +@@ -427,6 +427,10 @@ bool nsPresContext::IsChrome() const { return Document()->IsInChromeDocShell(); } diff --git a/browser/patches/camoufox-window-module.patch b/browser/patches/camoufox-window-module.patch index 1a7e4523..ade4353c 100644 --- a/browser/patches/camoufox-window-module.patch +++ b/browser/patches/camoufox-window-module.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest -index 489c64ea19..cddc09c2f0 100644 +index d3b32a07ec..1433defff8 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -14,6 +14,7 @@ category first-startup-new-profile resource:///modules/AboutNewTabResourceMappin @@ -10,7 +10,7 @@ index 489c64ea19..cddc09c2f0 100644 #ifdef MOZ_NORMANDY category browser-before-ui-startup resource://normandy/Normandy.sys.mjs Normandy.init #endif -@@ -47,6 +48,7 @@ category browser-window-domcontentloaded chrome://browser/content/browser.js Fir +@@ -52,6 +53,7 @@ category browser-window-domcontentloaded chrome://browser/content/browser.js Fir category browser-window-load-before-sessionstore-init chrome://browser/content/browser-captivePortal.js CaptivePortalWatcher.init category browser-window-load-before-sessionstore-init resource:///modules/ZoomUI.sys.mjs ZoomUI.init @@ -19,14 +19,14 @@ index 489c64ea19..cddc09c2f0 100644 category browser-window-load-before-sessionstore-init chrome://browser/content/downloads/indicator.js DownloadsButton.init diff --git a/browser/modules/moz.build b/browser/modules/moz.build -index eebf824044..9c5e4f48e1 100644 +index 0259249ed2..1834172641 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build -@@ -117,6 +117,7 @@ EXTRA_JS_MODULES += [ +@@ -122,6 +122,7 @@ EXTRA_JS_MODULES += [ "BrowserUIUtils.sys.mjs", "BrowserUsageTelemetry.sys.mjs", "BrowserWindowTracker.sys.mjs", + "CamoufoxWindow.sys.mjs", "ContentCrashHandlers.sys.mjs", "Dedupe.sys.mjs", - "Discovery.sys.mjs", + "EveryWindow.sys.mjs", diff --git a/browser/patches/config.patch b/browser/patches/config.patch index 249a4d2a..ad2be898 100644 --- a/browser/patches/config.patch +++ b/browser/patches/config.patch @@ -1,8 +1,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 8aa34cf7cc..4112ed9808 100644 +index ae503c243c..1349e3b20a 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -267,6 +267,11 @@ +@@ -264,6 +264,11 @@ @RESPATH@/browser/components/shell/assets/kit.gif #endif @@ -32,12 +32,12 @@ index e69de29bb2..484d7bf134 100644 + "local-settings.js", +] diff --git a/moz.build b/moz.build -index 2eb5922b24..fe667fc5f6 100644 +index 291f569259..b8e1c9c002 100644 --- a/moz.build +++ b/moz.build -@@ -362,3 +362,5 @@ SPHINX_TREES["jsloader"] = "docs/jsloader" - SPHINX_TREES["ai-agent-tools"] = "docs/ai-agent-tools" - - include("build/templates.mozbuild") +@@ -381,3 +381,5 @@ if CONFIG["MOZ_GENERATE_SBOM"]: + ], + force=True, + ) + +DIRS += ["lw"] diff --git a/browser/patches/fingerprint-injection.patch b/browser/patches/fingerprint-injection.patch index 13fd475c..b4b57edb 100644 --- a/browser/patches/fingerprint-injection.patch +++ b/browser/patches/fingerprint-injection.patch @@ -1,8 +1,8 @@ diff --git a/dom/base/moz.build b/dom/base/moz.build -index e8f35ff5c4..88cea77d60 100644 +index 256ce5821d..6f517641d4 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -664,3 +664,6 @@ GeneratedFile( +@@ -665,3 +665,6 @@ GeneratedFile( "/servo/components/style/properties/counted_unknown_properties.py", ], ) @@ -11,7 +11,7 @@ index e8f35ff5c4..88cea77d60 100644 +LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index 4bc8548e31..2bea4b618a 100644 +index 27569c73a7..e55c4d64c9 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -3,6 +3,7 @@ @@ -22,7 +22,7 @@ index 4bc8548e31..2bea4b618a 100644 #include #include -@@ -3715,6 +3716,8 @@ void nsGlobalWindowInner::SetName(const nsAString& aName, +@@ -3712,6 +3713,8 @@ void nsGlobalWindowInner::SetName(const nsAString& aName, double nsGlobalWindowInner::GetInnerWidth(CallerType aCallerType, ErrorResult& aError) { @@ -31,7 +31,7 @@ index 4bc8548e31..2bea4b618a 100644 FORWARD_TO_OUTER_OR_THROW(GetInnerWidthOuter, (aCallerType, aError), aError, 0); } -@@ -3728,6 +3731,8 @@ nsresult nsGlobalWindowInner::GetInnerWidth(CallerType aCallerType, +@@ -3725,6 +3728,8 @@ nsresult nsGlobalWindowInner::GetInnerWidth(CallerType aCallerType, double nsGlobalWindowInner::GetInnerHeight(CallerType aCallerType, ErrorResult& aError) { @@ -40,7 +40,7 @@ index 4bc8548e31..2bea4b618a 100644 FORWARD_TO_OUTER_OR_THROW(GetInnerHeightOuter, (aCallerType, aError), aError, 0); } -@@ -3741,6 +3746,12 @@ nsresult nsGlobalWindowInner::GetInnerHeight(CallerType aCallerType, +@@ -3738,6 +3743,12 @@ nsresult nsGlobalWindowInner::GetInnerHeight(CallerType aCallerType, int32_t nsGlobalWindowInner::GetOuterWidth(CallerType aCallerType, ErrorResult& aError) { @@ -53,7 +53,7 @@ index 4bc8548e31..2bea4b618a 100644 FORWARD_TO_OUTER_OR_THROW(GetOuterWidthOuter, (aCallerType, aError), aError, 0); } -@@ -3761,11 +3772,13 @@ double nsGlobalWindowInner::ScreenEdgeSlopY() const { +@@ -3758,11 +3769,13 @@ double nsGlobalWindowInner::ScreenEdgeSlopY() const { int32_t nsGlobalWindowInner::GetScreenX(CallerType aCallerType, ErrorResult& aError) { @@ -67,7 +67,7 @@ index 4bc8548e31..2bea4b618a 100644 FORWARD_TO_OUTER_OR_THROW(GetScreenYOuter, (aCallerType, aError), aError, 0); } -@@ -3799,6 +3812,8 @@ static nsPresContext* GetPresContextForRatio(Document* aDoc) { +@@ -3796,6 +3809,8 @@ static nsPresContext* GetPresContextForRatio(Document* aDoc) { double nsGlobalWindowInner::GetDevicePixelRatio(CallerType aCallerType, ErrorResult& aError) { ENSURE_ACTIVE_DOCUMENT(aError, 0.0); @@ -114,7 +114,7 @@ index 3b48a7f1e2..4b989dd48a 100644 if (ShouldResistFingerprinting(RFPTarget::ScreenAvailRect)) { return GetTopWindowInnerRectForRFP(); diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp -index 519668019e..f12ea64bc0 100644 +index 50dbb0847d..567e832a35 100644 --- a/dom/workers/WorkerNavigator.cpp +++ b/dom/workers/WorkerNavigator.cpp @@ -3,6 +3,7 @@ @@ -135,7 +135,7 @@ index 519668019e..f12ea64bc0 100644 bool gpcStatus = StaticPrefs::privacy_globalprivacycontrol_enabled(); if (!gpcStatus) { JSObject* jso = GetWrapper(); -@@ -134,6 +138,8 @@ void WorkerNavigator::SetLanguages(const nsTArray& aLanguages) { +@@ -133,6 +137,8 @@ void WorkerNavigator::SetLanguages(const nsTArray& aLanguages) { void WorkerNavigator::GetAppVersion(nsString& aAppVersion, CallerType aCallerType, ErrorResult& aRv) const { @@ -144,7 +144,7 @@ index 519668019e..f12ea64bc0 100644 WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); -@@ -156,6 +162,8 @@ void WorkerNavigator::GetAppVersion(nsString& aAppVersion, +@@ -155,6 +161,8 @@ void WorkerNavigator::GetAppVersion(nsString& aAppVersion, void WorkerNavigator::GetPlatform(nsString& aPlatform, CallerType aCallerType, ErrorResult& aRv) const { @@ -154,15 +154,15 @@ index 519668019e..f12ea64bc0 100644 MOZ_ASSERT(workerPrivate); @@ -216,6 +224,8 @@ class GetUserAgentRunnable final : public WorkerMainThreadRunnable { - - void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, + void WorkerNavigator::GetUserAgent(nsCString& aUserAgent, + CallerType aCallerType, ErrorResult& aRv) const { + if (auto value = MaskConfig::GetString("navigator.userAgent")) -+ return aUserAgent.Assign(NS_ConvertUTF8toUTF16(value.value())); ++ return aUserAgent.Assign(value.value().c_str()); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); MOZ_ASSERT(workerPrivate); -@@ -227,6 +237,8 @@ void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, +@@ -227,6 +237,8 @@ void WorkerNavigator::GetUserAgent(nsCString& aUserAgent, } uint64_t WorkerNavigator::HardwareConcurrency() const { diff --git a/browser/patches/font-hijacker.patch b/browser/patches/font-hijacker.patch index 371aa124..89b65efd 100644 --- a/browser/patches/font-hijacker.patch +++ b/browser/patches/font-hijacker.patch @@ -52,7 +52,7 @@ index b6696c70c4..4727cae871 100644 static void ReleaseFontData(void* aInfo, const void* aData, size_t aSize) { diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp -index 63169b05b7..5b659113f3 100644 +index 0d359b69d7..70740aeefa 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -5,6 +5,7 @@ @@ -63,7 +63,7 @@ index 63169b05b7..5b659113f3 100644 #include "SharedFontList-impl.h" #include "gfxDWriteCommon.h" #include "gfxDWriteFonts.h" -@@ -1634,6 +1635,8 @@ void gfxDWriteFontList::InitSharedFontListForPlatform() { +@@ -1754,6 +1755,8 @@ void gfxDWriteFontList::InitSharedFontListForPlatform() { // We activate bundled fonts if the pref is > 0 (on) or < 0 (auto), only an // explicit value of 0 (off) will disable them. TimeStamp start1 = TimeStamp::Now(); @@ -72,7 +72,7 @@ index 63169b05b7..5b659113f3 100644 if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { mBundledFonts = CreateBundledFontsCollection(factory); } -@@ -2627,22 +2630,48 @@ class BundledFontFileEnumerator : public IDWriteFontFileEnumerator { +@@ -2747,22 +2750,48 @@ class BundledFontFileEnumerator : public IDWriteFontFileEnumerator { nsCOMPtr mFontDir; nsCOMPtr mEntries; nsCOMPtr mCurrent; @@ -128,7 +128,7 @@ index 63169b05b7..5b659113f3 100644 } *aHasCurrentFile = hasMore; diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp -index 2ea46a9810..039316b8d6 100644 +index 849b3af462..164c33448d 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -6,6 +6,7 @@ @@ -139,7 +139,7 @@ index 2ea46a9810..039316b8d6 100644 #include "SharedFontList-impl.h" #include "base/eintr_wrapper.h" #include "gfxScriptItemizer.h" -@@ -900,6 +901,29 @@ void gfxPlatformFontList::GenerateFontListKey(nsACString& aKeyName) { +@@ -897,6 +898,29 @@ void gfxPlatformFontList::GenerateFontListKey(nsACString& aKeyName) { ToLowerCase(aKeyName); } @@ -169,7 +169,7 @@ index 2ea46a9810..039316b8d6 100644 // Used if a stylo thread wants to trigger InitOtherFamilyNames in the main // process: we can't do IPC from the stylo thread so we post this to the main // thread instead. -@@ -1428,6 +1452,17 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( +@@ -1425,6 +1449,17 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( uint32_t aNextCh, Script aRunScript, FontPresentation aPresentation, const gfxFontStyle* aMatchStyle, uint32_t& aCmapCount, FontFamily& aMatchedFamily) { @@ -187,7 +187,7 @@ index 2ea46a9810..039316b8d6 100644 bool useCmaps = IsFontFamilyWhitelistActive() || gfxPlatform::GetPlatform()->UseCmapsDuringSystemFallback(); FontVisibility level = aFontVisibilityProvider -@@ -1437,7 +1472,22 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( +@@ -1434,7 +1469,22 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( // Allow platform-specific fallback code to try and find a usable font gfxFontEntry* fe = PlatformGlobalFontFallback( aFontVisibilityProvider, aCh, aRunScript, aMatchStyle, aMatchedFamily); @@ -211,7 +211,7 @@ index 2ea46a9810..039316b8d6 100644 if (aMatchedFamily.mShared) { if (IsVisibleToCSS(*aMatchedFamily.mShared, level)) { RefPtr font = fe->FindOrMakeFont(aMatchStyle); -@@ -1478,6 +1528,11 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( +@@ -1475,6 +1525,11 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( if (!IsVisibleToCSS(family, level)) { continue; } @@ -223,7 +223,7 @@ index 2ea46a9810..039316b8d6 100644 if (!family.IsFullyInitialized() && StaticPrefs::gfx_font_rendering_fallback_async() && !XRE_IsParentProcess()) { -@@ -1504,6 +1559,13 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( +@@ -1501,6 +1556,13 @@ already_AddRefed gfxPlatformFontList::GlobalFontFallback( if (!IsVisibleToCSS(*family, level)) { continue; } @@ -237,7 +237,7 @@ index 2ea46a9810..039316b8d6 100644 // evaluate all fonts in this family for a match family->FindFontForChar(&data); if (data.mMatchDistance == 0.0) { -@@ -1732,6 +1794,11 @@ bool gfxPlatformFontList::FindAndAddFamiliesLocked( +@@ -1729,6 +1791,11 @@ bool gfxPlatformFontList::FindAndAddFamiliesLocked( aFontVisibilityProvider ? aFontVisibilityProvider->GetFontVisibility() : FontVisibility::User; @@ -274,7 +274,7 @@ index 66290cd704..bdd4b52666 100644 bool AddWithLegacyFamilyName(const nsACString& aLegacyName, diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp -index 084c269bde..4507ab9927 100644 +index 54433dc950..ef04e92585 100644 --- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -473,6 +473,24 @@ void gfxUserFontEntry::DoLoadNextSrc(bool aIsContinue) { @@ -303,13 +303,13 @@ index 084c269bde..4507ab9927 100644 // as this means we are dependent on any updates to the font list. mSeenLocalSource = true; diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build -index a9f68b0563..d3dede3ae0 100644 +index bb3da184dc..5afed86888 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build -@@ -301,3 +301,6 @@ DEFINES["GRAPHITE2_STATIC"] = True - COMPILE_FLAGS["WARNINGS_CXXFLAGS"] += ["-Werror=switch"] - - include("/tools/fuzzing/libfuzzer-config.mozbuild") +@@ -310,3 +310,6 @@ LICENSED_UNDER["gfx-font-list"].paths = [ + "gfxMacPlatformFontList.mm", + "gfxPlatformFontList.cpp", + ] + +# DOM Mask +LOCAL_INCLUDES += ["/camoucfg"] diff --git a/browser/patches/font-list-spoofing.patch b/browser/patches/font-list-spoofing.patch index 18ec4600..69e653ff 100644 --- a/browser/patches/font-list-spoofing.patch +++ b/browser/patches/font-list-spoofing.patch @@ -146,10 +146,10 @@ index 0000000000..9b394237c2 + +#endif // mozilla_dom_FontListManager_h diff --git a/dom/base/moz.build b/dom/base/moz.build -index 88cea77d60..fa277ae122 100644 +index 6f517641d4..8f8c58ed1c 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -561,6 +561,13 @@ SOURCES += [ +@@ -562,6 +562,13 @@ SOURCES += [ "nsPluginArray.cpp", ] @@ -164,7 +164,7 @@ index 88cea77d60..fa277ae122 100644 # CharacterDataBuffer.cpp if CONFIG["INTEL_ARCHITECTURE"]: diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index fe4e23c993..466785f591 100644 +index e55c4d64c9..310550e80d 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -21,6 +21,7 @@ @@ -175,7 +175,7 @@ index fe4e23c993..466785f591 100644 #include "Units.h" #include "VRManagerChild.h" #include "WindowDestroyedEvent.h" -@@ -7801,6 +7802,14 @@ void nsGlobalWindowInner::SetAudioFingerprintSeed(uint32_t seed, +@@ -7797,6 +7798,14 @@ void nsGlobalWindowInner::SetAudioFingerprintSeed(uint32_t seed, RoverfoxStorageManager::RemoveSetter("setAudioFingerprintSeed"); } @@ -191,10 +191,10 @@ index fe4e23c993..466785f591 100644 bool aGranted) { // Invalidate cached StorageAllowed field so that calls to GetLocalStorage diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h -index eec89694f8..e7cf0601f4 100644 +index dd91e816d1..d83ed2d810 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h -@@ -693,6 +693,9 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, +@@ -695,6 +695,9 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, void UpdateSharedWorkerTimezoneOverride(const nsAString& aTimezoneOverride); @@ -205,10 +205,10 @@ index eec89694f8..e7cf0601f4 100644 void Alert(nsIPrincipal& aSubjectPrincipal, mozilla::ErrorResult& aError); void Alert(const nsAString& aMessage, nsIPrincipal& aSubjectPrincipal, diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index ab1c306617..38227acada 100644 +index 1ec0400749..2a0a98685a 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -943,6 +943,12 @@ partial interface Window { +@@ -947,6 +947,12 @@ partial interface Window { undefined setAudioFingerprintSeed(unsigned long seed); }; @@ -222,7 +222,7 @@ index ab1c306617..38227acada 100644 // finding on a page. partial interface Window { diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp -index 039316b8d6..42b2b42650 100644 +index 164c33448d..c2181d76c7 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -29,6 +29,7 @@ @@ -233,7 +233,7 @@ index 039316b8d6..42b2b42650 100644 #include "mozilla/gfx/2D.h" #include "mozilla/gfx/Logging.h" #include "mozilla/glean/GfxMetrics.h" -@@ -1789,6 +1790,16 @@ bool gfxPlatformFontList::FindAndAddFamiliesLocked( +@@ -1786,6 +1787,16 @@ bool gfxPlatformFontList::FindAndAddFamiliesLocked( nsAutoCString key; GenerateFontListKey(aFamily, key); @@ -251,7 +251,7 @@ index 039316b8d6..42b2b42650 100644 FontVisibility visibilityLevel = aFontVisibilityProvider ? aFontVisibilityProvider->GetFontVisibility() diff --git a/gfx/thebes/gfxTextRun.cpp b/gfx/thebes/gfxTextRun.cpp -index bc887921c8..a1d299e650 100644 +index 77699420a4..41e4bb973f 100644 --- a/gfx/thebes/gfxTextRun.cpp +++ b/gfx/thebes/gfxTextRun.cpp @@ -33,6 +33,7 @@ @@ -261,8 +261,8 @@ index bc887921c8..a1d299e650 100644 +#include "mozilla/dom/FontListManager.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/RoverfoxStorageManager.h" - -@@ -1922,6 +1923,8 @@ class DeferredClearResolvedFonts final : public nsIRunnable { + #include "mozilla/dom/WorkerPrivate.h" +@@ -1933,6 +1934,8 @@ class DeferredClearResolvedFonts final : public nsIRunnable { NS_IMPL_ISUPPORTS(DeferredClearResolvedFonts, nsIRunnable) void gfxFontGroup::EnsureFontList() { diff --git a/browser/patches/geolocation-spoofing.patch b/browser/patches/geolocation-spoofing.patch index b52c7b85..e72da549 100644 --- a/browser/patches/geolocation-spoofing.patch +++ b/browser/patches/geolocation-spoofing.patch @@ -81,12 +81,12 @@ index 170552ab61..b5f1efa0a8 100644 +# Camoufox: include path for MaskConfig.hpp +LOCAL_INCLUDES += ["/camoucfg"] diff --git a/dom/system/NetworkGeolocationProvider.sys.mjs b/dom/system/NetworkGeolocationProvider.sys.mjs -index 29455e42de..49fd07ac19 100644 +index 2dc54dc968..5bf84686ce 100644 --- a/dom/system/NetworkGeolocationProvider.sys.mjs +++ b/dom/system/NetworkGeolocationProvider.sys.mjs -@@ -399,17 +399,52 @@ NetworkGeolocationProvider.prototype = { - `Sending IP-address-based geolocation request${logStr} to network service: ${url}` - ); +@@ -483,28 +483,63 @@ NetworkGeolocationProvider.prototype = { + // From here on, do a network geolocation request // + let url = Services.urlFormatter.formatURLPref("geo.provider.network.url"); + // Use CAMOU_CONFIG geolocation if configured + let DEFAULT_DEG = -180; @@ -102,15 +102,9 @@ index 29455e42de..49fd07ac19 100644 + let result; try { -- result = await this.fetchLocation(url, wifiData); -- lazy.log.info( -- `geo provider reported: ${result.location.lng}:${result.location.lat}` -- ); -- let newLocation = new NetworkGeoPositionObject( -- result.location.lat, -- result.location.lng, -- result.accuracy -- ); +- // formatURLPref() returns about:blank for a pref without a value. +- if (!url || url == "about:blank") { +- throw new Error("No network geolocation service URL is configured"); + let newLocation; + if (latitude != DEFAULT_DEG && longitude != DEFAULT_DEG) { + // Use the latitude and longitude from CAMOU_CONFIG @@ -133,6 +127,16 @@ index 29455e42de..49fd07ac19 100644 + ); + } else { + // No CAMOU_CONFIG override, use real geolocation ++ // formatURLPref() returns about:blank for a pref without a value. ++ if (!url || url == "about:blank") { ++ throw new Error("No network geolocation service URL is configured"); ++ } ++ ++ let logStr = data.wifiAccessPoints ? " with wifi APs" : ""; ++ lazy.log.info( ++ `Sending IP-address-based geolocation request${logStr} to network service: ${url}` ++ ); ++ + result = await this.fetchLocation(url, wifiData); + lazy.log.info( + `geo provider reported: ${result.location.lng}:${result.location.lat}` @@ -142,7 +146,23 @@ index 29455e42de..49fd07ac19 100644 + result.location.lng, + accuracy || result.accuracy + ); -+ } + } +- let logStr = data.wifiAccessPoints ? " with wifi APs" : ""; +- lazy.log.info( +- `Sending IP-address-based geolocation request${logStr} to network service: ${url}` +- ); +- +- result = await this.fetchLocation(url, wifiData); +- lazy.log.info( +- `geo provider reported: ${result.location.lng}:${result.location.lat}` +- ); +- let newLocation = new NetworkGeoPositionObject( +- result.location.lat, +- result.location.lng, +- result.accuracy +- ); +- if (this.listener) { this.listener.update(newLocation); + } diff --git a/browser/patches/navigator-spoofing.patch b/browser/patches/navigator-spoofing.patch index 74cf0084..191e0adc 100644 --- a/browser/patches/navigator-spoofing.patch +++ b/browser/patches/navigator-spoofing.patch @@ -1,5 +1,5 @@ diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp -index 7af722b926..3850d52706 100644 +index f05c5b0b95..ee63bdfe9d 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -4,6 +4,9 @@ @@ -12,9 +12,9 @@ index 7af722b926..3850d52706 100644 #include "Geolocation.h" #include "base/basictypes.h" -@@ -270,6 +273,16 @@ void Navigator::Invalidate() { +@@ -271,6 +274,16 @@ void Navigator::Invalidate() { - void Navigator::GetUserAgent(nsAString& aUserAgent, CallerType aCallerType, + void Navigator::GetUserAgent(nsACString& aUserAgent, CallerType aCallerType, ErrorResult& aRv) const { + // Camoufox: per-context user agent + if (mWindow) { @@ -22,14 +22,14 @@ index 7af722b926..3850d52706 100644 + RoverfoxStorageManager::UserContextId(mWindow); + nsAutoString stored; + if (NavigatorManager::GetUserAgent(userContextId, stored)) { -+ aUserAgent = stored; ++ CopyUTF16toUTF8(stored, aUserAgent); + return; + } + } - nsCOMPtr window; - - if (mWindow) { -@@ -317,6 +330,11 @@ void Navigator::GetAppCodeName(nsAString& aAppCodeName, ErrorResult& aRv) { + if (nsIDocShell* docshell = mWindow->GetDocShell()) { + docshell->GetBrowsingContext()->GetCustomUserAgent(aUserAgent); + if (!aUserAgent.IsEmpty()) { +@@ -309,6 +322,11 @@ void Navigator::GetAppCodeName(nsAString& aAppCodeName, ErrorResult& aRv) { void Navigator::GetAppVersion(nsAString& aAppVersion, CallerType aCallerType, ErrorResult& aRv) const { @@ -41,7 +41,7 @@ index 7af722b926..3850d52706 100644 nsCOMPtr doc = mWindow->GetExtantDoc(); nsresult rv = GetAppVersion( -@@ -432,6 +450,21 @@ void Navigator::GetLanguages(nsTArray& aLanguages) { +@@ -424,6 +442,21 @@ void Navigator::GetLanguages(nsTArray& aLanguages) { void Navigator::GetPlatform(nsAString& aPlatform, CallerType aCallerType, ErrorResult& aRv) const { @@ -63,7 +63,7 @@ index 7af722b926..3850d52706 100644 if (mWindow) { BrowsingContext* bc = mWindow->GetBrowsingContext(); nsString customPlatform; -@@ -457,6 +490,21 @@ void Navigator::GetPlatform(nsAString& aPlatform, CallerType aCallerType, +@@ -449,6 +482,21 @@ void Navigator::GetPlatform(nsAString& aPlatform, CallerType aCallerType, void Navigator::GetOscpu(nsAString& aOSCPU, CallerType aCallerType, ErrorResult& aRv) const { @@ -85,7 +85,7 @@ index 7af722b926..3850d52706 100644 if (aCallerType != CallerType::System) { // If fingerprinting resistance is on, we will spoof this value. See // nsRFPService.h for details about spoofed values. -@@ -685,6 +733,15 @@ void Navigator::GetDoNotTrack(nsAString& aResult) { +@@ -677,6 +725,15 @@ void Navigator::GetDoNotTrack(nsAString& aResult) { } bool Navigator::GlobalPrivacyControl() { @@ -101,7 +101,7 @@ index 7af722b926..3850d52706 100644 bool gpcStatus = StaticPrefs::privacy_globalprivacycontrol_enabled(); if (!gpcStatus) { nsCOMPtr loadContext = do_GetInterface(mWindow); -@@ -696,6 +753,19 @@ bool Navigator::GlobalPrivacyControl() { +@@ -687,6 +744,19 @@ bool Navigator::GlobalPrivacyControl() { } uint64_t Navigator::HardwareConcurrency() { @@ -271,7 +271,7 @@ index 0000000000..7ecad32bb4 + +#endif // mozilla_dom_NavigatorManager_h diff --git a/dom/base/moz.build b/dom/base/moz.build -index fa277ae122..b0973412be 100644 +index 8f8c58ed1c..97ea29a739 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -223,6 +223,7 @@ EXPORTS.mozilla.dom += [ @@ -282,7 +282,7 @@ index fa277ae122..b0973412be 100644 "NodeInfo.h", "NodeInfoInlines.h", "NodeIterator.h", -@@ -561,6 +562,10 @@ SOURCES += [ +@@ -562,6 +563,10 @@ SOURCES += [ "nsPluginArray.cpp", ] @@ -294,7 +294,7 @@ index fa277ae122..b0973412be 100644 SOURCES += ["FontListManager.cpp"] diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index 466785f591..1f133b6ed6 100644 +index 310550e80d..23381f7b3c 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -4,6 +4,7 @@ @@ -305,7 +305,7 @@ index 466785f591..1f133b6ed6 100644 #include #include -@@ -7810,6 +7811,36 @@ void nsGlobalWindowInner::SetFontList(const nsAString& aFontList, +@@ -7806,6 +7807,36 @@ void nsGlobalWindowInner::SetFontList(const nsAString& aFontList, RoverfoxStorageManager::RemoveSetter("setFontList"); } @@ -343,10 +343,10 @@ index 466785f591..1f133b6ed6 100644 bool aGranted) { // Invalidate cached StorageAllowed field so that calls to GetLocalStorage diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h -index e7cf0601f4..9616144511 100644 +index d83ed2d810..ac500caabd 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h -@@ -696,6 +696,14 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, +@@ -698,6 +698,14 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, // Per-context font list spoofing void SetFontList(const nsAString& aFontList, mozilla::ErrorResult& aRv); @@ -362,10 +362,10 @@ index e7cf0601f4..9616144511 100644 void Alert(nsIPrincipal& aSubjectPrincipal, mozilla::ErrorResult& aError); void Alert(const nsAString& aMessage, nsIPrincipal& aSubjectPrincipal, diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index 38227acada..bfb0332a1c 100644 +index 2a0a98685a..e04cc674c7 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -958,6 +958,30 @@ partial interface Window { +@@ -962,6 +962,30 @@ partial interface Window { optional boolean onHorizontalScrollbar = false); }; @@ -397,7 +397,7 @@ index 38227acada..bfb0332a1c 100644 USVString targetOrigin = "/"; }; diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp -index f12ea64bc0..9fb3b9ebed 100644 +index 567e832a35..bc5f22a2ae 100644 --- a/dom/workers/WorkerNavigator.cpp +++ b/dom/workers/WorkerNavigator.cpp @@ -4,6 +4,8 @@ @@ -409,7 +409,7 @@ index f12ea64bc0..9fb3b9ebed 100644 #include "ErrorList.h" #include "MainThreadUtils.h" -@@ -162,6 +164,18 @@ void WorkerNavigator::GetAppVersion(nsString& aAppVersion, +@@ -161,6 +163,18 @@ void WorkerNavigator::GetAppVersion(nsString& aAppVersion, void WorkerNavigator::GetPlatform(nsString& aPlatform, CallerType aCallerType, ErrorResult& aRv) const { @@ -429,8 +429,8 @@ index f12ea64bc0..9fb3b9ebed 100644 return aPlatform.Assign(NS_ConvertUTF8toUTF16(value.value())); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); @@ -224,6 +238,18 @@ class GetUserAgentRunnable final : public WorkerMainThreadRunnable { - - void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, + void WorkerNavigator::GetUserAgent(nsCString& aUserAgent, + CallerType aCallerType, ErrorResult& aRv) const { + // Camoufox: per-context user agent for workers + { @@ -439,15 +439,15 @@ index f12ea64bc0..9fb3b9ebed 100644 + uint32_t ucid = wp->GetOriginAttributes().mUserContextId; + nsAutoString stored; + if (mozilla::dom::NavigatorManager::GetUserAgent(ucid, stored)) { -+ aUserAgent = stored; ++ CopyUTF16toUTF8(stored, aUserAgent); + return; + } + } + } if (auto value = MaskConfig::GetString("navigator.userAgent")) - return aUserAgent.Assign(NS_ConvertUTF8toUTF16(value.value())); + return aUserAgent.Assign(value.value().c_str()); WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate(); -@@ -237,6 +263,17 @@ void WorkerNavigator::GetUserAgent(nsString& aUserAgent, CallerType aCallerType, +@@ -237,6 +263,17 @@ void WorkerNavigator::GetUserAgent(nsCString& aUserAgent, } uint64_t WorkerNavigator::HardwareConcurrency() const { diff --git a/browser/patches/playwright/0-playwright.patch b/browser/patches/playwright/0-playwright.patch index 5467bb0d..f175fc00 100644 --- a/browser/patches/playwright/0-playwright.patch +++ b/browser/patches/playwright/0-playwright.patch @@ -44,18 +44,18 @@ index d7717e2903..43b25ce988 100644 * Return XPCOM wrapper for the internal accessible. */ diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp -index 8337336dc8..9eb83f33bb 100644 +index 3734e1d3eb..c46b5a7670 100644 --- a/browser/app/winlauncher/LauncherProcessWin.cpp +++ b/browser/app/winlauncher/LauncherProcessWin.cpp -@@ -18,6 +18,7 @@ - #include "mozilla/WinHeaderOnlyUtils.h" +@@ -20,6 +20,7 @@ #include "nsWindowsHelpers.h" + #include "mozilla/mscom/ProcessRuntime.h" +#include #include #include #include -@@ -490,8 +491,18 @@ Maybe LauncherMain(int& argc, wchar_t* argv[]) { +@@ -577,8 +578,18 @@ Maybe LauncherMain(int& argc, wchar_t* argv[]) { HANDLE stdHandles[] = {::GetStdHandle(STD_INPUT_HANDLE), ::GetStdHandle(STD_OUTPUT_HANDLE), ::GetStdHandle(STD_ERROR_HANDLE)}; @@ -123,10 +123,10 @@ index 257e87fe0c..8c13f02010 100644 const transportProvider = { setListener(upgradeListener) { diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp -index ec540bce58..5da611e913 100644 +index a0a7b8df9c..7521276210 100644 --- a/docshell/base/BrowsingContext.cpp +++ b/docshell/base/BrowsingContext.cpp -@@ -119,18 +119,20 @@ struct ParamTraits +@@ -122,18 +122,20 @@ struct ParamTraits template <> struct ParamTraits @@ -154,7 +154,7 @@ index ec540bce58..5da611e913 100644 template <> struct ParamTraits -@@ -3562,6 +3564,15 @@ void BrowsingContext::DidSet(FieldIndex, +@@ -3626,6 +3628,15 @@ void BrowsingContext::DidSet(FieldIndex, }); } @@ -170,7 +170,7 @@ index ec540bce58..5da611e913 100644 void BrowsingContext::DidSet(FieldIndex, nsString&& aOldValue) { MOZ_ASSERT(IsTop()); -@@ -3843,7 +3854,7 @@ void BrowsingContext::SetGeolocationServiceOverride( +@@ -3921,7 +3932,7 @@ void BrowsingContext::SetGeolocationServiceOverride( if (aGeolocationOverride.WasPassed()) { if (!mGeolocationServiceOverride) { mGeolocationServiceOverride = MakeRefPtr(); @@ -180,10 +180,10 @@ index ec540bce58..5da611e913 100644 mGeolocationServiceOverride->Update(aGeolocationOverride.Value()); } else if (RefPtr serviceOverride = diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h -index c1100f1503..ab3f514b7e 100644 +index 9cecca7627..ae57102633 100644 --- a/docshell/base/BrowsingContext.h +++ b/docshell/base/BrowsingContext.h -@@ -211,11 +211,11 @@ struct EmbedderColorSchemes { +@@ -204,11 +204,11 @@ struct EmbedderColorSchemes { FIELD(HasScreenAreaOverride, bool) \ /* ScreenOrientation-related APIs */ \ FIELD(CurrentOrientationAngle, float) \ @@ -191,22 +191,22 @@ index c1100f1503..ab3f514b7e 100644 + FIELD(CurrentOrientationType, dom::OrientationType) \ FIELD(OrientationLock, mozilla::hal::ScreenOrientation) \ FIELD(HasOrientationOverride, bool) \ - FIELD(UserAgentOverride, nsString) \ + FIELD(UserAgentOverride, nsCString) \ - FIELD(TouchEventsOverrideInternal, mozilla::dom::TouchEventsOverride) \ + FIELD(TouchEventsOverrideInternal, dom::TouchEventsOverride) \ FIELD(EmbedderElementType, Maybe) \ FIELD(MessageManagerGroup, nsString) \ FIELD(MaxTouchPointsOverride, uint8_t) \ -@@ -261,6 +261,8 @@ struct EmbedderColorSchemes { - * embedder element. */ \ - FIELD(EmbedderColorSchemes, EmbedderColorSchemes) \ +@@ -258,6 +258,8 @@ struct EmbedderColorSchemes { + * scrollbars clear the rounded content-area corners. */ \ + FIELD(EmbedderScrollbarInset, LayoutDeviceIntMargin) \ FIELD(DisplayMode, dom::DisplayMode) \ + /* playwright addition */ \ + FIELD(PrefersContrastOverride, dom::PrefersContrastOverride) \ /* The number of entries added to the session history because of this \ * browsing context. */ \ FIELD(HistoryEntryCount, uint32_t) \ -@@ -1123,6 +1125,10 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { +@@ -1127,6 +1129,10 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { return Top()->GetAnimationsPlayBackRateMultiplier(); } @@ -217,7 +217,7 @@ index c1100f1503..ab3f514b7e 100644 bool IsInBFCache() const; bool IsEnteringBFCache() const { return mIsEnteringBFCache; } void DeactivateDocuments(); -@@ -1343,6 +1349,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { +@@ -1352,6 +1358,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { return IsTop(); } @@ -229,7 +229,7 @@ index c1100f1503..ab3f514b7e 100644 bool CanSet(FieldIndex, dom::ForcedColorsOverride, ContentParent*) { return IsTop(); -@@ -1383,6 +1394,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { +@@ -1395,6 +1406,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void DidSet(FieldIndex, double aOldValue); @@ -240,7 +240,7 @@ index c1100f1503..ab3f514b7e 100644 void WalkPresContexts(Callback&&); void PresContextAffectingFieldChanged(); diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp -index 1fa976de8a..69f04ccd90 100644 +index 941d5c2533..c90ecf7022 100644 --- a/docshell/base/CanonicalBrowsingContext.cpp +++ b/docshell/base/CanonicalBrowsingContext.cpp @@ -315,6 +315,8 @@ void CanonicalBrowsingContext::ReplacedBy( @@ -252,7 +252,7 @@ index 1fa976de8a..69f04ccd90 100644 txn.SetParentalControlsEnabled(GetParentalControlsEnabled()); if (!GetLanguageOverride().IsEmpty()) { -@@ -1976,6 +1978,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI, +@@ -1997,6 +1999,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI, (void)SetIsCaptivePortalTab(true); } @@ -266,7 +266,7 @@ index 1fa976de8a..69f04ccd90 100644 } diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp -index 6fe906d343..16703bcea9 100644 +index 5be2ef4638..0202e3db16 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -15,6 +15,12 @@ @@ -315,7 +315,7 @@ index 6fe906d343..16703bcea9 100644 #include "nsNetCID.h" #include "nsNetUtil.h" #include "nsObjectLoadingContent.h" -@@ -356,6 +367,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext, +@@ -354,6 +365,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext, mAllowDNSPrefetch(true), mAllowWindowControl(true), mCSSErrorReportingEnabled(false), @@ -330,7 +330,7 @@ index 6fe906d343..16703bcea9 100644 mAllowAuth(mItemType == typeContent), mAllowKeywordFixup(false), mDisableMetaRefreshWhenInactive(false), -@@ -2978,6 +2997,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) { +@@ -2979,6 +2998,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) { return NS_OK; } @@ -563,7 +563,7 @@ index 6fe906d343..16703bcea9 100644 NS_IMETHODIMP nsDocShell::GetIsNavigating(bool* aOut) { *aOut = mIsNavigating; -@@ -4671,7 +4916,7 @@ nsDocShell::GetVisibility(bool* aVisibility) { +@@ -4706,7 +4951,7 @@ nsDocShell::GetVisibility(bool* aVisibility) { } void nsDocShell::ActivenessMaybeChanged() { @@ -572,7 +572,7 @@ index 6fe906d343..16703bcea9 100644 if (RefPtr presShell = GetPresShell()) { presShell->ActivenessMaybeChanged(); } -@@ -7688,6 +7933,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) { +@@ -7721,6 +7966,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) { true, // aForceNoOpener getter_AddRefs(newBC)); MOZ_ASSERT(!newBC); @@ -585,7 +585,7 @@ index 6fe906d343..16703bcea9 100644 return rv; } -@@ -8881,6 +9132,9 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, +@@ -8923,6 +9174,9 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, // before calling Stop() below. Document* document = GetDocument(); uint32_t flags = 0; @@ -595,7 +595,7 @@ index 6fe906d343..16703bcea9 100644 if (document && !document->CanSavePresentation(nullptr, flags, true)) { // This forces some flags into the WindowGlobalParent's mBFCacheStatus, // which we'll then use in CanonicalBrowsingContext::AllowedInBFCache, -@@ -8956,6 +9210,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, +@@ -8998,6 +9252,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, attrs.SetFirstPartyDomain(isTopLevelDoc, aLoadState->URI()); nsCOMPtr req; @@ -612,7 +612,7 @@ index 6fe906d343..16703bcea9 100644 rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req)); if (NS_SUCCEEDED(rv)) { -@@ -12067,6 +12331,9 @@ class OnLinkClickEvent : public CancelableRunnable, public SupportsWeakPtr { +@@ -12115,6 +12379,9 @@ class OnLinkClickEvent : public CancelableRunnable, public SupportsWeakPtr { mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied, mTriggeringPrincipal); } @@ -622,7 +622,7 @@ index 6fe906d343..16703bcea9 100644 return NS_OK; } -@@ -12138,6 +12405,11 @@ nsresult nsDocShell::OnFormSubmit(HTMLFormElement* aForm, +@@ -12186,6 +12453,11 @@ nsresult nsDocShell::OnFormSubmit(HTMLFormElement* aForm, return OnLinkClickSync(aForm, aLoadState, false, aForm->NodePrincipal()); } @@ -634,7 +634,7 @@ index 6fe906d343..16703bcea9 100644 auto result = OnLinkClickWithLoadState(aForm, aLoadState, false, aForm->NodePrincipal()); if (result.isErr()) { -@@ -12276,6 +12548,8 @@ nsresult nsDocShell::OnLinkClick( +@@ -12324,6 +12596,8 @@ nsresult nsDocShell::OnLinkClick( ownerDoc->GetScriptTrackingFlags()); loadState->SetHistoryBehavior(NavigationHistoryBehavior::Auto); @@ -644,7 +644,7 @@ index 6fe906d343..16703bcea9 100644 aTriggeringPrincipal); return result.isErr() ? result.unwrapErr() : NS_OK; diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h -index c3fcd2985a..5d9a683361 100644 +index 27d9e920d1..bee50a595d 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -15,6 +15,7 @@ @@ -663,7 +663,7 @@ index c3fcd2985a..5d9a683361 100644 class HTMLEditor; class ObservedDocShell; class ScrollContainerFrame; -@@ -383,6 +385,15 @@ class nsDocShell final : public nsDocLoader, +@@ -384,6 +386,15 @@ class nsDocShell final : public nsDocLoader, void SetWillChangeProcess() { mWillChangeProcess = true; } bool WillChangeProcess() { return mWillChangeProcess; } @@ -679,7 +679,7 @@ index c3fcd2985a..5d9a683361 100644 // Creates a real network channel (not a DocumentChannel) using the specified // parameters. // Used by nsDocShell when not using DocumentChannel, by DocumentLoadListener -@@ -1000,6 +1011,8 @@ class nsDocShell final : public nsDocLoader, +@@ -1002,6 +1013,8 @@ class nsDocShell final : public nsDocLoader, bool CSSErrorReportingEnabled() const { return mCSSErrorReportingEnabled; } @@ -688,7 +688,7 @@ index c3fcd2985a..5d9a683361 100644 // Handles retrieval of subframe session history for nsDocShell::LoadURI. If a // load is requested in a subframe of the current DocShell, the subframe // loadType may need to reflect the loadType of the parent document, or in -@@ -1323,6 +1336,17 @@ class nsDocShell final : public nsDocLoader, +@@ -1336,6 +1349,17 @@ class nsDocShell final : public nsDocLoader, bool mAllowDNSPrefetch : 1; bool mAllowWindowControl : 1; bool mCSSErrorReportingEnabled : 1; @@ -707,7 +707,7 @@ index c3fcd2985a..5d9a683361 100644 bool mAllowKeywordFixup : 1; bool mDisableMetaRefreshWhenInactive : 1; diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl -index db0721841d..12d05dfcaf 100644 +index 011f9aef57..e6354d9657 100644 --- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -43,6 +43,7 @@ interface nsIURI; @@ -718,7 +718,7 @@ index db0721841d..12d05dfcaf 100644 interface nsIEditor; interface nsIEditingSession; interface nsIInputStream; -@@ -692,6 +693,45 @@ interface nsIDocShell : nsIDocShellTreeItem +@@ -685,6 +686,45 @@ interface nsIDocShell : nsIDocShellTreeItem */ void synchronizeLayoutHistoryState(); @@ -765,10 +765,10 @@ index db0721841d..12d05dfcaf 100644 * This attempts to save any applicable layout history state (like * scroll position) in the nsISHEntry. This is normally done diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp -index 3fa58ad226..df25c41312 100644 +index 360645185a..7c68275dde 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp -@@ -3850,6 +3850,9 @@ void Document::SendToConsole(nsCOMArray& aMessages) { +@@ -3864,6 +3864,9 @@ void Document::SendToConsole(nsCOMArray& aMessages) { } void Document::ApplySettingsFromCSP(bool aSpeculative) { @@ -778,7 +778,7 @@ index 3fa58ad226..df25c41312 100644 nsresult rv = NS_OK; if (!aSpeculative) { nsIContentSecurityPolicy* csp = PolicyContainer::GetCSP(mPolicyContainer); -@@ -3947,6 +3950,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { +@@ -3961,6 +3964,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { MOZ_ASSERT(mPolicyContainer, "Policy container must be initialized before CSP!"); @@ -790,7 +790,7 @@ index 3fa58ad226..df25c41312 100644 // If this is a data document - no need to set CSP. if (mLoadedAsData) { return NS_OK; -@@ -4928,6 +4936,10 @@ bool Document::HasFocus(ErrorResult& rv) const { +@@ -4991,6 +4999,10 @@ bool Document::HasFocus(ErrorResult& rv) const { return false; } @@ -801,7 +801,7 @@ index 3fa58ad226..df25c41312 100644 if (!fm->IsInActiveWindow(bc)) { return false; } -@@ -21188,6 +21200,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const { +@@ -21249,6 +21261,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const { return PreferenceSheet::PrefsFor(*this).mColorScheme; } @@ -838,10 +838,10 @@ index 3fa58ad226..df25c41312 100644 if (!sLoadingForegroundTopLevelContentDocument) { return false; diff --git a/dom/base/Document.h b/dom/base/Document.h -index 1e9501bbc8..4bda1725ce 100644 +index 08f32ca26b..bbcf090293 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h -@@ -4504,6 +4504,8 @@ class Document : public nsINode, +@@ -4544,6 +4544,8 @@ class Document : public nsINode, // color-scheme meta tag. ColorScheme DefaultColorScheme() const; @@ -851,10 +851,10 @@ index 1e9501bbc8..4bda1725ce 100644 static bool AutomaticStorageAccessPermissionCanBeGranted( diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp -index 818005d2cf..ccf2153d03 100644 +index f822db5292..81d421990b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp -@@ -2371,7 +2371,8 @@ bool Navigator::Webdriver() { +@@ -2376,7 +2376,8 @@ bool Navigator::Webdriver() { } #endif @@ -865,10 +865,10 @@ index 818005d2cf..ccf2153d03 100644 AutoplayPolicy Navigator::GetAutoplayPolicy(AutoplayPolicyMediaType aType) { diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp -index ea54b38955..67eb1287f3 100644 +index c640549a35..a8f545f133 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp -@@ -10414,6 +10414,8 @@ Result nsContentUtils::SynthesizeMouseEvent( +@@ -10431,6 +10431,8 @@ Result nsContentUtils::SynthesizeMouseEvent( EventMessage msg; Maybe exitFrom; bool contextMenuKey = false; @@ -877,7 +877,7 @@ index ea54b38955..67eb1287f3 100644 if (aType.EqualsLiteral("mousedown")) { msg = eMouseDown; } else if (aType.EqualsLiteral("mouseup")) { -@@ -10440,13 +10442,26 @@ Result nsContentUtils::SynthesizeMouseEvent( +@@ -10457,6 +10459,12 @@ Result nsContentUtils::SynthesizeMouseEvent( msg = eMouseHitTest; } else if (aType.EqualsLiteral("MozMouseExploreByTouch")) { msg = eMouseExploreByTouch; @@ -890,6 +890,7 @@ index ea54b38955..67eb1287f3 100644 } else { return Err(NS_ERROR_FAILURE); } +@@ -10468,7 +10476,14 @@ Result nsContentUtils::SynthesizeMouseEvent( Maybe pointerEvent; Maybe mouseEvent; @@ -905,7 +906,7 @@ index ea54b38955..67eb1287f3 100644 if (MOZ_UNLIKELY(aOptions.mIsWidgetEventSynthesized)) { MOZ_ASSERT_UNREACHABLE( "The event shouldn't be dispatched as a synthesized event"); -@@ -10474,6 +10489,7 @@ Result nsContentUtils::SynthesizeMouseEvent( +@@ -10496,6 +10511,7 @@ Result nsContentUtils::SynthesizeMouseEvent( mozilla::widget::AutoSynthesizedEventCallbackNotifier notifier(callback); WidgetMouseEvent& mouseOrPointerEvent = @@ -913,7 +914,7 @@ index ea54b38955..67eb1287f3 100644 pointerEvent.isSome() ? pointerEvent.ref() : mouseEvent.ref(); mouseOrPointerEvent.pointerId = aMouseEventData.mIdentifier; mouseOrPointerEvent.mModifiers = -@@ -10498,6 +10514,8 @@ Result nsContentUtils::SynthesizeMouseEvent( +@@ -10520,6 +10536,8 @@ Result nsContentUtils::SynthesizeMouseEvent( mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aOptions.mIsDOMEventSynthesized; mouseOrPointerEvent.mExitFrom = std::move(exitFrom); @@ -923,10 +924,10 @@ index ea54b38955..67eb1287f3 100644 nsPresContext* presContext = aPresShell->GetPresContext(); diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp -index 3f3b4faf59..4636ec54a0 100644 +index 9ac25228aa..81df7c7c03 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp -@@ -706,6 +706,55 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) { +@@ -707,6 +707,55 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) { return NS_ERROR_FAILURE; } @@ -983,7 +984,7 @@ index 3f3b4faf59..4636ec54a0 100644 nsDOMWindowUtils::IsCORSSafelistedRequestHeader(const nsACString& aName, const nsACString& aValue, diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp -index e3d3f4060d..42f5a628ed 100644 +index 722f715e45..a192b8b55b 100644 --- a/dom/base/nsFocusManager.cpp +++ b/dom/base/nsFocusManager.cpp @@ -1885,6 +1885,10 @@ Maybe nsFocusManager::SetFocusInner(Element* aNewContent, @@ -1029,10 +1030,10 @@ index e3d3f4060d..42f5a628ed 100644 // care of lowering the present active window. This happens in // a separate runnable to avoid touching multiple windows in diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp -index 5a764db307..c0bd92f276 100644 +index a287649849..e9b7d72274 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp -@@ -2530,7 +2530,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument, +@@ -2526,7 +2526,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument, &nsGlobalWindowInner::FireOnNewGlobalObject)); } @@ -1041,7 +1042,7 @@ index 5a764db307..c0bd92f276 100644 // We should probably notify, except if we have the initial about:blank // in a chrome docshell, defer notification until the first non-initial // document. -@@ -2548,10 +2548,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument, +@@ -2544,10 +2544,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument, }(); if (!isAboutBlankInChromeDocshell) { @@ -1062,7 +1063,7 @@ index 5a764db307..c0bd92f276 100644 } } -@@ -2672,6 +2678,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() { +@@ -2668,6 +2674,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() { } } @@ -1083,10 +1084,10 @@ index 5a764db307..c0bd92f276 100644 void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) { diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h -index 6958d974b4..42a5a1d32b 100644 +index 2d9afc9c05..bffbea8e17 100644 --- a/dom/base/nsGlobalWindowOuter.h +++ b/dom/base/nsGlobalWindowOuter.h -@@ -303,6 +303,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget, +@@ -304,6 +304,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget, // Outer windows only. MOZ_CAN_RUN_SCRIPT void DispatchDOMWindowCreated(); @@ -1095,10 +1096,10 @@ index 6958d974b4..42a5a1d32b 100644 // Outer windows only. virtual void EnsureSizeAndPositionUpToDate() override; diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp -index cee17c4e32..e887857a6f 100644 +index 827fd79930..1394a2586d 100644 --- a/dom/base/nsINode.cpp +++ b/dom/base/nsINode.cpp -@@ -1980,6 +1980,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions, +@@ -1982,6 +1982,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions, mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv); } @@ -1161,10 +1162,10 @@ index cee17c4e32..e887857a6f 100644 DOMQuad& aQuad, const GeometryNode& aFrom, const ConvertCoordinateOptions& aOptions, CallerType aCallerType, diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h -index 271c98870e..16c69324c8 100644 +index 0461bbf12d..0f53e62988 100644 --- a/dom/base/nsINode.h +++ b/dom/base/nsINode.h -@@ -3057,6 +3057,10 @@ class nsINode : public mozilla::dom::EventTarget { +@@ -3064,6 +3064,10 @@ class nsINode : public mozilla::dom::EventTarget { nsTArray>& aResult, ErrorResult& aRv); @@ -1204,7 +1205,7 @@ index 897b094dc2..81872eb2e9 100644 static bool DumpEnabled(); diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl -index 7b3dca8a55..51fbda3076 100644 +index 38fd39f066..0a492261db 100644 --- a/dom/chrome-webidl/BrowsingContext.webidl +++ b/dom/chrome-webidl/BrowsingContext.webidl @@ -72,6 +72,17 @@ enum PrefersReducedMotionOverride { @@ -1236,10 +1237,10 @@ index 7b3dca8a55..51fbda3076 100644 * A unique identifier for the browser element that is hosting this * BrowsingContext tree. Every BrowsingContext in the element's tree will diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp -index b572ae277f..e05252ca5a 100644 +index 89221d78c4..a35c5b6091 100644 --- a/dom/fetch/Fetch.cpp +++ b/dom/fetch/Fetch.cpp -@@ -722,6 +722,12 @@ already_AddRefed FetchRequest(nsIGlobalObject* aGlobal, +@@ -733,6 +733,12 @@ already_AddRefed FetchRequest(nsIGlobalObject* aGlobal, actor->SetOriginStack(std::move(stack)); } @@ -1253,7 +1254,7 @@ index b572ae277f..e05252ca5a 100644 return p.forget(); diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp -index 8012135056..1270558a0c 100644 +index 4ebdd3e5ff..015317937c 100644 --- a/dom/fetch/FetchService.cpp +++ b/dom/fetch/FetchService.cpp @@ -267,6 +267,14 @@ RefPtr FetchService::FetchInstance::Fetch() { @@ -1297,10 +1298,10 @@ index 51efcf97c0..328b7f4406 100644 CachedPositionAndAccuracy lastPosition = gs->GetCachedPosition(); if (lastPosition.position) { diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp -index c7f99855d5..7139f8f598 100644 +index f764524370..9c1aa67f23 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp -@@ -46,6 +46,7 @@ +@@ -47,6 +47,7 @@ #include "mozilla/dom/HTMLDataListElement.h" #include "mozilla/dom/HTMLOptionElement.h" #include "mozilla/dom/InputType.h" @@ -1308,7 +1309,7 @@ index c7f99855d5..7139f8f598 100644 #include "mozilla/dom/MouseEvent.h" #include "mozilla/dom/NumericInputTypes.h" #include "mozilla/dom/ProgressEvent.h" -@@ -924,6 +925,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) { +@@ -925,6 +926,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) { return NS_ERROR_FAILURE; } @@ -1354,10 +1355,10 @@ index 83313786eb..6f1b03076b 100644 * wheel. * diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp -index 36ec79dc9e..5867a82022 100644 +index ad297bb1d9..37795a6030 100644 --- a/dom/ipc/BrowserChild.cpp +++ b/dom/ipc/BrowserChild.cpp -@@ -1603,7 +1603,17 @@ mozilla::ipc::IPCResult BrowserChild::RecvRealMouseMoveEvent( +@@ -1590,7 +1590,17 @@ mozilla::ipc::IPCResult BrowserChild::RecvRealMouseMoveEvent( const uint64_t& aInputBlockId) { MOZ_ASSERT(!aMouseEvent.AsPointerEvent()); MOZ_ASSERT(!aMouseEvent.AsDragEvent()); @@ -1376,7 +1377,7 @@ index 36ec79dc9e..5867a82022 100644 CoalescedMouseData* data = mCoalescedMouseData.GetOrInsertNew(aMouseEvent.pointerId); MOZ_ASSERT(data); -@@ -1832,6 +1842,21 @@ void BrowserChild::HandleRealMouseButtonEvent( +@@ -1819,6 +1829,21 @@ void BrowserChild::HandleRealMouseButtonEvent( if (postLayerization) { postLayerization->Register(); } @@ -1399,13 +1400,13 @@ index 36ec79dc9e..5867a82022 100644 mozilla::ipc::IPCResult BrowserChild::RecvNormalPriorityRealMouseButtonEvent( diff --git a/dom/ipc/CoalescedMouseData.cpp b/dom/ipc/CoalescedMouseData.cpp -index a1a902e6db..54870890e2 100644 +index def5cdd696..fe00fb2618 100644 --- a/dom/ipc/CoalescedMouseData.cpp +++ b/dom/ipc/CoalescedMouseData.cpp -@@ -93,6 +93,9 @@ bool CoalescedMouseData::CanCoalesce(const WidgetMouseEvent& aMouseMoveEvent, - mCoalescedInputEvent->mButton != aMouseMoveEvent.mButton || +@@ -94,6 +94,9 @@ bool CoalescedMouseData::CanCoalesce(const WidgetMouseEvent& aMouseMoveEvent, mCoalescedInputEvent->mButtons != aMouseMoveEvent.mButtons || - mCoalescedInputEvent->mMovement != aMouseMoveEvent.mMovement || + mCoalescedInputEvent->mMovement.isSome() != + aMouseMoveEvent.mMovement.isSome() || + // `mJugglerEventId` is 0 for non-juggler events and a unique number for + // juggler-emitted events. + mCoalescedInputEvent->mJugglerEventId != aMouseMoveEvent.mJugglerEventId || @@ -1736,19 +1737,19 @@ index 584d39da5f..65eb701435 100644 * returned quads are further translated relative to the window * origin -- which is not the layout origin. Further translation diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index c419101584..a25ad800a0 100644 +index 4ea921ac8b..a736c1d37a 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -396,6 +396,8 @@ dictionary SynthesizeMouseEventData : SynthesizeEventData { - short inputSource = 1; - // Modifiers pressed, using constants defined as MODIFIER_* in nsIDOMWindowUtils. - long modifiers = 0; +@@ -400,6 +400,8 @@ dictionary SynthesizeMouseEventData : SynthesizeEventData { + // reports while the native pointer is locked. Must be specified together. + long movementX; + long movementY; + // Juggler event identifier for tracking events across processes. + unsigned long jugglerEventId = 0; }; // Mozilla-specific stuff -@@ -434,6 +436,8 @@ dictionary SynthesizeEventOptions { +@@ -438,6 +440,8 @@ dictionary SynthesizeEventOptions { // Set this to true to ensure that the event is dispatched to this DOM window // or one of its children. boolean toWindow = false; @@ -1758,7 +1759,7 @@ index c419101584..a25ad800a0 100644 boolean isDOMEventSynthesized = true; }; diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp -index 32e39162d3..e5f8828932 100644 +index d9b4a1e916..6fa5d3e343 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -1316,7 +1316,6 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) { @@ -1769,7 +1770,7 @@ index 32e39162d3..e5f8828932 100644 Navigator::GetAcceptLanguages(mNavigatorProperties.mLanguages, nullptr); mNavigatorPropertiesLoaded = true; } -@@ -2013,6 +2012,13 @@ void RuntimeService::UpdateTimezoneOverrideForWorkers( +@@ -2012,6 +2011,13 @@ void RuntimeService::UpdateTimezoneOverrideForWorkers( } } @@ -1783,7 +1784,7 @@ index 32e39162d3..e5f8828932 100644 template void RuntimeService::BroadcastAllWorkers(const Func& aFunc) { AssertIsOnMainThread(); -@@ -2603,6 +2609,14 @@ void UpdateTimezoneOverrideForWorkers(const nsPIDOMWindowInner& aWindow, +@@ -2602,6 +2608,14 @@ void UpdateTimezoneOverrideForWorkers(const nsPIDOMWindowInner& aWindow, } } @@ -1799,10 +1800,10 @@ index 32e39162d3..e5f8828932 100644 MOZ_ASSERT(!NS_IsMainThread()); MOZ_ASSERT(aCx); diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h -index 777352c728..f1d647afe8 100644 +index f4c9fc969b..576e9ffab3 100644 --- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h -@@ -123,6 +123,8 @@ class RuntimeService final : public nsIObserver { +@@ -124,6 +124,8 @@ class RuntimeService final : public nsIObserver { void UpdateTimezoneOverrideForWorkers(const nsPIDOMWindowInner& aWindow, const nsAString& aTimezone); @@ -1812,7 +1813,7 @@ index 777352c728..f1d647afe8 100644 MutexAutoLock lock(mMutex); return mNavigatorProperties; diff --git a/dom/workers/ScriptLoader.cpp b/dom/workers/ScriptLoader.cpp -index 8c88d73aa9..7058eb3253 100644 +index 62feea3137..09b2486cfc 100644 --- a/dom/workers/ScriptLoader.cpp +++ b/dom/workers/ScriptLoader.cpp @@ -1169,6 +1169,14 @@ bool WorkerScriptLoader::EvaluateScript(JSContext* aCx, @@ -1870,10 +1871,10 @@ index 79f09daf92..b921254ac2 100644 bool IsWorkerGlobal(JSObject* global); diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp -index f6619cf308..f8563ba6eb 100644 +index dc8cf21523..8ec2188c13 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp -@@ -769,6 +769,18 @@ class UpdateTimezoneOverrideRunnable final : public WorkerThreadRunnable { +@@ -749,6 +749,18 @@ class UpdateTimezoneOverrideRunnable final : public WorkerThreadRunnable { } }; @@ -1892,7 +1893,7 @@ index f6619cf308..f8563ba6eb 100644 class UpdateLanguagesRunnable final : public WorkerThreadRunnable { nsTArray mLanguages; -@@ -2436,6 +2448,16 @@ void WorkerPrivate::UpdateContextOptions( +@@ -2425,6 +2437,16 @@ void WorkerPrivate::UpdateContextOptions( } } @@ -1909,7 +1910,7 @@ index f6619cf308..f8563ba6eb 100644 void WorkerPrivate::UpdateLanguages(const nsTArray& aLanguages) { AssertIsOnParentThread(); -@@ -6414,6 +6436,15 @@ void WorkerPrivate::UpdateTimezoneOverrideInternal(JSContext* aCx, +@@ -6401,6 +6423,15 @@ void WorkerPrivate::UpdateTimezoneOverrideInternal(JSContext* aCx, } } @@ -1926,7 +1927,7 @@ index f6619cf308..f8563ba6eb 100644 const nsTArray& aLanguages) { WorkerGlobalScope* globalScope = GlobalScope(); diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h -index 95bfd6ddb2..b38f31f547 100644 +index ec35bf6331..4a2be53538 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -462,6 +462,8 @@ class WorkerPrivate final @@ -1938,7 +1939,7 @@ index 95bfd6ddb2..b38f31f547 100644 void UpdateLanguagesInternal(const nsTArray& aLanguages); void UpdateLanguageOverrideInternal( -@@ -1167,6 +1169,8 @@ class WorkerPrivate final +@@ -1168,6 +1170,8 @@ class WorkerPrivate final void UpdateTimezoneOverride(const nsAString& aTimezone); @@ -2000,10 +2001,10 @@ index c36ea65ae6..55c8db661d 100644 inline ClippedTime TimeClip(double time); diff --git a/js/src/debugger/Object.cpp b/js/src/debugger/Object.cpp -index 29e128ec72..270ee326e1 100644 +index e333baf71d..d051bffe24 100644 --- a/js/src/debugger/Object.cpp +++ b/js/src/debugger/Object.cpp -@@ -2623,7 +2623,11 @@ Maybe DebuggerObject::call(JSContext* cx, +@@ -2611,7 +2611,11 @@ Maybe DebuggerObject::call(JSContext* cx, invokeArgs[i].set(args2[i]); } @@ -2217,10 +2218,10 @@ index 2fb6b9c281..41b0c5be27 100644 void internalResyncICUDefaultTimeZone(); diff --git a/js/src/vm/Realm.cpp b/js/src/vm/Realm.cpp -index 298c3d67b3..5417e8b5d2 100644 +index 645c232a39..e2ede37c86 100644 --- a/js/src/vm/Realm.cpp +++ b/js/src/vm/Realm.cpp -@@ -579,22 +579,10 @@ void Realm::setLocaleOverride(const char* locale) { +@@ -590,22 +590,10 @@ void Realm::setLocaleOverride(const char* locale) { } js::DateTimeInfo* Realm::getDateTimeInfo() { @@ -2299,10 +2300,10 @@ index eaaf69687f..6f965a110d 100644 // No boxes to return return; diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp -index 8b1f69b523..38eb79887d 100644 +index c88f6f63f0..284a49113d 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp -@@ -11981,7 +11981,9 @@ bool PresShell::ComputeActiveness() const { +@@ -12022,7 +12022,9 @@ bool PresShell::ComputeActiveness() const { if (!browserChild->IsVisible()) { MOZ_LOG(gLog, LogLevel::Debug, (" > BrowserChild %p is not visible", browserChild)); @@ -2314,7 +2315,7 @@ index 8b1f69b523..38eb79887d 100644 // If the browser is visible but just due to be preserving layers diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp -index 0ef8c469da..056c0e2f7f 100644 +index 946515f847..1bd85b8c44 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -701,6 +701,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(const Document* aDocument) { @@ -2328,7 +2329,7 @@ index 0ef8c469da..056c0e2f7f 100644 // True if we allow zooming for all documents on this platform, or if we are // in RDM. BrowsingContext* bc = aDocument->GetBrowsingContext(); -@@ -9932,6 +9936,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont, +@@ -9938,6 +9942,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont, /* static */ bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) { @@ -2339,10 +2340,10 @@ index 0ef8c469da..056c0e2f7f 100644 return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane()); } diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h -index 574c2683ca..bc435e754f 100644 +index 70d8ab0a4d..40b4c2fa85 100644 --- a/layout/style/GeckoBindings.h +++ b/layout/style/GeckoBindings.h -@@ -606,6 +606,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*); +@@ -598,6 +598,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*); bool Gecko_MediaFeatures_PrefersReducedMotion(const mozilla::dom::Document*); bool Gecko_MediaFeatures_PrefersReducedTransparency( const mozilla::dom::Document*); @@ -2403,10 +2404,10 @@ index 1f9613b8cd..1fb108ea92 100644 return StylePrefersContrast::NoPreference; } diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp -index 18d89d2e1d..771e28b41b 100644 +index 9d64a00363..43798899d7 100644 --- a/netwerk/base/LoadInfo.cpp +++ b/netwerk/base/LoadInfo.cpp -@@ -2118,4 +2118,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() { +@@ -2141,4 +2141,16 @@ void LoadInfo::UpdateParentAddressSpaceInfo() { } } @@ -2424,10 +2425,10 @@ index 18d89d2e1d..771e28b41b 100644 + } // namespace mozilla::net diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h -index 9e48f631d8..71cb6d4cac 100644 +index a6a44ac715..1fbbf4dd73 100644 --- a/netwerk/base/LoadInfo.h +++ b/netwerk/base/LoadInfo.h -@@ -546,6 +546,8 @@ class LoadInfo final : public nsILoadInfo { +@@ -519,6 +519,8 @@ class LoadInfo final : public nsILoadInfo { dom::UserNavigationInvolvement::None; bool mSkipHTTPSUpgrade = false; @@ -2437,10 +2438,10 @@ index 9e48f631d8..71cb6d4cac 100644 // This is exposed solely for testing purposes and should not be used outside of // LoadInfo diff --git a/netwerk/base/TRRLoadInfo.cpp b/netwerk/base/TRRLoadInfo.cpp -index 9a4cf06487..574aceb570 100644 +index 0cba545500..d4d68b981a 100644 --- a/netwerk/base/TRRLoadInfo.cpp +++ b/netwerk/base/TRRLoadInfo.cpp -@@ -556,5 +556,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) { +@@ -571,5 +571,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -2457,10 +2458,10 @@ index 9a4cf06487..574aceb570 100644 } // namespace net } // namespace mozilla diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl -index 5529ed0ea4..89601e3015 100644 +index a3e7384515..86327e3e85 100644 --- a/netwerk/base/nsILoadInfo.idl +++ b/netwerk/base/nsILoadInfo.idl -@@ -1711,4 +1711,6 @@ interface nsILoadInfo : nsISupports +@@ -1748,4 +1748,6 @@ interface nsILoadInfo : nsISupports return static_cast(userNavigationInvolvement); } %} @@ -2489,10 +2490,10 @@ index 3654f3ed20..f685e7668a 100644 * Set the status and reason for the forthcoming synthesized response. * Multiple calls overwrite existing values. diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp -index d9783f7852..c99d1bb54c 100644 +index 2a62fcd56d..b36c8357e7 100644 --- a/netwerk/ipc/DocumentLoadListener.cpp +++ b/netwerk/ipc/DocumentLoadListener.cpp -@@ -206,6 +206,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext, +@@ -205,6 +205,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext, aLoadState->GetTextDirectiveUserActivation() || aLoadState->HasLoadFlags(nsIWebNavigation::LOAD_FLAGS_FROM_EXTERNAL)); loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh()); @@ -2574,10 +2575,10 @@ index ab440756a6..2ba8db7005 100644 * InterceptionTimeStamps is used to record the time stamps of the * interception. diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index bbbfbd55f1..9fe25a2b56 100644 +index 63df4c9dfa..7f800944e7 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -942,11 +942,9 @@ nsresult nsHttpChannel::OnBeforeConnect() { +@@ -949,11 +949,9 @@ nsresult nsHttpChannel::OnBeforeConnect() { // SecurityInfo.sys.mjs mLoadInfo->SetHstsStatus(isSecureURI); @@ -2590,7 +2591,7 @@ index bbbfbd55f1..9fe25a2b56 100644 BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) { return NS_ERROR_OFFLINE; } -@@ -1066,9 +1064,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade, +@@ -1073,9 +1071,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade, return aStatus; } @@ -2601,7 +2602,7 @@ index bbbfbd55f1..9fe25a2b56 100644 if (mURI->SchemeIs("https") || aShouldUpgrade || !LoadUseHTTPSSVC() || forceOffline) { -@@ -1541,15 +1537,14 @@ nsresult nsHttpChannel::ContinueConnect() { +@@ -1550,15 +1546,14 @@ nsresult nsHttpChannel::ContinueConnect() { "CORS preflight must have been finished by the time we " "do the rest of ContinueConnect"); @@ -2619,7 +2620,7 @@ index bbbfbd55f1..9fe25a2b56 100644 BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) { return NS_ERROR_OFFLINE; } -@@ -1591,7 +1586,7 @@ nsresult nsHttpChannel::ContinueConnect() { +@@ -1600,7 +1595,7 @@ nsresult nsHttpChannel::ContinueConnect() { } // We're about to hit the network. Don't if we're forced offline. @@ -2628,7 +2629,7 @@ index bbbfbd55f1..9fe25a2b56 100644 return NS_ERROR_OFFLINE; } -@@ -1699,12 +1694,9 @@ void nsHttpChannel::SpeculativeConnect() { +@@ -1708,12 +1703,9 @@ void nsHttpChannel::SpeculativeConnect() { // don't speculate if we are offline, when doing http upgrade (i.e. // websockets bootstrap), or if we can't do keep-alive (because then we // couldn't reuse the speculative connection anyhow). @@ -2642,7 +2643,7 @@ index bbbfbd55f1..9fe25a2b56 100644 return; } -@@ -5034,9 +5026,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) { +@@ -5055,9 +5047,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) { uint32_t cacheEntryOpenFlags; bool offline = gIOService->IsOffline(); @@ -2652,7 +2653,7 @@ index bbbfbd55f1..9fe25a2b56 100644 nsAutoCString cacheControlRequestHeader; (void)mRequestHead.GetHeader(nsHttp::Cache_Control, cacheControlRequestHeader); -@@ -5045,7 +5034,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) { +@@ -5066,7 +5055,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) { return NS_OK; } @@ -2661,7 +2662,7 @@ index bbbfbd55f1..9fe25a2b56 100644 if (offline || (mLoadFlags & INHIBIT_CACHING) || forceOffline) { if (BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass()) && !offline && !forceOffline) { -@@ -8524,6 +8513,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() { +@@ -8558,6 +8547,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() { } } @@ -2698,10 +2699,10 @@ index cb5da1a630..b826374a2d 100644 // end server host name. nsIHttpChannelInternal::ProxyDNSStrategy ComputeProxyDNSStrategy(); diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp -index 610c78f6f5..6787041317 100644 +index c1f021eb99..6ff7009332 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp -@@ -1450,6 +1450,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta( +@@ -1454,6 +1454,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta( void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) { NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); @@ -2769,18 +2770,16 @@ index 0000000000..040cbc972b + +#endif // API_LOCATION_H_ diff --git a/toolkit/components/browser/nsIWebBrowserChrome.idl b/toolkit/components/browser/nsIWebBrowserChrome.idl -index c5c10b0e20..9f36ca5334 100644 +index b46aa54b7b..85b87329aa 100644 --- a/toolkit/components/browser/nsIWebBrowserChrome.idl +++ b/toolkit/components/browser/nsIWebBrowserChrome.idl -@@ -94,7 +94,10 @@ interface nsIWebBrowserChrome : nsISupports - // ignored for Linux. - const unsigned long CHROME_SUPPRESS_ANIMATION = 1 << 24; +@@ -100,7 +100,8 @@ interface nsIWebBrowserChrome : nsISupports + // matching on a combination of ordinary window features. + const unsigned long CHROME_MEDIA_PIP = 1 << 25; -- // Two bits are free here. +- // One bit is free here. + // Whether this window has "width" or "height" defined in features + const unsigned long JUGGLER_WINDOW_EXPLICIT_SIZE = 1 << 26; -+ -+ // One bit is free here. const unsigned long CHROME_CENTER_SCREEN = 1 << 27; @@ -2860,10 +2859,10 @@ index ab90326cca..2d9b99658c 100644 } // namespace mozilla diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp -index 542d0c5590..ead00b7a14 100644 +index 9bce71689e..647e5450a9 100644 --- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp -@@ -377,7 +377,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) { +@@ -372,7 +372,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode) { nsCOMPtr windowEnumerator; nsCOMPtr mediator( do_GetService(NS_WINDOWMEDIATOR_CONTRACTID)); @@ -2888,7 +2887,7 @@ index efe8ff5541..e0157515de 100644 int32_t aMaxSelfProgress, int32_t aCurTotalProgress, diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp -index 15e5f4982d..01c1809611 100644 +index a104433891..8c5bb49a53 100644 --- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp +++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp @@ -1902,8 +1902,14 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent( @@ -2909,10 +2908,10 @@ index 15e5f4982d..01c1809611 100644 /** diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs -index 755d82f483..b5d98b5d41 100644 +index 164381ebc1..72e0443c5c 100644 --- a/toolkit/mozapps/update/UpdateService.sys.mjs +++ b/toolkit/mozapps/update/UpdateService.sys.mjs -@@ -4038,6 +4038,8 @@ export class UpdateService { +@@ -4061,6 +4061,8 @@ export class UpdateService { } get disabledForTesting() { @@ -2986,7 +2985,7 @@ index 524451a83e..a44b3c5da2 100644 // nsDocumentViewer::LoadComplete that doesn't do various things // that are not relevant here because this wasn't an actual diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp -index 601070dcca..35329182ea 100644 +index ccebdcc8fe..cede4e0ced 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -116,6 +116,8 @@ @@ -3352,7 +3351,7 @@ index 8484851f67..2804831ec7 100644 LayoutDeviceIntSize HeadlessCompositorWidget::GetClientSize() { diff --git a/widget/headless/HeadlessCompositorWidget.h b/widget/headless/HeadlessCompositorWidget.h -index f9454a79f3..68e7b94c3a 100644 +index 5505c26f1d..68e7eb1518 100644 --- a/widget/headless/HeadlessCompositorWidget.h +++ b/widget/headless/HeadlessCompositorWidget.h @@ -5,6 +5,7 @@ @@ -3360,13 +3359,13 @@ index f9454a79f3..68e7b94c3a 100644 #define widget_headless_HeadlessCompositorWidget_h +#include "mozilla/ReentrantMonitor.h" - #include "HeadlessWidget.h" #include "mozilla/widget/CompositorWidget.h" + #include "mozilla/widget/HeadlessWidget.h" -@@ -21,8 +22,11 @@ class HeadlessCompositorWidget final : public CompositorWidget, +@@ -21,8 +22,11 @@ class HeadlessCompositorWidget : public CompositorWidget, HeadlessWidget* aWindow); - void NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize); + void NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize) override; + void SetSnapshotListener(HeadlessWidget::SnapshotListener&& listener); // CompositorWidget Overrides @@ -3375,7 +3374,7 @@ index f9454a79f3..68e7b94c3a 100644 uintptr_t GetWidgetKey() override; -@@ -40,10 +44,18 @@ class HeadlessCompositorWidget final : public CompositorWidget, +@@ -40,10 +44,18 @@ class HeadlessCompositorWidget : public CompositorWidget, } private: @@ -3395,7 +3394,7 @@ index f9454a79f3..68e7b94c3a 100644 } // namespace widget diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp -index 0c28540ee6..23458a37b6 100644 +index e6c4d1ed2c..0979e7f0a4 100644 --- a/widget/headless/HeadlessWidget.cpp +++ b/widget/headless/HeadlessWidget.cpp @@ -113,6 +113,8 @@ void HeadlessWidget::Destroy() { @@ -3407,23 +3406,27 @@ index 0c28540ee6..23458a37b6 100644 nsIWidget::OnDestroy(); nsIWidget::Destroy(); -@@ -574,5 +576,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan( +@@ -567,5 +569,18 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan( return NS_OK; } +void HeadlessWidget::SetSnapshotListener(SnapshotListener&& listener) { -+ if (!mCompositorWidget) { ++ HeadlessCompositorWidget* compositorWidget = ++ mCompositorWidgetDelegate ++ ? mCompositorWidgetDelegate->AsHeadlessCompositorWidget() ++ : nullptr; ++ if (!compositorWidget) { + if (listener) + fprintf(stderr, "Trying to set SnapshotListener without compositor widget\n"); + return; + } -+ mCompositorWidget->SetSnapshotListener(std::move(listener)); ++ compositorWidget->SetSnapshotListener(std::move(listener)); +} + } // namespace widget } // namespace mozilla diff --git a/widget/headless/HeadlessWidget.h b/widget/headless/HeadlessWidget.h -index 05ae8d02e8..236d2991b7 100644 +index 1031bf358b..b9f4166887 100644 --- a/widget/headless/HeadlessWidget.h +++ b/widget/headless/HeadlessWidget.h @@ -127,6 +127,9 @@ class HeadlessWidget final : public nsIWidget { @@ -3437,7 +3440,7 @@ index 05ae8d02e8..236d2991b7 100644 ~HeadlessWidget(); bool mEnabled; diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h -index a2a73f583d..9220795976 100644 +index 2ecd780355..0f7ff0eb03 100644 --- a/widget/nsGUIEventIPC.h +++ b/widget/nsGUIEventIPC.h @@ -316,6 +316,7 @@ struct ParamTraits { diff --git a/browser/patches/process-title-environ-leak.patch b/browser/patches/process-title-environ-leak.patch new file mode 100644 index 00000000..75095e12 --- /dev/null +++ b/browser/patches/process-title-environ-leak.patch @@ -0,0 +1,18 @@ +diff --git a/ipc/chromium/src/base/set_process_title_linux.cc b/ipc/chromium/src/base/set_process_title_linux.cc +index 8fdf29e8e5..cef127ca60 100644 +--- a/ipc/chromium/src/base/set_process_title_linux.cc ++++ b/ipc/chromium/src/base/set_process_title_linux.cc +@@ -181,6 +181,13 @@ void setproctitle(const char* fmt, ...) { + environ_size += var_size_copied + 1 /* account for null */; + } + } ++ ++ // The copy above starts right after the title, inside the old argv space, ++ // and can overwrite the marker with an environment string's null. The ++ // kernel then shows the environment as part of the command line. ++ if (!buggy_kernel && size < argv_size) { ++ g_argv_end[-1] = '.'; ++ } + } + + // A version of this built into glibc would not need this function, since diff --git a/browser/patches/screen-spoofing.patch b/browser/patches/screen-spoofing.patch index 8fc3ab07..6e1c3112 100644 --- a/browser/patches/screen-spoofing.patch +++ b/browser/patches/screen-spoofing.patch @@ -112,10 +112,10 @@ index 0000000000..a36944f3c6 + +#endif // mozilla_dom_ScreenDimensionManager_h diff --git a/dom/base/moz.build b/dom/base/moz.build -index b0973412be..926cadf3dc 100644 +index 97ea29a739..6dbe3a775f 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -264,6 +264,7 @@ EXPORTS.mozilla.dom += [ +@@ -265,6 +265,7 @@ EXPORTS.mozilla.dom += [ "ResponsiveImageSelector.h", "RoverfoxStorageManager.h", "SameProcessMessageQueue.h", @@ -123,7 +123,7 @@ index b0973412be..926cadf3dc 100644 "ScreenLuminance.h", "ScreenOrientation.h", "Selection.h", -@@ -566,6 +567,9 @@ SOURCES += [ +@@ -567,6 +568,9 @@ SOURCES += [ # (includes RoverfoxStorageManager.h which can affect compilation units) SOURCES += ["NavigatorManager.cpp"] @@ -134,7 +134,7 @@ index b0973412be..926cadf3dc 100644 SOURCES += ["FontListManager.cpp"] diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index 1f133b6ed6..25f413db16 100644 +index 23381f7b3c..7c0dc63631 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -5,6 +5,7 @@ @@ -145,7 +145,7 @@ index 1f133b6ed6..25f413db16 100644 #include #include -@@ -7841,6 +7842,28 @@ void nsGlobalWindowInner::SetNavigatorUserAgent(const nsAString& ua, +@@ -7837,6 +7838,28 @@ void nsGlobalWindowInner::SetNavigatorUserAgent(const nsAString& ua, RoverfoxStorageManager::RemoveSetter("setNavigatorUserAgent"); } @@ -175,10 +175,10 @@ index 1f133b6ed6..25f413db16 100644 bool aGranted) { // Invalidate cached StorageAllowed field so that calls to GetLocalStorage diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h -index 9616144511..ff8c14d011 100644 +index ac500caabd..ce72137a32 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h -@@ -704,6 +704,11 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, +@@ -706,6 +706,11 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, mozilla::ErrorResult& aRv); void SetNavigatorUserAgent(const nsAString& ua, mozilla::ErrorResult& aRv); @@ -295,10 +295,10 @@ index 4b989dd48a..db1b834258 100644 nsDeviceContext* context = GetDeviceContext(); diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index bfb0332a1c..c4cb127e83 100644 +index e04cc674c7..8c739fc656 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -982,6 +982,18 @@ partial interface Window { +@@ -986,6 +986,18 @@ partial interface Window { undefined setNavigatorUserAgent(DOMString ua); }; @@ -332,7 +332,7 @@ index 91fd96a691..03adf5d674 100644 DEFINES["USE_NEON"] = True LOCAL_INCLUDES += ["/third_party/xsimd/include"] diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp -index 0a628c93d2..cf8de1839e 100644 +index f9fcb084a7..fc6c39473f 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -3,6 +3,7 @@ @@ -438,7 +438,7 @@ index 1587fcffd8..4b1952bc5d 100644 // rendered. int32_t depth = 24; diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp -index 93a9efd068..5a91649b05 100644 +index 6ce393b112..c48bac2b05 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -3209,25 +3209,19 @@ void nsRFPService::GetExemptedDomainsLowercase(nsCString& aExemptedDomains) { @@ -478,10 +478,10 @@ index 93a9efd068..5a91649b05 100644 NS_lround(float(spoofedHeightStart) / aScale * AppUnitsPerCSSPixel()); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h -index 73637fad0d..08f281dc17 100644 +index de2572944f..9a50fdfc2b 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h -@@ -603,8 +603,11 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { +@@ -600,8 +600,11 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { // Returns the value of privacy.resistFingerprinting.exemptedDomains pref static void GetExemptedDomainsLowercase(nsCString& aExemptedDomains); @@ -492,5 +492,5 @@ index 73637fad0d..08f281dc17 100644 + bool aIsFullscreen, + const nsAString& aPlatform); - static uint64_t GetSpoofedStorageLimit(); + static int64_t GetSpoofedStorageLimit(); diff --git a/browser/patches/sessionstore-popup-close-crash.patch b/browser/patches/sessionstore-popup-close-crash.patch index 9d5e557a..334e9f94 100644 --- a/browser/patches/sessionstore-popup-close-crash.patch +++ b/browser/patches/sessionstore-popup-close-crash.patch @@ -1,10 +1,10 @@ diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs -index 52fc803050..b43bcf0ecb 100644 +index 7dfe2a31ca..67aa9ee0c5 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs -@@ -4346,8 +4346,19 @@ class _SessionStore { - } - +@@ -4660,8 +4660,19 @@ class _SessionStore { + * Window reference + */ maybeDontRestoreTabs(aWindow) { + // Camoufox: a window.open() popup created with window features opens as a + // separate chrome window that SessionStore may never have registered (the diff --git a/browser/patches/webgl-spoofing.patch b/browser/patches/webgl-spoofing.patch index 0dffa502..94be0278 100644 --- a/browser/patches/webgl-spoofing.patch +++ b/browser/patches/webgl-spoofing.patch @@ -88,10 +88,10 @@ index 0000000000..06de6922f3 + +#endif // mozilla_dom_WebGLParamsManager_h diff --git a/dom/base/moz.build b/dom/base/moz.build -index ee5d0b9149..cb146517aa 100644 +index 3a49096025..8b48e3e554 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -587,6 +587,14 @@ EXPORTS.mozilla.dom += [ +@@ -593,6 +593,14 @@ EXPORTS.mozilla.dom += [ "SpeechVoicesManager.h", ] @@ -107,7 +107,7 @@ index ee5d0b9149..cb146517aa 100644 # CharacterDataBuffer.cpp if CONFIG["INTEL_ARCHITECTURE"]: diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index 3590b9f2b0..e1281931d5 100644 +index b9aee88610..5806442359 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -27,6 +27,7 @@ @@ -118,7 +118,7 @@ index 3590b9f2b0..e1281931d5 100644 #include "WindowDestroyedEvent.h" #include "WindowNamedPropertiesHandler.h" #include "js/ComparisonOperators.h" -@@ -7898,6 +7899,23 @@ void nsGlobalWindowInner::SetSpeechVoices(const nsAString& aVoices, +@@ -7908,6 +7909,23 @@ void nsGlobalWindowInner::SetSpeechVoices(const nsAString& aVoices, RoverfoxStorageManager::RemoveSetter("setSpeechVoices"); } @@ -143,10 +143,10 @@ index 3590b9f2b0..e1281931d5 100644 bool aGranted) { // Invalidate cached StorageAllowed field so that calls to GetLocalStorage diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h -index a9d8fb50ba..f3fbefbbfd 100644 +index 9344fe4f81..3864e6dcd6 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h -@@ -714,6 +714,10 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, +@@ -731,6 +731,10 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, // Per-context speech voices void SetSpeechVoices(const nsAString& aVoices, mozilla::ErrorResult& aRv); @@ -158,7 +158,7 @@ index a9d8fb50ba..f3fbefbbfd 100644 void Alert(nsIPrincipal& aSubjectPrincipal, mozilla::ErrorResult& aError); void Alert(const nsAString& aMessage, nsIPrincipal& aSubjectPrincipal, diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp -index 5aaa4279fd..03163036ee 100644 +index 443f494ca0..91587de649 100644 --- a/dom/canvas/ClientWebGLContext.cpp +++ b/dom/canvas/ClientWebGLContext.cpp @@ -3,6 +3,12 @@ @@ -180,15 +180,15 @@ index 5aaa4279fd..03163036ee 100644 +uint32_t ClientWebGLContext::GetUserContextId() const { + if (mCanvasElement) { -+ return RoverfoxStorageManager::UserContextId(mCanvasElement); ++ return dom::RoverfoxStorageManager::UserContextId(mCanvasElement); + } + if (mOffscreenCanvas) { + nsCOMPtr win = + do_QueryInterface(mOffscreenCanvas->GetParentObject()); + if (win) { -+ return RoverfoxStorageManager::UserContextId(win); ++ return dom::RoverfoxStorageManager::UserContextId(win); + } -+ if (WorkerPrivate* wp = GetCurrentThreadWorkerPrivate()) { ++ if (dom::WorkerPrivate* wp = dom::GetCurrentThreadWorkerPrivate()) { + return wp->GetOriginAttributes().mUserContextId; + } + } @@ -362,7 +362,7 @@ index 5aaa4279fd..03163036ee 100644 + // so RENDERER and the UNMASKED_* strings always name the same GPU. + const auto GetSpoofedRenderer = [&]() -> Maybe { + nsAutoString stored; -+ if (WebGLParamsManager::GetRenderer(GetUserContextId(), stored)) { ++ if (dom::WebGLParamsManager::GetRenderer(GetUserContextId(), stored)) { + return Some(std::string(NS_ConvertUTF16toUTF8(stored).get())); + } + if (auto value = MaskConfig::GetString("webGl:renderer")) { @@ -373,7 +373,7 @@ index 5aaa4279fd..03163036ee 100644 + + const auto GetSpoofedVendor = [&]() -> Maybe { + nsAutoString stored; -+ if (WebGLParamsManager::GetVendor(GetUserContextId(), stored)) { ++ if (dom::WebGLParamsManager::GetVendor(GetUserContextId(), stored)) { + return Some(std::string(NS_ConvertUTF16toUTF8(stored).get())); + } + if (auto value = MaskConfig::GetString("webGl:vendor")) { @@ -460,7 +460,7 @@ index 5aaa4279fd..03163036ee 100644 const auto& shaderPrecisions = *notLost->info.shaderPrecisions; const auto args = webgl::GetShaderPrecisionFormatArgs{shadertype, precisiontype}; -@@ -6392,6 +6581,17 @@ bool ClientWebGLContext::IsSupported(const WebGLExtensionID ext, +@@ -6390,6 +6579,17 @@ bool ClientWebGLContext::IsSupported(const WebGLExtensionID ext, return false; } @@ -478,7 +478,7 @@ index 5aaa4279fd..03163036ee 100644 const auto& limits = Limits(); return limits.supportedExtensions[ext]; } -@@ -6406,6 +6606,18 @@ void ClientWebGLContext::GetSupportedExtensions( +@@ -6404,6 +6604,18 @@ void ClientWebGLContext::GetSupportedExtensions( } auto& retarr = retval.SetValue(); @@ -498,7 +498,7 @@ index 5aaa4279fd..03163036ee 100644 if (!IsSupported(i, callerType)) continue; diff --git a/dom/canvas/ClientWebGLContext.h b/dom/canvas/ClientWebGLContext.h -index 6f73f55eef..902f9b3a0d 100644 +index c28f5d6f3d..c9b0ef1378 100644 --- a/dom/canvas/ClientWebGLContext.h +++ b/dom/canvas/ClientWebGLContext.h @@ -1089,6 +1089,9 @@ class ClientWebGLContext final : public nsICanvasRenderingContextInternal, @@ -527,10 +527,10 @@ index b5809a1fca..8d36d592b2 100644 "/js/xpconnect/wrappers", ] diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index c2c6eb41b8..6cf202d17a 100644 +index bee4c0bd19..a21f529eae 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -1006,6 +1006,18 @@ partial interface Window { +@@ -1021,6 +1021,18 @@ partial interface Window { undefined setScreenColorDepth(unsigned long depth); }; diff --git a/browser/patches/webrtc-ip-spoofing.patch b/browser/patches/webrtc-ip-spoofing.patch index fde68509..57729d16 100644 --- a/browser/patches/webrtc-ip-spoofing.patch +++ b/browser/patches/webrtc-ip-spoofing.patch @@ -171,10 +171,10 @@ index 0000000000..a134ba615a + +#endif // mozilla_dom_WebRTCIPManager_h diff --git a/dom/base/moz.build b/dom/base/moz.build -index cb146517aa..f2fa8a3543 100644 +index 72da1d5ab4..8b48e3e554 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build -@@ -302,10 +302,15 @@ EXPORTS.mozilla.dom += [ +@@ -303,10 +303,15 @@ EXPORTS.mozilla.dom += [ "VideoFrameProvider.h", "ViewportMetaData.h", "VisualViewport.h", @@ -191,19 +191,19 @@ index cb146517aa..f2fa8a3543 100644 # in unified builds (it includes RoverfoxStorageManager.h which can affect # alphabetically-later files like BarProps.cpp) diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp -index e1281931d5..f7006744e5 100644 +index 0e5ba4c899..5806442359 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp -@@ -331,6 +331,8 @@ +@@ -332,6 +332,8 @@ #include "xpcprivate.h" #include "xpcpublic.h" +#include "WebRTCIPManager.h" + - #ifdef NS_PRINTING - # include "nsIPrintSettings.h" + #ifdef MOZ_WEBSPEECH + # include "mozilla/dom/SpeechSynthesis.h" #endif -@@ -7789,6 +7791,18 @@ void nsGlobalWindowInner::SetTimezone(const nsAString& timezone, ErrorResult& aR +@@ -7785,6 +7787,18 @@ void nsGlobalWindowInner::SetTimezone(const nsAString& timezone, ErrorResult& aR RoverfoxStorageManager::RemoveSetter("setTimezone"); } @@ -223,10 +223,10 @@ index e1281931d5..f7006744e5 100644 MOZ_ASSERT(aSharedWorker); MOZ_ASSERT(!mSharedWorkers.Contains(aSharedWorker)); diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h -index f3fbefbbfd..2b581e729a 100644 +index fc1d7b4ee5..b18ebe1d54 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h -@@ -687,6 +687,10 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, +@@ -689,6 +689,10 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, void SetTimezone(const nsAString& timezone, mozilla::ErrorResult& aRv); @@ -238,7 +238,7 @@ index f3fbefbbfd..2b581e729a 100644 void ForgetSharedWorker(mozilla::dom::SharedWorker* aSharedWorker); diff --git a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp -index 0eefdc2645..7254ce8ca1 100644 +index 74ec5d7959..dc9641ec6f 100644 --- a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp +++ b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp @@ -100,6 +100,12 @@ @@ -379,7 +379,7 @@ index 0eefdc2645..7254ce8ca1 100644 RefPtr report = MakeRefPtr(window); report->Incorporate(*aReport); promise->MaybeResolve(std::move(report)); -@@ -3313,12 +3414,22 @@ const std::string& PeerConnectionImpl::GetName() { +@@ -3332,12 +3433,22 @@ const std::string& PeerConnectionImpl::GetName() { return mName; } @@ -403,7 +403,7 @@ index 0eefdc2645..7254ce8ca1 100644 if (mForceIceTcp && std::string::npos != candidate.find(" UDP ")) { CSFLogWarn(LOGTAG, "Blocking local UDP candidate: %s", candidate.c_str()); STAMP_TIMECARD(mTimeCard, "UDP Ice Candidate blocked"); -@@ -3381,10 +3492,415 @@ void PeerConnectionImpl::SendLocalIceCandidateToContent( +@@ -3400,10 +3511,415 @@ void PeerConnectionImpl::SendLocalIceCandidateToContent( uint16_t level, const std::string& mid, const std::string& candidate, const std::string& ufrag) { STAMP_TIMECARD(mTimeCard, "Send Ice Candidate to content"); @@ -822,7 +822,7 @@ index 0eefdc2645..7254ce8ca1 100644 } // Implements the steps to "change the selected candidate pair and state". -@@ -3514,6 +4030,47 @@ void PeerConnectionImpl::IceConnectionStateChange( +@@ -3534,6 +4050,47 @@ void PeerConnectionImpl::IceConnectionStateChange( // 12. If connectionIceConnectionStateChanged is true, fire an event // named iceconnectionstatechange at connection. if (connectionIceConnectionStateChanged) { @@ -870,7 +870,7 @@ index 0eefdc2645..7254ce8ca1 100644 pcObserver->OnStateChange(PCObserverStateType::IceConnectionState, rv); } -@@ -3678,6 +4235,25 @@ void PeerConnectionImpl::IceGatheringStateChange( +@@ -3698,6 +4255,25 @@ void PeerConnectionImpl::IceGatheringStateChange( return; } @@ -896,7 +896,7 @@ index 0eefdc2645..7254ce8ca1 100644 // Set transport.[[IceGathererState]] to gathering. // or // Set transport.[[IceGathererState]] to complete. -@@ -3790,11 +4366,27 @@ void PeerConnectionImpl::UpdateDefaultCandidate( +@@ -3810,11 +4386,27 @@ void PeerConnectionImpl::UpdateDefaultCandidate( const std::string& defaultRtcpAddr, uint16_t defaultRtcpPort, const std::string& transportId) { CSFLogDebug(LOGTAG, "%s", __FUNCTION__); @@ -926,7 +926,7 @@ index 0eefdc2645..7254ce8ca1 100644 transportId); } } -@@ -4578,8 +5170,10 @@ bool PeerConnectionImpl::GetPrefDefaultAddressOnly() const { +@@ -4595,8 +5187,10 @@ bool PeerConnectionImpl::GetPrefDefaultAddressOnly() const { uint64_t winId = mWindow->WindowID(); @@ -940,10 +940,10 @@ index 0eefdc2645..7254ce8ca1 100644 !MediaManager::Get()->IsActivelyCapturingOrHasAPermission(winId); return default_address_only; diff --git a/dom/media/webrtc/jsapi/PeerConnectionImpl.h b/dom/media/webrtc/jsapi/PeerConnectionImpl.h -index dfda4b5b9c..c7f2592edf 100644 +index ce785e2f4e..bf178757ce 100644 --- a/dom/media/webrtc/jsapi/PeerConnectionImpl.h +++ b/dom/media/webrtc/jsapi/PeerConnectionImpl.h -@@ -610,8 +610,21 @@ class PeerConnectionImpl final +@@ -616,8 +616,21 @@ class PeerConnectionImpl final RefPtr GetMediaPipelineForTrack( dom::MediaStreamTrack& aRecvTrack); @@ -966,7 +966,7 @@ index dfda4b5b9c..c7f2592edf 100644 void SendLocalIceCandidateToContent(uint16_t level, const std::string& mid, const std::string& candidate, const std::string& ufrag); -@@ -709,6 +722,24 @@ class PeerConnectionImpl final +@@ -715,6 +728,24 @@ class PeerConnectionImpl final unsigned int mDataChannelsClosed = 0; bool mForceIceTcp; @@ -1147,10 +1147,10 @@ index 0288b6fc29..1ec530940e 100644 addrs.AppendElement(addr); } diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl -index 6cf202d17a..6a5b50744d 100644 +index ad03fa0ef4..a21f529eae 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl -@@ -961,6 +961,17 @@ partial interface Window { +@@ -965,6 +965,17 @@ partial interface Window { undefined setTimezone(DOMString timezone); }; diff --git a/browser/patches/window-position-wm-placement.patch b/browser/patches/window-position-wm-placement.patch new file mode 100644 index 00000000..430ce5c0 --- /dev/null +++ b/browser/patches/window-position-wm-placement.patch @@ -0,0 +1,32 @@ +diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp +index ff293fde9f..54fec820cb 100644 +--- a/xpfe/appshell/AppWindow.cpp ++++ b/xpfe/appshell/AppWindow.cpp +@@ -2441,8 +2441,25 @@ void AppWindow::SizeShell() { + // on the resolution of the screen we're on. But positioning needs to + // know the size so that it can constrain to screen bounds.... as an + // initial guess here, we'll use the specified size (if any). +- bool positionSet = +- !mIgnoreXULPosition && LoadPositionFromXUL(specWidth, specHeight); ++ bool positionSet = !mIgnoreXULPosition; ++ ++#if defined(XP_UNIX) && !defined(XP_MACOSX) ++ // Camoufox: leave independent top-level windows where the window manager ++ // puts them, which is what Firefox did here until bug 2070008 (157). Nobody ++ // places an automation browser's window by hand, so honouring the persisted ++ // XUL position makes window.screenX/screenY a function of leftover profile ++ // state: the same identity reports one position from a throwaway profile and ++ // another from a persistent one, which correlates the two sessions. It also ++ // moves the browser rect that MouseDispatch.js measures (docs/input-dispatch.md). ++ // Dependent windows still get placed relative to their parent. ++ if (!parentWindow) { ++ positionSet = false; ++ } ++#endif ++ ++ if (positionSet) { ++ positionSet = LoadPositionFromXUL(specWidth, specHeight); ++ } + + if (gotSize) { + SetSpecifiedSize(specWidth, specHeight); diff --git a/browser/scripts/data/contentaccessible-manifest.json b/browser/scripts/data/contentaccessible-manifest.json index 05f1937f..d592887d 100644 --- a/browser/scripts/data/contentaccessible-manifest.json +++ b/browser/scripts/data/contentaccessible-manifest.json @@ -1,5 +1,5 @@ { - "firefox_version": "156.0.1", + "firefox_version": "158.0", "packages": { "browser/omni.ja|content|activity-stream": { "files": { @@ -10,6 +10,7 @@ "chrome/browser/content/activity-stream/data/content/assets/br-fxa-fox-mirror.svg": "ad7eba72e1587643d27c4ddcbb8f8164e295309467987ada8c98a1cfcec9a84f", "chrome/browser/content/activity-stream/data/content/assets/br-gratitude-fox-rock.svg": "2f0015679180282e1a3cf2dc6440a1188faebbd3079f154a8a9f8c3bdcd7a532", "chrome/browser/content/activity-stream/data/content/assets/br-import-fox-house.svg": "b3304772efa77ea2eed852b0eef6363135de5db011e246f441e6f353e589ba14", + "chrome/browser/content/activity-stream/data/content/assets/br-kit-with-heart.svg": "b625692ff1326a8daba097222ce515378fdef07ce31447f4bf3c8a17704cf408", "chrome/browser/content/activity-stream/data/content/assets/br-migration-fox-juggle.svg": "5eafcb49d3002e49bb43584d7bf04c2e47ec9125f7158d323376c3389305772a", "chrome/browser/content/activity-stream/data/content/assets/br-set-default-fox-heart.svg": "ab42afbc05727a4faddd914c05e30b1c186f1a61dbf2058441b5929cff72a886", "chrome/browser/content/activity-stream/data/content/assets/confetti.svg": "879fa6d38e8bfd1c820fb0545e7a0d3cc278f1bbd905955febb98b31f0283210", @@ -19,27 +20,20 @@ "chrome/browser/content/activity-stream/data/content/assets/fox-doodle-tail.png": "28c5322d74328dd1305c922550746607d0491af5db3ad4cbcb2f1ea899f4e7aa", "chrome/browser/content/activity-stream/data/content/assets/fox-doodle-waving-static.png": "e44462d4190a6f76084da95ef60e04043f3229d8b6383908b168e2038f8d551e", "chrome/browser/content/activity-stream/data/content/assets/fox-doodle-waving.gif": "81493c52095bb451c80c5cedc5299d4cbf5170d28aa1d914f86f73e24a58e483", - "chrome/browser/content/activity-stream/data/content/assets/glyph-webextension-16.svg": "fa948310edecfec51a80fcb3408f4024367c2620738a6b74d10559a7660f9581", "chrome/browser/content/activity-stream/data/content/assets/heart.webp": "c812fb332d8706aa27846428467d7a80cb18f55cd20d66b2657f991ee01d505b", "chrome/browser/content/activity-stream/data/content/assets/kit-sit-look-up.svg": "e34d5adac9d21766510a709f665c49be53732ffc0bc3bf68c1d2a476ee220ddd", "chrome/browser/content/activity-stream/data/content/assets/long-zap.svg": "e5681f7f73af9f4fff1ac14dde32a59afed2bbf83be733b1d7deabde7106e665", "chrome/browser/content/activity-stream/data/content/assets/mobile-download-qr-existing-user.svg": "037c34fb976e341bd7e9a9322cff13e0501dbf10addf99bf72925b78f7dccf87", - "chrome/browser/content/activity-stream/data/content/assets/mr-amo-collection.svg": "beb32e3e6f2df13f1d1eb915f7f4f6b968ddb416841f902781281ad63c30e565", - "chrome/browser/content/activity-stream/data/content/assets/mr-gratitude.svg": "c4ed9c72886bfbd1ae107a702a95d181eca6a86dde841455225bad13d0fd1084", - "chrome/browser/content/activity-stream/data/content/assets/mr-import.svg": "face0e802bffa25dd983c1dac4aeb31ea8203290901393b875559fa180b845da", "chrome/browser/content/activity-stream/data/content/assets/mr-kit-smart-window.svg": "3c9799bbf1a57cafe8e8dd3d05297cf0f8f527eb1156a4878f03b8d52bb59ffa", - "chrome/browser/content/activity-stream/data/content/assets/mr-pinprivate.svg": "fbca1f4a8e12d02b306aee350f79e2a172053fcaec029ddbd6f2373b1b863186", - "chrome/browser/content/activity-stream/data/content/assets/mr-pintaskbar.svg": "c0e979237b4be88d2bfa341c0398b74265c4a380b6b4d77b8867c401083d3083", - "chrome/browser/content/activity-stream/data/content/assets/mr-privacysegmentation.svg": "f4f16d112ace09a0b9b3e1f46a37a844b1994cb25b6f3072929bf331221b863c", "chrome/browser/content/activity-stream/data/content/assets/mr-rtamo-background-image.svg": "d10725dde1973b99271d950f177b0db89e91d8d1e45043d831340f02c96f5191", - "chrome/browser/content/activity-stream/data/content/assets/mr-settodefault.svg": "3a6be3ce8dcb18f29299376754d699402380b330a60feb1d2d59a8271fa97b7a", "chrome/browser/content/activity-stream/data/content/assets/noodle-C.svg": "fe34b5f198230efbe67ceef26b10f7d5be0ccb4569d7a11e5d49c86a2590392b", "chrome/browser/content/activity-stream/data/content/assets/noodle-outline-L.svg": "8df19271e8727a063423319b044ec29655104c54eb9b5f2970b2ba412a6b6692", "chrome/browser/content/activity-stream/data/content/assets/noodle-solid-L.svg": "bbf9cd6db035a63c8ce83fa704fd387bd8b1bf7563478e8d19098cf8835fe16d", - "chrome/browser/content/activity-stream/data/content/assets/nuo-taborientation.svg": "7bf7a1dcfcef94c9f95576a211850031b0c3a22608d5a01c3579397f93484397", "chrome/browser/content/activity-stream/data/content/assets/person-typing.svg": "1134e0c27d37c3c68e62d895be874d0dc7a80de4b6aa987010824b519ea052ad", + "chrome/browser/content/activity-stream/data/content/assets/pic-cursor.svg": "2c8e4a27b2c3652e33a1f3eff81f5d37d713ecaa2208bba1416e4dae88776cbb", + "chrome/browser/content/activity-stream/data/content/assets/pic-shield.svg": "591049657123df3ed0337daecb486dc8e2c553dff8ce6ec3dd07f49054fccdda", "chrome/browser/content/activity-stream/data/content/assets/short-zap.svg": "bd6a4253b642b35f944c777a9232c3f956c143d293595ac1006d191df9c65761", - "chrome/browser/content/activity-stream/data/content/assets/splash-logo.svg": "5bbbf74189fe3407c50e72e961071338318b2586a6a73644cdb4076199b691e6", + "chrome/browser/content/activity-stream/data/content/assets/splash-logo.svg": "c2a2a33df1170c0810934dcbf923aa460a3084c378459c660a65a56cc92ac950", "chrome/browser/content/activity-stream/data/content/assets/splash-screen.webm": "8a41e9a92dae1b43f426cfb4f1f0eebe4304f839958504e080ba17fc242d0da7", "chrome/browser/content/activity-stream/data/content/assets/tabs-side-zap-transparent.svg": "f98f1773bc22293ab08261a49b106a5b1bc3825ddd5f84c78ffbfde77ab7237f", "chrome/browser/content/activity-stream/data/content/assets/tabs-top-zap-transparent.svg": "49fd57dc66d43b2f35a34613c8d4b57602d1d6d0b86cb10b92283bb23e47f017", @@ -145,7 +139,7 @@ "chrome/browser/content/branding/aboutDialog.css": "a1f7358c45195ed3f5025340e813461fd38217ab964ea246d11e57006a74b987", "chrome/browser/content/branding/document.ico": "5ce27e88a72a861d0a3a08df57ecab52e70d369f3163d11e115afcee17907e87", "chrome/browser/content/branding/document_pdf.svg": "66aa248167ec8575e17c2689d5d59d3e27c403af01ee0f3410a71ba8d122a84a", - "chrome/browser/content/branding/firefox-wordmark.svg": "0433d540a5ec46ee2b69dec9a3ee1d31e1e210ecc53c7807ebb873068333e0eb", + "chrome/browser/content/branding/firefox-wordmark.svg": "50bd51b9596fdf9335047d56da549b86d1ee0a5f2a51ec1f197fb3da80716761", "chrome/browser/content/branding/icon128.png": "9926bbb47e152c9747c8e7fbe9d7679fbcf221a4aa13400cbf1d2da3210d1b20", "chrome/browser/content/branding/icon16.png": "742a5ed5a88075540a018629b6c4ee7f39a6fc89f4d75c2c136e002204ac024b", "chrome/browser/content/branding/icon32.png": "e4e889d71d93c2a171cbd92ca2fba2fca3a04ab61e6fc8a703683cf4e3d83ba1", @@ -160,14 +154,14 @@ "files": { "chrome/browser/content/browser/aboutDialog-appUpdater.js": "d815a048ab53f5605f073fc37ea383e1aa8bec5093bfba4e19ba4687bc1b05ba", "chrome/browser/content/browser/aboutDialog.css": "686fca8420ef50a4aaf2428b7685656995de9bbe779c60542d11d6c983b65a51", - "chrome/browser/content/browser/aboutDialog.js": "f6e74a8a525422334fe15e267493d26aa461952768bed9a7be8471b161cec56d", + "chrome/browser/content/browser/aboutDialog.js": "970af6c37923e78d0cae73743128ca5f1cb34a23ef031ff238021e0518045b82", "chrome/browser/content/browser/aboutDialog.xhtml": "70be6a3dfae77ec67b5211d3e0e500c6627cc6770d1d7f5e8ef6bf39c6ff4162", "chrome/browser/content/browser/aboutFrameCrashed.html": "6981d5251f7a9cb5a4212f9c7a2f198bebdf8c4d3f9ba0fc441b361b1c5ca399", "chrome/browser/content/browser/aboutPrivateBrowsing.css": "c16e178622c1ee293230d935bca84a68ef7748e3fe4b62b8e9645d5c3472368c", - "chrome/browser/content/browser/aboutPrivateBrowsing.html": "c784c514f06932f4e9ef274214fd06bb567da24c58673502b426e47860e6d556", - "chrome/browser/content/browser/aboutPrivateBrowsing.js": "4fd6c30c35116dacededde003aed015148b8cdd6f27e3bf3ce9932e308665d70", - "chrome/browser/content/browser/aboutRestartRequired.js": "0d459c37901c98c2d3a60ccd698d2a1aa372cebb93aac3767d81fceace25c4eb", - "chrome/browser/content/browser/aboutRestartRequired.xhtml": "033905ae00a4ac44c272dc4d1d3f723b2db90a03749d14934db4cc3e9381a43b", + "chrome/browser/content/browser/aboutPrivateBrowsing.html": "d60c77d9e1d23c03bd6e23292eeabb5f0736118637be04cc6365fb890708c4f0", + "chrome/browser/content/browser/aboutPrivateBrowsing.js": "42558d86fd1207e0da0870ee9244c9b792d92b130c43e1aef82c2b1f9533ea30", + "chrome/browser/content/browser/aboutRestartRequired.mjs": "ea26f30823bc1a51524ce6b93f049b0bba04ce0b6c36cb7f2ad401efd379cb73", + "chrome/browser/content/browser/aboutRestartRequired.xhtml": "271f756bd81b52866d18402491bf88368c1eb6f64502668e60664180745264c5", "chrome/browser/content/browser/aboutRobots-icon.png": "29f1fe2cb5181152d2c01c0b2f12e5d9bb3379a61b94fb96de0f734eb360da62", "chrome/browser/content/browser/aboutRobots.css": "02e712e8bd2102bbcb4da098cdeda13ad204fd8074f305f87391620721b97ac4", "chrome/browser/content/browser/aboutRobots.js": "a80b86d89d470a372b7718269280010038d568bbcc308f49c770a508840fe54b", @@ -208,10 +202,10 @@ "chrome/browser/content/browser/aboutlogins/components/login-item.css": "4790dee7d2c6f7a72b440601d898dd14bce39d0c89505ee0de340fe6c4fb98b9", "chrome/browser/content/browser/aboutlogins/components/login-item.mjs": "df24912fedf72b09baa7a007350a11233da2f5df977d2bb66a583e46be918937", "chrome/browser/content/browser/aboutlogins/components/login-list-item.mjs": "0a0b4736bfdebfb82c2e7c5ec3b9211517d7757bb744f5e291c80f9af5a1e4fd", - "chrome/browser/content/browser/aboutlogins/components/login-list-lit-item.css": "f2a450a1f93d5d146219f42f8efb37b482061ddd2223291329cfe73067d5c782", + "chrome/browser/content/browser/aboutlogins/components/login-list-lit-item.css": "8d096bfacb88a2b2a3a7ecca5f95c8ce2c0fa4fe1bdb829ecdbc951ef860477e", "chrome/browser/content/browser/aboutlogins/components/login-list-lit-item.mjs": "8de26cd666269353b440190dc8106c39faff26737bff8a84efa6d169127bd905", "chrome/browser/content/browser/aboutlogins/components/login-list-section.mjs": "46638fe1667df3e19594500dc84a035a9ecfa5ca2b747f4f13b9deafab8d057a", - "chrome/browser/content/browser/aboutlogins/components/login-list.css": "668d6b0f4094526599eeb2d723721b9d5e07efb2877211fc1a30ffbeeac5dbb7", + "chrome/browser/content/browser/aboutlogins/components/login-list.css": "45ebb4005d8d25d4ea3a4291494896a999592950d75eff2f7d38db474a76bda0", "chrome/browser/content/browser/aboutlogins/components/login-list.mjs": "2b3cac20a9f8c4c169bc142da050ef96405d08a33996c2271f48be123c9bf5c4", "chrome/browser/content/browser/aboutlogins/components/login-message-popup.css": "9e2170f65b0042a143d8a35480fc8ef9b091bd9740db36b909ac8172c8bd59e6", "chrome/browser/content/browser/aboutlogins/components/login-message-popup.mjs": "17b8cee157b0230ff9ffa81a4f2f04c2259a1889b14c10dc60b0e92f01c7f16d", @@ -222,20 +216,23 @@ "chrome/browser/content/browser/aboutlogins/components/remove-logins-dialog.css": "40b64fe8962cccc4b15cc947c4836a8b3a5ba2e75f41bada2da7955a9ca42472", "chrome/browser/content/browser/aboutlogins/components/remove-logins-dialog.mjs": "2dd00f78ca5c224a80cfdfa5127aa4ebf9c3d0ea61937884752b1a7215482599", "chrome/browser/content/browser/aboutlogins/icons/breached-website.svg": "aac8db241069b8246abe24ce20a86dce2ac77942e989a4c65010de4704d674e2", - "chrome/browser/content/browser/aboutlogins/icons/intro-illustration.svg": "bc80d723e1f1b0f43a33e44a7727e7c381914267583a4ec659f803e58ec0c38a", "chrome/browser/content/browser/aboutlogins/icons/vulnerable-password.svg": "872a490eadb5a3b2477a6dbd818c0fad32e006832f41a99b0c2f96a6db49e7bd", - "chrome/browser/content/browser/aboutwelcome/aboutwelcome.bundle.js": "18a22df7c0c04f91649fe658d1263910597d1b7a5770f844d28923d3498e35c8", - "chrome/browser/content/browser/aboutwelcome/aboutwelcome.css": "df3e4160e79b2542b0679436566e3b0a06afd247d49c07e7c0b625061123100e", + "chrome/browser/content/browser/aboutwelcome/aboutwelcome.bundle.js": "a6feba8e59f5f728c83e2920b977e6987529f7ae8749f0d814395e62148a1562", + "chrome/browser/content/browser/aboutwelcome/aboutwelcome.css": "b66ea5c9511fab6ba13b8f157e1e72a7f0f0c3b782689f823bcf75ec7f916856", "chrome/browser/content/browser/aboutwelcome/aboutwelcome.html": "8359daf62689ea5e31bc4d6721651a8a2034347259c35a49cc8a84d68af3fd02", "chrome/browser/content/browser/aiwindow/ai-window-content.css": "d97026b39394e9f6c03c6cc8922ee9ef6a72a973cf21db78198277ddbecfb6ac", "chrome/browser/content/browser/aiwindow/ai-window-overrides.css": "c93c67df4675827521da6ebc8bfdb36450e392167f47d46a4b2657e6794734e0", - "chrome/browser/content/browser/aiwindow/ai-window-shared.css": "318a909a5509dd2cd25fea06bf5b0735cda05f27534daebf2eb583bf2c09d912", + "chrome/browser/content/browser/aiwindow/ai-window-shared.css": "a16039f115a3dde58212fbc8e2a5914eab03173a8c87b753e38367c230a494d7", "chrome/browser/content/browser/aiwindow/aiChatContent.html": "f1f447b59476f84a72e61c57adcddd33b9248a87f39dfbceb2c73aceaf5f21ba", - "chrome/browser/content/browser/aiwindow/aiWindow.html": "2441569a21bb554a327456d8abe1aae8128a9aa2fac229393e4bd06ce801efc5", - "chrome/browser/content/browser/aiwindow/aitab/component_schema.json": "99f9c5c3f8ed2f9d0aa46900836540b26c4c012b38db427ee69bc36fb00b6e9f", + "chrome/browser/content/browser/aiwindow/aiWindow.html": "c363b53628d0eca77b5f781620e5197476ab1b83a111fa34f189e17c0aadbeff", + "chrome/browser/content/browser/aiwindow/aitab.html": "f60cf1f893727d13c046d0c23a6e1694d857c223d5c6d109011ed46e163c4e99", + "chrome/browser/content/browser/aiwindow/aitab/component_schema.json": "52394e3fc7e6c35f52bfb48955ceb1a7f0ab95b4dca4dc110d921e0dd90119c8", + "chrome/browser/content/browser/aiwindow/assets/agent-watch-empty.svg": "1ca34216917be5425dcab67cb232c45f7fabe5bf74a2d72b3d153c57652a1d68", "chrome/browser/content/browser/aiwindow/assets/agent-watch.svg": "fad9ceb44f1da972815738245959e906180aefb3f89269bc1a4b6c2624ed8a50", "chrome/browser/content/browser/aiwindow/assets/ai-chat-grid-loading.svg": "ee963996c020133f4f3de36feb1395bed4192a50a4625ae0f8039b52f53ca530", + "chrome/browser/content/browser/aiwindow/assets/applied-policy.svg": "26fee52101fa3d9b42914f64b9d4700c8d59d8129ec28bbee1e5f2af08a919ab", "chrome/browser/content/browser/aiwindow/assets/ask-icon.svg": "582065116b9d20f490b61d54bf679dfba4f5471af95f84b4f752119a25bf6c9a", + "chrome/browser/content/browser/aiwindow/assets/error-outline.svg": "9249f5d1d11aa8800dc598c924f301e023afb79338e7ade19f4f4687f743bb03", "chrome/browser/content/browser/aiwindow/assets/icon-grid-view.svg": "d1fc0e3014db7f52120d1fc22b0232b9804a5ca39e9da8ba11a526a87baecf30", "chrome/browser/content/browser/aiwindow/assets/icon-list-view.svg": "644d4e272988e2e1f0dcb75c17e8e69007a45ffb1287831ed5d7af4a0f51eb72", "chrome/browser/content/browser/aiwindow/assets/kit-meditating.svg": "4edb626c70c1aaef8221645e75a014cedccd3832e324bf6b3e0515cf668616c5", @@ -252,47 +249,62 @@ "chrome/browser/content/browser/aiwindow/assets/model-choice-qwen.svg": "ed0b5bfb3dfb3bebe6dc03c3e2dfb860215ffb6e655fa9c061644b7c952a59d8", "chrome/browser/content/browser/aiwindow/assets/new-chat.svg": "90c3adfd9fa9fb9829c0c15ad8800b8c9428bc4db60b6ec3ff819395af9c5f5c", "chrome/browser/content/browser/aiwindow/assets/set-default-onboarding.svg": "329a9263a114503f4248a49290dbbd5fa351a0704dbe120cc2010398a7ee6a6e", - "chrome/browser/content/browser/aiwindow/assets/sff-autofill-icon.svg": "ab87892b643d2ec407f89f32cea6e2edf0c53449d79c36a7195942cc0d31d72d", "chrome/browser/content/browser/aiwindow/assets/smart-window-promo-default.svg": "3b6a47256cae563d96e2a3daf191771e6376b9e1ec69c4a9d2fbce1ce76c94bd", "chrome/browser/content/browser/aiwindow/assets/smart-window.svg": "395771457101b45611c9dc98a4260014038ec154fbe4117b29e0335d4ac31ed5", "chrome/browser/content/browser/aiwindow/assets/stop-generation.svg": "16af7bc775134576fb2496b2e7168d430db6e76af3f7344222c2e88ac551f9f4", + "chrome/browser/content/browser/aiwindow/assets/warning.svg": "bbe4db757460c7c9e09d7ec826dba7e02a19f49bc72729064e0ef8dbe55e8280", "chrome/browser/content/browser/aiwindow/components/SmartwindowOverflowRow.mjs": "d6613f2c7b496b93852854a086022e26e7f2ad2e997e4ed3b14d09f9bcbec427", - "chrome/browser/content/browser/aiwindow/components/agent-monitor-item.css": "b8cb2ee08e3219ceaa5f9115d4c6bd8530273a68b2d0e6d18733e4341df47dd5", - "chrome/browser/content/browser/aiwindow/components/agent-monitor-item.mjs": "9716dde51e3aab0953b4a45af150d8226a93d6d7657464cb4a6b6f20a332995b", - "chrome/browser/content/browser/aiwindow/components/ai-action-confirmation.css": "b442571958c705acd6ee8d878e3bcc515781fe188a9dd019105f8100fe1efab8", + "chrome/browser/content/browser/aiwindow/components/agent-monitor-item.css": "26bde2e289df785dd65bf03b84a805815dc75fa6e427bbdd5837dbddf01228ab", + "chrome/browser/content/browser/aiwindow/components/agent-monitor-item.mjs": "67a75158ab09ceece619fa6ca2c72f8dce93e7116ceb53492039d1d76ea1135c", + "chrome/browser/content/browser/aiwindow/components/agent-monitor-panel.css": "961e9cc6fd944c11d6baa56a998f39648ebe3ae2e90b5ff0c55a0081f31f5d4a", + "chrome/browser/content/browser/aiwindow/components/agent-monitor-panel.mjs": "2c9c354bc8e46fa16a5d3b1624dea7feed8495ffe0d098ff3c581366062912df", + "chrome/browser/content/browser/aiwindow/components/ai-action-confirmation.css": "8df7d251216ef69de7b229e150e407e8d881b5757b1a151b4488ef1cf36aaf65", "chrome/browser/content/browser/aiwindow/components/ai-action-confirmation.mjs": "6befb84f051c14b208b5d97ef39859b778041f96dd6a0ceafa2c8edcdef02cda", - "chrome/browser/content/browser/aiwindow/components/ai-action-result.css": "253a7d23d4f05bcf3cdd8352f508ac2234a70b9cb7ac39b1c3960038510c2c96", + "chrome/browser/content/browser/aiwindow/components/ai-action-result.css": "5eed3b83f577dc3b32de7a8888f062a6c9b31d65ad03f24326cc4c2ed3416d32", "chrome/browser/content/browser/aiwindow/components/ai-action-result.mjs": "8e2c1285d3b688c9ef67127cdc4a140f54a287fe09c5bb17b481d4bf46777ac4", "chrome/browser/content/browser/aiwindow/components/ai-chat-card.css": "b9d81f8cbff4d6dd8942a8bceb023351579f8fed6f4653b4e6dc83aa4edc17fc", "chrome/browser/content/browser/aiwindow/components/ai-chat-card.mjs": "96525a9d17fd2225309621f5c0297eb83ea767e3e305f16a834fa4d64ad65ffb", - "chrome/browser/content/browser/aiwindow/components/ai-chat-content.css": "d794286743e900c878ba5cb1cc75b2ddf6b7f9b4582b3f355307c24b48d66dcf", - "chrome/browser/content/browser/aiwindow/components/ai-chat-content.mjs": "46eb0815cbb44db2f2d1141b6f507ab48435756e50a93b1e63c05e4c85c5cbe5", - "chrome/browser/content/browser/aiwindow/components/ai-chat-grid.css": "8f8442210eb7803c429a38ba49993979985c8bc3c9c05e956e6340dee3b27698", + "chrome/browser/content/browser/aiwindow/components/ai-chat-content.css": "be598a7ca7d1ca3ad2a9a096b46a4f65f84d0e064822e848ef78fc40336f2628", + "chrome/browser/content/browser/aiwindow/components/ai-chat-content.mjs": "377695859d3e937ba36f7b7ded97b6d822ffa3e08f60eee0afec391f1a5186b4", + "chrome/browser/content/browser/aiwindow/components/ai-chat-grid.css": "5820f67e61f8fd310db7d15b4c277039d679000be5c44e61ccd6413fe98913fd", "chrome/browser/content/browser/aiwindow/components/ai-chat-grid.mjs": "04236756365f43f40784e5ca8608d15dac9ccb57bcee500cb49dffc0f70d94b4", "chrome/browser/content/browser/aiwindow/components/ai-chat-message.css": "1e5a532ed1b9de4a17333acfcbf9fe1319d8a40e2d8b32a4106600af52bc8c36", - "chrome/browser/content/browser/aiwindow/components/ai-chat-message.mjs": "9375abb518ad06a08d373d018b2a07ee565a99c86233bc59af7c3f4af81dc506", + "chrome/browser/content/browser/aiwindow/components/ai-chat-message.mjs": "06215323534454c38b376bea17d473bd0d4a60d76607ab40f96354a944d0ddae", "chrome/browser/content/browser/aiwindow/components/ai-chat-table.css": "6024f98efec260db235f0e965898bd8b8010e5b25950ae568d1d908fb7a3f694", - "chrome/browser/content/browser/aiwindow/components/ai-chat-table.mjs": "de8f7fac3c9729a7e083996bcbd41f13327063c145dacab1b537a17f93e572ea", - "chrome/browser/content/browser/aiwindow/components/ai-grouped-chip-container.css": "0a4eff4fe3800aa7baee9ceaac1cbda3d1d665e5931c9a9589a1bcf2e5408a14", - "chrome/browser/content/browser/aiwindow/components/ai-grouped-chip-container.mjs": "d60318c86f4e9843d01fd5460dfbec971a791cbe2dc5b3060ec0a71818cc7e48", - "chrome/browser/content/browser/aiwindow/components/ai-sff-tab-selector.css": "653193d2039088c77cd99c808a0708fd10fc45ac00aba1cf87d30fecc5daff2e", - "chrome/browser/content/browser/aiwindow/components/ai-sff-tab-selector.mjs": "2470aaebbe85a25052c12ce03f3d3a3e0a4049dcd8b4b5c7e31acf1ae3d2c450", - "chrome/browser/content/browser/aiwindow/components/ai-tasks.css": "0292fe2e20b68a858daca5bdb2d9ea28200ec1b78924c3317e72855f4c4db740", - "chrome/browser/content/browser/aiwindow/components/ai-tasks.mjs": "9b776cf95c9f43b6a1eeda126e5ad5370091a7102d362e31b75994bab93f55e5", - "chrome/browser/content/browser/aiwindow/components/ai-website-chip.css": "cc6fbc94949325791702f9a34443c7a2578fec221a98eac12db75c50fe309d29", + "chrome/browser/content/browser/aiwindow/components/ai-chat-table.mjs": "7b8e55825ac459150ea0c281706b5beeffabb882423b0a7ef716c2d623272072", + "chrome/browser/content/browser/aiwindow/components/ai-grouped-chip-container.css": "007e048527678420b9ea5dedda9c0d13cc90a036aae937d505612bcb597c657f", + "chrome/browser/content/browser/aiwindow/components/ai-grouped-chip-container.mjs": "e30bc58d19d47b942ed2cb35d28bb1d634a99e3dbf248a4b098462d127a4ecb2", + "chrome/browser/content/browser/aiwindow/components/ai-sff-form-review.css": "9cd2b28045b9be24013ffa95c9254847387590f72b4d10024bdbd525e5a76d78", + "chrome/browser/content/browser/aiwindow/components/ai-sff-form-review.mjs": "51809b7df0c2125388ed255c4f9eff9ce15426d466a20f3140d27f4df5f94e12", + "chrome/browser/content/browser/aiwindow/components/ai-sff-tab-selector.css": "64c63557d903dfd43aa165f84e7ab2bbef2f8da98948e5e056e6564160bfc08e", + "chrome/browser/content/browser/aiwindow/components/ai-sff-tab-selector.mjs": "ce58f91ceab4d1c561d9ab71e769592c2cf5018ba65d645943fe7c2d74a3f25f", + "chrome/browser/content/browser/aiwindow/components/ai-tasks.css": "c4201dac4c2ee4752ac488d55f96aef069e251e2118cb6a1f5396a5ac9b2b9e4", + "chrome/browser/content/browser/aiwindow/components/ai-tasks.mjs": "2f0a2e1d54ec6479d520053961166f7636f0b045fa8cb0b6a4a13d0b63814e1d", + "chrome/browser/content/browser/aiwindow/components/ai-website-chip.css": "48143d9fe29c21f01bc236f01830d3c7881b0dd0453dc1df3bd2f173a595fe4a", "chrome/browser/content/browser/aiwindow/components/ai-website-chip.mjs": "9f654ae9a5fea28b281e9e9b5b9c18df77ae5294f892f4f666eff8f20adfd4c4", - "chrome/browser/content/browser/aiwindow/components/ai-website-confirmation.css": "7e3bf4b26e5679c43350caca262aee0a4c681f69f74430a4bda43753bef8c7a6", + "chrome/browser/content/browser/aiwindow/components/ai-website-confirmation.css": "51fab9717b279da3b41a85dc964683738948b86beddc2fe6f18a1b5e1a7bebdf", "chrome/browser/content/browser/aiwindow/components/ai-website-confirmation.mjs": "8664d5da0e2e26a1c3f82e207bb1897bddfb7c58754015dfe810d15343e84805", - "chrome/browser/content/browser/aiwindow/components/ai-website-select.css": "e8c749e452d3612d00de2537e3c40bdb4d24625dce9d16eb61d7fe21ca1953c9", + "chrome/browser/content/browser/aiwindow/components/ai-website-select.css": "42f3fbbbbaac715977237d371b1d15f47905115f75cf15887e978c6fe63ec6cd", "chrome/browser/content/browser/aiwindow/components/ai-website-select.mjs": "b41b1751ca6dbd1332f8312f44ddb01d0b6a8e7f5d184bdad36823bcf6339621", - "chrome/browser/content/browser/aiwindow/components/ai-window.css": "ad667ed60b47fa914d61bcb638531d716888af0e97ef542ba337cb92d7d514bb", - "chrome/browser/content/browser/aiwindow/components/ai-window.mjs": "94404bb8673280996013c69b6f22798e3275aa53a3e8be0cac6cd97cb5d72560", - "chrome/browser/content/browser/aiwindow/components/applied-memories-button.css": "7fa8a99a09d33dc230918eeac6599f91bef2d1f386b9e5d4e1c844000878089c", + "chrome/browser/content/browser/aiwindow/components/ai-window.css": "f679f960ae25f81ceef05faf1544ae414548e888892e453317f823a3781e8f65", + "chrome/browser/content/browser/aiwindow/components/ai-window.mjs": "c6a89cdf044fbbf8dc9cd559a0864c5ad6ddf648f46bc1704a21c24e480734a8", + "chrome/browser/content/browser/aiwindow/components/aitab-base.css": "fa2be8ca88ff129f9d5afd68f3def880b4e1535395b9dc1efbe342d59897dd3e", + "chrome/browser/content/browser/aiwindow/components/aitab-header.css": "0942737d0ed4cda48b52bcac009dc36872cbfeeac4021c13306fcae42db4d839", + "chrome/browser/content/browser/aiwindow/components/aitab-header.mjs": "ff937769b86af84a2e7f0741d904cb21ae6ac5f23b0cf93a2ca999b7a786a050", + "chrome/browser/content/browser/aiwindow/components/aitab-list.css": "c7b22cdb929dcd5bb112cc360dbd0524e58abccd78f6fe7cf42a22bb466ca23c", + "chrome/browser/content/browser/aiwindow/components/aitab-list.mjs": "e16ebf1281605778ed5d07e580f787474f1729aefa3136cebea34b0d9c732f87", + "chrome/browser/content/browser/aiwindow/components/aitab-page-actions.css": "f679cbecd441ca4e5bf6bbc56960da16470923e42773e882ae403710cc5d9b19", + "chrome/browser/content/browser/aiwindow/components/aitab-page-actions.mjs": "4cce56ad59eb904f5d71da52c9b5196595ea917b173b157131c40858b534bd72", + "chrome/browser/content/browser/aiwindow/components/aitab-page.css": "24bc9cd4d8d8896c106c5b710337bcab543be0e0dc849a97526b87a26c3a23df", + "chrome/browser/content/browser/aiwindow/components/aitab-page.mjs": "051873272b8cf558337a26ecbd39590258e6714395c112af0c651dbddbfa7426", + "chrome/browser/content/browser/aiwindow/components/aitab-timeline.css": "69ad65476abbd0c711884ad9509813aa97c79c1cce44c3185707a3582284f6ae", + "chrome/browser/content/browser/aiwindow/components/aitab-timeline.mjs": "feba72c77bce46a0bf3d98bd471e157c8366a51971e92baf6706aac8bdc0983c", + "chrome/browser/content/browser/aiwindow/components/applied-memories-button.css": "82219c8f59844656a83ffec09bf25c838b1b3288f995c3481daab89c491cde6c", "chrome/browser/content/browser/aiwindow/components/applied-memories-button.mjs": "b91ca46c5cb681d981712fd7471d9f901fdec5b304cd891113f52518b5dbef90", "chrome/browser/content/browser/aiwindow/components/assistant-message-footer.css": "638016ea4b1f123b7e6f2b1d9bb3fb750b34c8c57b95b56619072a637dd5ba19", "chrome/browser/content/browser/aiwindow/components/assistant-message-footer.mjs": "89769bbd39f617be3f8148ada0f2bebbbb7af22d9fff9893f288f5a36dcbcd09", "chrome/browser/content/browser/aiwindow/components/chat-assistant-citations.css": "b1b8fb0f39c2584b7e638df6c497c610b68fb50d88ecf2d01feaf9569829ce9b", - "chrome/browser/content/browser/aiwindow/components/chat-assistant-citations.mjs": "0b526208db5f8ee0c5da473c78190ce7e48e4166eba10d1f01e3e10e43069655", + "chrome/browser/content/browser/aiwindow/components/chat-assistant-citations.mjs": "905d1b62d731daac48548f3bd88c436c5b0af8c480b0c0e669b218dd8ca3c23f", "chrome/browser/content/browser/aiwindow/components/chat-assistant-error.css": "4c5ae61d621e25a6d475e2fab25e7d24b70fe518ed82d82ee798dbca8162d269", "chrome/browser/content/browser/aiwindow/components/chat-assistant-error.mjs": "9eaed29c8d1f5ef84cd60474131a059fd70278804c1d207f2b806f18908309d3", "chrome/browser/content/browser/aiwindow/components/chat-assistant-loader.css": "2a9ea02a82f67b6aeee63fdef21ec98159f8bb84efc1b7dcbe259b9a1bc8cf6c", @@ -307,24 +319,30 @@ "chrome/browser/content/browser/aiwindow/components/kit-mention.mjs": "7ca38a44cebe3dd5989637124a808bcc75a41fead2a6f2fa619fd35b0c79f420", "chrome/browser/content/browser/aiwindow/components/memories-icon-button.css": "e33478125baa71673712a842297cb28497c31d829fe239094c354e916f062fe2", "chrome/browser/content/browser/aiwindow/components/memories-icon-button.mjs": "233edf15a4dcc4310c86f09edf50773124c7837cd9cf27ad54d2a818e4334544", + "chrome/browser/content/browser/aiwindow/components/monitor-error-copy.mjs": "b69dd43ede0e101103aec4c4fccff5c495f5f779d38523a6a7d9e47babb82a5f", "chrome/browser/content/browser/aiwindow/components/monitor-icon.mjs": "88011aeaf97378031f9355945ab92699f212ed8096646e3a18611d0a754a5b63", - "chrome/browser/content/browser/aiwindow/components/monitors-display.css": "b80ccf8b30367e0885e21cff15acd8c11f69a28ccf294a5b5e51c6df04a6f653", - "chrome/browser/content/browser/aiwindow/components/monitors-display.mjs": "468b5702cfe85f7c65bdf8608a793051252811757912e7baa1624b1dc5685ef4", + "chrome/browser/content/browser/aiwindow/components/monitor-status-chip.mjs": "5bb1fcdb0837a979a0ec5c127c5d43fb6619e3a1cdb48dc8bd7aa87edc8cad34", + "chrome/browser/content/browser/aiwindow/components/monitors-display.css": "aad6000489c449ba22ad0b3f4a2e5013761fc16e914eaf9da67fa413072b8c92", + "chrome/browser/content/browser/aiwindow/components/monitors-display.mjs": "45d89e27a63c765ab705a5d80bec3d5502d1ade195b1210b410a984c2bca7367", "chrome/browser/content/browser/aiwindow/components/smartwindow-footer.css": "12f20837157efc7237c9e2e1c65674f8205f50b31cbd8cf7c5961bccee1dee3c", "chrome/browser/content/browser/aiwindow/components/smartwindow-footer.mjs": "e569cfc4284683686f8dc7a434a37900f4f6f7c5219ef240306c5069d989d7ba", - "chrome/browser/content/browser/aiwindow/components/smartwindow-group-tabs.mjs": "3f0c3292c7e5fef4d47f41eba0fd5c604da96603cbc551481bfb408b39b2796c", + "chrome/browser/content/browser/aiwindow/components/smartwindow-group-tabs.mjs": "bc3442fb9f5ecfc6a22babce54d631d31dda5657c2d053291a16a4625ff7c04e", "chrome/browser/content/browser/aiwindow/components/smartwindow-heading.css": "a149f393aa51feef2f8dab88aa84fa174a65582dcfee02e2c438c8a22e51cd3a", "chrome/browser/content/browser/aiwindow/components/smartwindow-heading.mjs": "a1715fb8efff718bfc2367319f6aa5783d1164fc0a75b024331355499ea106e1", - "chrome/browser/content/browser/aiwindow/components/smartwindow-history-menu.css": "12f7f8157bdd0bfc1d1fdb7c315f85f20a0b4f1b9bad95733208cbfb103d0fad", + "chrome/browser/content/browser/aiwindow/components/smartwindow-history-menu.css": "cbe7d5baeca29b60c05f4316fe4dc1173a82499b2df51af0f20fae380d48e02a", "chrome/browser/content/browser/aiwindow/components/smartwindow-history-menu.mjs": "710ab10fca989df5f8c34d46e805aec88bac9d0fa9498097784105f5bd77fdd6", "chrome/browser/content/browser/aiwindow/components/smartwindow-overflow-row.css": "fa1cac749ca229e9f1e792b753198d19f399eac9655e8efafd8447cc41ab5cce", - "chrome/browser/content/browser/aiwindow/components/smartwindow-panel-list.css": "c1a772f09e87a512adca62b0f4acd8ca57d48f9f86a2941646b607dfc75ff192", + "chrome/browser/content/browser/aiwindow/components/smartwindow-panel-list.css": "8235e922f18c7a2781654bdd3f2f303037727501d22dcdb772c7e9aacd09852a", "chrome/browser/content/browser/aiwindow/components/smartwindow-panel-list.mjs": "75a9c9242ab6621bece5e24cbd8d3a76ab45d6a41a76b44639a3bacfa7a24bc9", "chrome/browser/content/browser/aiwindow/components/smartwindow-promo.css": "9a720e773971c8d2bb5f585104d6dfffc39c9a08f8ccc9c1bafe32e86b32295c", "chrome/browser/content/browser/aiwindow/components/smartwindow-promo.mjs": "4668b159d4c36b7ec0c710a1431469d5042fc12f4f895a7cc53b3cf097f6f99b", - "chrome/browser/content/browser/aiwindow/components/smartwindow-prompts.css": "a472fbef843d99685749539fdca3957c7c7240b13925697a3e5afb1317c4d6b7", - "chrome/browser/content/browser/aiwindow/components/smartwindow-prompts.mjs": "4823be9e438f762779b5d2808debe20701df2f85e8ab4f8a56bde20bc6df0309", - "chrome/browser/content/browser/aiwindow/components/smartwindow-smartbar-glow.css": "c71cd62c8c66c6f651976bae841eb426762609754e88cba7a1a5bc743c199ead", + "chrome/browser/content/browser/aiwindow/components/smartwindow-prompts.css": "27407938423de53f1e51959140e6120fd6c251e7e2d5e6d22e0e43b99e7fb30a", + "chrome/browser/content/browser/aiwindow/components/smartwindow-prompts.mjs": "863d5327d3ef9aaa82866ec52883d96c101d232268245f89774181c525386a8e", + "chrome/browser/content/browser/aiwindow/components/smartwindow-resume-card.css": "4245ca97c3217b88239e61d0290b4d4cad62284843ff6a07bb8a78740e90ba53", + "chrome/browser/content/browser/aiwindow/components/smartwindow-resume-card.mjs": "eb152ebe74b1d45c37ce0b1c972f82824bc1e1b58c6753886e2c85a12804e4e6", + "chrome/browser/content/browser/aiwindow/components/smartwindow-resume-section.css": "32ca49c4bcee996d88ced3e605ebe4468b4cfac8e68dba66f937f2ee60e8ddee", + "chrome/browser/content/browser/aiwindow/components/smartwindow-resume-section.mjs": "11c953eb6cf41fceb6216669af8757b7c374387a20b91328112e6d244f17be61", + "chrome/browser/content/browser/aiwindow/components/smartwindow-smartbar-glow.css": "dc625de3758f98a67e76c1eaef48e22fc3db62325f492011e3b2b51406b9893d", "chrome/browser/content/browser/aiwindow/components/smartwindow-smartbar-glow.mjs": "852f47e4461ccdc6eb155f58e663b20c7634517e21b4b7b8da19ed4107f51a47", "chrome/browser/content/browser/aiwindow/components/smartwindow-topsites.css": "b204ba866c37835625a45a22566630d7f77d477b0b2028f768222226925a2f30", "chrome/browser/content/browser/aiwindow/components/smartwindow-topsites.mjs": "6ec0cb01b00e7e97fb0058547f26274a5106b9febd96e1e5f3e6f3cffeb53034", @@ -333,15 +351,21 @@ "chrome/browser/content/browser/aiwindow/firstrun.css": "3cba60d26ec651de5b75104317c15e26c719123019cd6fa12d25651b1742ebba", "chrome/browser/content/browser/aiwindow/firstrun.html": "b39afadb6448c17b7bb58a98749397bcf81d58396e4d7cdbb7692207c25dc64e", "chrome/browser/content/browser/aiwindow/firstrun.js": "8b0a685696a84a83b4019d2b836c7f9ef6010f1c7a320372eef59952cea4c0f4", - "chrome/browser/content/browser/aiwindow/modules/ChatMarkdownParser.mjs": "83505d73d1386f103dfa197d1221d30dd79832d37dfe3086138c5cf23578682b", + "chrome/browser/content/browser/aiwindow/modules/AgentCommands.mjs": "8c1ca0ac82d1eff1a0e307d55a4ba3b15f5bedaf3649c9f277b3eb85624449d6", + "chrome/browser/content/browser/aiwindow/modules/ChatMarkdownParser.mjs": "385ec1a43191243bef4d44e7a9ee8ec36962ec2369320568ab3a73eddee895ca", "chrome/browser/content/browser/aiwindow/modules/ClientErrorTelemetry.mjs": "332b2d9fa23f2b00ef796a7c19f0301529bfbb3e18dd786b8ff37c2dd192fd69", - "chrome/browser/content/browser/aiwindow/modules/SmartFormFillConstants.mjs": "b812f411ade2a188bd867bee372cb5b597610a6f6849b850e884e84300e4c8e7", + "chrome/browser/content/browser/aiwindow/modules/SmartFormFillConstants.mjs": "fb06c392a4e9bd68c97dc14373cb1c809e319ee74e38206571cef67b44478eca", + "chrome/browser/content/browser/aiwindow/smartformfill-form-review-content.css": "9b8aaf90e585d18db86be7c9722bc25f2b03df27c940916a0ceee5edb9e2d42f", + "chrome/browser/content/browser/aiwindow/smartformfill-form-review-content.html": "497358eddc57c9123bb9d7730e16ca8f8b8cff913272ac4719dba5fde37d1166", + "chrome/browser/content/browser/aiwindow/smartformfill-form-review.css": "aba31b2b293c2450b376c7d38ef91ca35eb36aea83404d990961a8d1324d51fd", + "chrome/browser/content/browser/aiwindow/smartformfill-form-review.html": "4ed00c1bf11deab46bc36774783581e49c364e1b167de58418bc5e90365d8198", + "chrome/browser/content/browser/aiwindow/smartformfill-form-review.mjs": "d71a5f713df6feda6c32fe64b311b7612f90709abe7ca4808f72e17a9353642b", "chrome/browser/content/browser/aiwindow/smartformfill-tab-select.css": "9c5ee1d6bd1573949965e15b28ac48fbb54d2d8fb635b929075caa2bb44ebf39", "chrome/browser/content/browser/aiwindow/smartformfill-tab-select.html": "e272b8b37bfd5faf881383510b45608d7954bfafe949bd68076aee6538ce4c9a", "chrome/browser/content/browser/aiwindow/smartformfill-tab-select.mjs": "3291f4c038e7440e0263769fa86dde4e0e2e97575ea3dc2b7430aeea7df4c163", "chrome/browser/content/browser/aiwindow/smartwindow-init.mjs": "8c41ee59cd1f16ac48868107ff32c1fb83b4d7e8a45cd4b197fb8c5ab7644345", - "chrome/browser/content/browser/aiwindow/tasks.html": "1fa60776bd3d2ed251191a48f6421d97c8add2e85b0c5ae4671d432db5bce11d", - "chrome/browser/content/browser/asrouter/asrouter-admin.bundle.js": "796899cbb04ea2469543e39b72fff291d644e8d8d30f8ea145a3989c25e97d46", + "chrome/browser/content/browser/aiwindow/tasks.html": "9c5d9612efdacb7602c29e3099f67662694527ee6339fa17f58d5889bb5db065", + "chrome/browser/content/browser/asrouter/asrouter-admin.bundle.js": "d84dc8a775ffee551e32e237d1d1c3e7304ac84a08fb40a79297a2cd800bd41a", "chrome/browser/content/browser/asrouter/asrouter-admin.html": "ce9e5ab5a5ea5a2b33764e03720b840808c0c60590e7242fd296f504b53ddf7e", "chrome/browser/content/browser/asrouter/assets/arrow-down-tiny.svg": "5ef4fdcc822836c8621561558305e27de0717ce87f544700f5abe7489ccfe35b", "chrome/browser/content/browser/asrouter/assets/checkmark-16.svg": "b2e27a66356ae082d69af93fedac4839fc2b348188958397783287e9e7770b15", @@ -355,7 +379,6 @@ "chrome/browser/content/browser/asrouter/assets/fox-with-locked-box.svg": "ff47c159823b23272577f06b37aff95cd0fd05f32473d7411f6245548ae7fc67", "chrome/browser/content/browser/asrouter/assets/fox-with-mobile.svg": "ecda95f4e0464d66681c5a29b0fce612b9d7405d4c8ddc2488ddb31d8293cd96", "chrome/browser/content/browser/asrouter/assets/fox-with-profiles.svg": "e2cfe2eb8464743ae86058cb6a6d2150c9aa2666e63033c75a9dd2811bf99091", - "chrome/browser/content/browser/asrouter/assets/glyph-cfr-feature-16.svg": "01e4f95215a897a2e4c64be301acc6da4ae0381b443b497a6033fc0d032146d4", "chrome/browser/content/browser/asrouter/assets/glyph-mail-mask-16.svg": "0fa45e589a39327f9bac71e3b4e088511397c104cdc68b91b6cbf9b45bcdfc02", "chrome/browser/content/browser/asrouter/assets/hero-relay-email-masks.svg": "e17d70a85b5f0da6a77e17794d89edbd9863bd971951958c336838ad2ff5fde9", "chrome/browser/content/browser/asrouter/assets/kit-checkmark-flipped.svg": "2f38e2ada50bf9e579728b0a529911c089551893d451d78de522193fadf3f4a5", @@ -376,10 +399,10 @@ "chrome/browser/content/browser/asrouter/components/ASRouterAdmin/ASRouterAdmin.css": "485a6828863f02e9426908c08830d0e238c9d2cb87536507c872693306cddc29", "chrome/browser/content/browser/asrouter/components/menu-message.css": "bf669161cfd0df1fdb6aadc77ae32b873393f8ec90234d31a90919c89ae4a5c5", "chrome/browser/content/browser/asrouter/components/menu-message.mjs": "6f5b4896d29b188dabab7d3c6b6ee21803be43901e4ac00434977bf680fb28f1", - "chrome/browser/content/browser/asrouter/components/remote-text.js": "8e12dfc52e535a0d210bb81029093e2a4261a62e1f95b65bf83554813195247c", + "chrome/browser/content/browser/asrouter/components/remote-text.js": "109480abd3c12e6d91473eb2e77ee4a4496d8618936dcf419a8bd90fa6e79691", "chrome/browser/content/browser/asrouter/render.js": "84fec106aecbff9328bdba1f41ef07d4e36cc54d36b7202bd1af5248db152b53", "chrome/browser/content/browser/asrouter/schemas/BackgroundTaskMessagingExperiment.schema.json": "6424c8852473266a3433fdf0712875d77a6207aeae7bd591cd4d0de28fd9622e", - "chrome/browser/content/browser/asrouter/schemas/MessagingExperiment.schema.json": "be8245c292a12edd3f54329a1ec11ecf7522fd264647cf7c9f6bfcd3ad7774b9", + "chrome/browser/content/browser/asrouter/schemas/MessagingExperiment.schema.json": "8b2293d4a3dc61c1b8b6b5052cf560c1b0b4adc74083c48b783fdd7369a35f35", "chrome/browser/content/browser/assets/focus-logo.svg": "cec6a587697ec68dedb86df8654f5425d095762fa83c776592bbb3db815a2569", "chrome/browser/content/browser/assets/moz-vpn.svg": "268e4ffd0242aa7db390a33fa67bf091ab1cd9b0bab1276559f247afc0fd805c", "chrome/browser/content/browser/assets/private-promo-asset.svg": "53df88708ca60fd8e30a6e38ff76af3c0a31fc4c500f4fa55dac94ea772c8faa", @@ -402,7 +425,7 @@ "chrome/browser/content/browser/backup/enable-backup-encryption.css": "decc1567a0d3445da45cdc96982119fafd6d574b1b16d45ed63b0dca3c8dab18", "chrome/browser/content/browser/backup/enable-backup-encryption.mjs": "c97f01a2ae79d9aac2cb5841835fc013047b8dec4bae121c8b6be97c95dd6c94", "chrome/browser/content/browser/backup/password-rules-tooltip.css": "3c284d0f1cec9247431f02016a6832e1ac4289a0d577dc2a238da3fdf0bdcbbc", - "chrome/browser/content/browser/backup/password-rules-tooltip.mjs": "70e9d2b505cffde8e3ac5360bf3aefbe0c064330a93474a469f4fed14507fd78", + "chrome/browser/content/browser/backup/password-rules-tooltip.mjs": "a0c6e0a5a443d24d64aa369d4fae8710c4c5d7ee39f7395d39cfd79b08960dc5", "chrome/browser/content/browser/backup/password-validation-inputs.css": "b1456c3398745c57a06c197f05b8bae15e583f4429a47f218ea2b9062f6a8c4e", "chrome/browser/content/browser/backup/password-validation-inputs.mjs": "952f892f76ad6bd2635d47eb6b61bd28d2ded47bbacc4bb09ff2f59b838ad3c4", "chrome/browser/content/browser/backup/restore-from-backup.css": "61d7523f77ac9e3572021d72f5462be4a7b8ea5e4d312f92c066cd40431c31e2", @@ -415,37 +438,37 @@ "chrome/browser/content/browser/blockedSite.js": "73bb70d84dfbfe0e2f7288fc198819e8e3ccc1be6d74cc29156fcbb0e9869f69", "chrome/browser/content/browser/blockedSite.xhtml": "ef0fcbe4bdcff3e05501fa7a2f43573b2f70b03126ddb46dc0b21128304bdbeb", "chrome/browser/content/browser/browser-a11yUtils.js": "0f3cca18e2641310d203fb4eedea006acfc70dfced54babdd06a89b4246debec", - "chrome/browser/content/browser/browser-addons.js": "c73a96434913e59ff4952c873cd5f4ad811b3886811485775585c0f904e334ee", + "chrome/browser/content/browser/browser-addons.js": "9692d36b71187d55cc936b744bf3d0e608cc9471a24b57a267cbd53a1f4df7ca", "chrome/browser/content/browser/browser-captivePortal.js": "dc03dbb015ad739fc7c3dedb5abfb89f5c673f81c809fbce897741a82a9e3dce", - "chrome/browser/content/browser/browser-commands.js": "84bced89e438309904b504a6242b984f16b81ed232ad543e5a70e53fce83aca0", - "chrome/browser/content/browser/browser-context.js": "3af229dcb7ff46c3d4171088c5caeb1a3da44f3309c24d62f060bf41a0791c0f", + "chrome/browser/content/browser/browser-commands.js": "768ade7534171dde776d00396f4363d2b0ea7b1747a6076613565e4f8c909fac", + "chrome/browser/content/browser/browser-context.js": "3550cab495d901e2627811d38898b2dcadd8f99fa2bfcfe1707f47c3abc56816", "chrome/browser/content/browser/browser-customization.js": "c31bfda117ca39b168050c1e2abc8c74880a5da8c3e4c3d8834afcd2c661f16e", "chrome/browser/content/browser/browser-customtitlebar.js": "4309f152c60f25ba2041a5fbf038b0dc97eec268f4e28fabe02695fd159e43f8", "chrome/browser/content/browser/browser-data-submission-info-bar.js": "92709d537608be86d208e0a03d19ec6916093153f68c7c7db5ed45d2dba378f6", - "chrome/browser/content/browser/browser-fullScreenAndPointerLock.js": "a08cd9e885678bb18f7ebfb70a32a9857470f39f75ee2e34b46b5c67bbcd5ab6", - "chrome/browser/content/browser/browser-gestureSupport.js": "cfa0f10908d2da10378b8115747176a9792af22ea025e99816689976264c0c78", + "chrome/browser/content/browser/browser-fullScreenAndPointerLock.js": "06867e39ddeef38cad8f2b30917fcd9ea420a164e666aeb4becdbbaa3a568cc4", + "chrome/browser/content/browser/browser-gestureSupport.js": "203e46055f3b16d22a2fa326f82b0b7328822a18ca7a3cc73e489285b04401a6", "chrome/browser/content/browser/browser-graphics-utils.js": "1514b6444e0acac5cc7df623fea35c4caf3b61ad6169c08d2599693ef3d8553a", - "chrome/browser/content/browser/browser-init.js": "02ac791f94def30b839bc283f58c11252059d2ec65660d10f45875cd6ceaed34", - "chrome/browser/content/browser/browser-main.js": "cff4ee6f85ee8bc364bfebf1e0b0565e908648c5e12d9787c04f3946b13c6aaf", + "chrome/browser/content/browser/browser-init.js": "122b55b036c067f509c9a805647268152ec016e78132541e02e95ce9a12d0d0d", + "chrome/browser/content/browser/browser-main.js": "7ce4c6fe1c438d47aa414c84ed388393c4cf1e711717dc99b11afe70affbdd06", "chrome/browser/content/browser/browser-menubar.js": "ffd64c51e4b30892886e2a9d90389bf67a0f77d2282717784ea062962c749a05", "chrome/browser/content/browser/browser-pageActions.js": "9804c2ad4d5d5a84a4f588ef470f0baf62bb6436965a73a4c73189cc6a6d6fd4", "chrome/browser/content/browser/browser-pagestyle.js": "3ab615e54e37ce7b26300faa708cbe161e407897581f0a8aabc4d3370e891925", "chrome/browser/content/browser/browser-places.js": "e25352bfb7969d2e8a0826ceb041dfcbbf13dacd68b0d1e491e557029a949f73", - "chrome/browser/content/browser/browser-profiles.js": "1ef872d4ec94e4ad1a4753ae8cebc30425e584b67f06885af380c595e630dcdd", + "chrome/browser/content/browser/browser-profiles.js": "369a1b7084f5e56379dc0ff89c28d2e583aa3b536f61520e43cebbc62af3735f", "chrome/browser/content/browser/browser-safebrowsing.js": "cdbf734463a0a1e9a363295654c85229661ff1bd1916deb3e89d8871c0aa1ddb", "chrome/browser/content/browser/browser-sets.js": "d67d811f7de44cecbebf25111aad980aa65997914412a90d2b28272f941cefc9", "chrome/browser/content/browser/browser-siteIdentity.js": "e3d554e33960f59fe6c06218b597c98940cc7ed1eb96f805c699453b0378c405", "chrome/browser/content/browser/browser-sitePermissionPanel.js": "6121f36a24de8064a8e48562a4684406d293c1f8e272d087c0ad7c62a6c824d8", - "chrome/browser/content/browser/browser-siteProtections.js": "374686390cad325b1c408d8930bdbead842735be5fc1a0c7bbb96bb1a99e15ac", - "chrome/browser/content/browser/browser-sync.js": "1aae975b1dbbe41c3ab4570384a67c3cc03aa75a8b2903ed6b2a47dff396fc8b", + "chrome/browser/content/browser/browser-siteProtections.js": "6ecf5607f8ffecf5f14a0913d5c7e70d684c01d6a94c7c731b19e102a83e8eea", + "chrome/browser/content/browser/browser-sync.js": "62fbc1ab8ca88d90f129aa5cef7c7e60d765f91b812bd224f3bbdcb7fa82de83", "chrome/browser/content/browser/browser-thumbnails.js": "6c206f3c87d73d73cd21d8ee5005b6107ff957920a977f78dbe9da1c46aab1e8", "chrome/browser/content/browser/browser-toolbarKeyNav.js": "fe59390206de5e0251cf07f71448e73bb9c00f36b07fca5ca1b73a35847a7c27", - "chrome/browser/content/browser/browser-trustPanel.js": "aa03478a7a880fa0aa1e1b074658569b98a92353b89d37436d86410d18102571", + "chrome/browser/content/browser/browser-trustPanel.js": "fcb49b77113d554bdb0d762c90a27b4531eff05123acb5d39556129b8c1cca04", "chrome/browser/content/browser/browser-unified-extensions.js": "f7eea9d490aeb421e6ef2fd4332ebf91308e6b648cbf0e2fb8cd747bb8844d86", "chrome/browser/content/browser/browser-webrtc.js": "ac60d7da066ca33554ae28690609a8727621d194c538e0914c8891a8e32fe35e", - "chrome/browser/content/browser/browser.js": "697a9269dbf1756e0de286da9a772429f01e4cda604473172bba6b138e469717", - "chrome/browser/content/browser/browser.xhtml": "663e45a4b170449d9a2642215ccbe04455bdd4333d08ae6df16bcbe8c3bbb14d", - "chrome/browser/content/browser/built_in_addons.json": "7e8a9d9fcc13f599ea423078942ecd0bfc81fd02daf640c8ee5d0191db7ac239", + "chrome/browser/content/browser/browser.js": "bfc011d09329c5ad8cd4df6af47c1fc7e593d6312e04b3c97b7f625c17dbbd74", + "chrome/browser/content/browser/browser.xhtml": "09eb2ee951581ac2c4fa15314d2ddba997f6938fe51981ae49f9520e7c6b3d23", + "chrome/browser/content/browser/built_in_addons.json": "163085b6cca1730e3c06be26d65292d594369c14ed6427375f12e687009ce8f7", "chrome/browser/content/browser/callout-tab-pickup-dark.svg": "39c2dbc1a53a1f4e6e84044e19f9d61b897a831f642016d75a46a4756d768fcd", "chrome/browser/content/browser/callout-tab-pickup.svg": "60c0013aeefbc804b1fa05e8874db37f5ccfde74f512d526f044cae633376e1e", "chrome/browser/content/browser/child/ext-browser-content-only.js": "bed2d820efe59c2749bcf14c4d5f37328d875dbfd6c62778a56333605381d6dd", @@ -467,7 +490,7 @@ "chrome/browser/content/browser/controlcenter/assets/fox-concern.svg": "9d02680db687778e78acfb964170c3d9bf9a106312eac204f138b173741830a8", "chrome/browser/content/browser/controlcenter/components/breach-alert-panel.css": "c039171142037412fd403ab19a036b81f8cab725c32b7eceb031787d1122f996", "chrome/browser/content/browser/controlcenter/components/breach-alert-panel.mjs": "839c397d91fd99c28ada7a5fe6d257f5138ea79b2311660cb3ed6f3b8b60bbb6", - "chrome/browser/content/browser/customizableui/panelUI.js": "516cf19faa801e2c68bdf2173c17f79eb0952afd7e78a32c926bf3173020d892", + "chrome/browser/content/browser/customizableui/panelUI.js": "83b46e9ff59ac95e5bec046ee5676de1075ebf3a501c0153c354141e1387ef9e", "chrome/browser/content/browser/customizableui/sync-promo.css": "331f63e092f0c9df223ec90321ff4fd7d1f221282035f10d84e8dc4d65de4a97", "chrome/browser/content/browser/customizableui/sync-promo.mjs": "a1cc856f0ee5fc03d066101b450e9962dc0b2d290ceb670914924edf54a31e87", "chrome/browser/content/browser/customkeys/customkeys-sidebar.css": "515a370ed2c551597c889c67dc9bd8b9d1a40356ce49015999b51e51a3634187", @@ -484,7 +507,7 @@ "chrome/browser/content/browser/downloads/downloads.js": "e286d1c694a70da4b545c421ca90b4471a7ebf65c3a136b131e10807bb80435a", "chrome/browser/content/browser/downloads/downloadsCommands.js": "c10ec5e0150d9f40bbaa77da28327993d1dd7fd8066a9de56bf621a8a7cc2235", "chrome/browser/content/browser/downloads/indicator.js": "ed8789eeedc841a54e51d8ce604ab5b7a8381ad362cf033edf90af15959899da", - "chrome/browser/content/browser/ext-browser.json": "c5b89d96db0e8dc98db059501b204132b36bf7d87f3c5f75df77d871b0ca58f8", + "chrome/browser/content/browser/ext-browser.json": "abe9f6366150796b8da9b8546a9bce3c77f5d74c93fe4b6144912b3ccf5c08f5", "chrome/browser/content/browser/extension-popup-panel.css": "1c87a1c02cb5e7098cfa30fb1548f705669997016dedb4f0f6a43f4364f95b68", "chrome/browser/content/browser/extension.css": "36b31444f5d4fd73d7b2d613f917adec4bc00761ea2783d8db1d0df5a6af000e", "chrome/browser/content/browser/firefoxview/card-container.css": "726fe7fe4788ca4b742c6c6c696e3273bb252e89672da1d32b9c2ca8731f3b63", @@ -496,7 +519,7 @@ "chrome/browser/content/browser/firefoxview/firefoxview.css": "7be4f8778d54d3fe811a63f6c31d6f30ee33f4889d233c4e312ed508bc43e038", "chrome/browser/content/browser/firefoxview/firefoxview.html": "0746f356d23c9f6efd79457cdfde41c221acdc5dd3c6b04f4af1c1b58da24302", "chrome/browser/content/browser/firefoxview/firefoxview.mjs": "f44532d7471394dbddf9d79244cd9960a0f9182361468ff41cd5e4a8d7223ca0", - "chrome/browser/content/browser/firefoxview/fxview-empty-state.css": "8575ea4f356e450599de82bb2fb23e0fd613a7121949cea3a54735fdd4a6d986", + "chrome/browser/content/browser/firefoxview/fxview-empty-state.css": "2f408028a93d29815d03ef7a9f4e090341df39fb17e1c329b442eb34051a2814", "chrome/browser/content/browser/firefoxview/fxview-empty-state.mjs": "f3552badab43da090a664e6c58e3be78680d537027566d6e8c19286e51b005d6", "chrome/browser/content/browser/firefoxview/fxview-tab-list.css": "eff63b9f835febb1b16e9bb1b30a4b47eb4fa797e79fd46aa5f27ae45b8e5594", "chrome/browser/content/browser/firefoxview/fxview-tab-list.mjs": "768475f9a4f49b5b8450cffffacfd101e269a44dda66c3c1bb44f577c613c38e", @@ -529,10 +552,10 @@ "chrome/browser/content/browser/genai/assets/brands/huggingchat.svg": "c5a69f5f1a84642b5114856aaf3ed6c3eebddc80e984d65720d908ae3f845f3a", "chrome/browser/content/browser/genai/assets/brands/lechat.svg": "9425653e7249bdf7dd5698ea5901f7e5fa0603c3ab6d166aa2baccc5aaad169e", "chrome/browser/content/browser/genai/assets/onboarding-link-preview-image-longpress.svg": "1fd83ee4be76153cda9f9a891097800ea2749d3fb1552b2b80021f874dce1232", - "chrome/browser/content/browser/genai/chat.css": "fdf6036c9518afdc12834a4fc45c2ec905ea6fdf725aa405b3ae2866d2097fdb", - "chrome/browser/content/browser/genai/chat.html": "2d69deb224f7361675236bd5cdf8307c814575ed85e68e4e798a969607c8225a", - "chrome/browser/content/browser/genai/chat.js": "f7b3ef24231c5a87427e28506c9a8cec8e86b4e07a6f2e9b9b40a0b5ae9ec52f", - "chrome/browser/content/browser/genai/content/chatbot-promo.css": "84acb9452cde3f7cae0d4c0caca0fc0205596393c6ed1a5dca3796897b1fd028", + "chrome/browser/content/browser/genai/chat.css": "2045221b0c4ef28807e9fce2f1b322c3c3a374f82f3aed77c9524abcd54a8c05", + "chrome/browser/content/browser/genai/chat.html": "377eafa92336b3fcfb8e8103b439f9cf6fa185c8b40e764889d5ada022f9ffe8", + "chrome/browser/content/browser/genai/chat.js": "c09927f3fdb9423bfcc64a077508089a47bc319543f9ce864b0677cbda6f2c8e", + "chrome/browser/content/browser/genai/content/chatbot-promo.css": "e7837846e4cb944ec91519a841eceea9202f7d02578bff8c3241ea597b915f62", "chrome/browser/content/browser/genai/content/chatbot-promo.mjs": "8bab2951ab243a3905b471d5fecd8cd85dd9139542c0d2cf348917a4c931a383", "chrome/browser/content/browser/genai/content/link-preview-card-onboarding.css": "b9e6c0ebba0e3b7b948c8027e0eec4ce158be1f1eb21184a5c5914b8ed15d892", "chrome/browser/content/browser/genai/content/link-preview-card-onboarding.mjs": "b1fe4ddea0f996b60aafac5bbcf02c73ec4b2a9baf94ebdf02ec054fa0a849b5", @@ -561,6 +584,7 @@ "chrome/browser/content/browser/ipprotection/assets/shield-vpn-exceptions.svg": "d20a391fdfcd7d47b6c3141ff0d6b058573c61c6a48f89bd5600916d6017da33", "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-error.svg": "501763580c0f965e2ac53f6f131c9cd22c0db9ef55e5876a684aceda5dcc1880", "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-excluded.svg": "478c499bb5a8fe73409bddd3bb0549545acec856d0d452f987c130d287eef3e2", + "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-included.svg": "7de302cd07fb2fdc21c1b9e1558cefc2179c42c102d4ef8b4c8f0450ea7ff510", "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-info.svg": "e1b2a4580b4a3e7b485248550a4889090bcd45dc50f92766da156b0eb0b73fb2", "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-loading.svg": "37f06bcc4d2cbefe52bff70f91f0570ee0f39297e8199b9a0f2ba66b907a5029", "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-off.svg": "d29260733e4d036ffd45f6bb174404e9f0606528d55622746065be3dc7ab8587", @@ -568,6 +592,7 @@ "chrome/browser/content/browser/ipprotection/assets/states/ipprotection-paused.svg": "d222822b5e8763a246aafa1dd5811bc802ebeab62a64b0e27c31fc9219ab9a03", "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-error.svg": "0dbd76004b44d26aeb14de6c19f45bee9f5d3c368f12a0003e7fc46d3b7a9dbf", "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-excluded.svg": "bc1a79b49ec14d2518fe7ed720140a1920ba9933834bc3dc842832c1fdfda025", + "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-included.svg": "cc7dbcc865c53271c410be30e093a1cb62a97d1096d0eed18069d350ef0c3d5f", "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-info.svg": "ef67db7d87b9f42e903cd65e4d40560473a2fb1960f3da3d0953646c34b6ad58", "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-off.svg": "8d7d131b46108820f8c802a5e1b7020ec44369060f02330306ba7e99f2d68cf8", "chrome/browser/content/browser/ipprotection/assets/toolbaricons/ipprotection-on.svg": "d230b9a262032e2e5fd04410cc8a38821efd1a92fa09cda2a22d404aaa3ce4c9", @@ -576,21 +601,21 @@ "chrome/browser/content/browser/ipprotection/bandwidth-usage.css": "95fc6aa948c51b9d8dd471352e10f5272132a23fde170038e151852115c87a31", "chrome/browser/content/browser/ipprotection/bandwidth-usage.mjs": "9dfc2f5ec2ed0cfa83bf9788c2983f7362b1bfd3ca135909509bcfa63f51d8d2", "chrome/browser/content/browser/ipprotection/ipprotection-constants.mjs": "b4df03bac1226622637eb38bb633a5ae18fcd3c00c36154ece78c9d719112bab", - "chrome/browser/content/browser/ipprotection/ipprotection-content.css": "c49b3b8cde7ca6f9ce211151df13fe418fda448c087553d4bf17a0fcdb233f58", - "chrome/browser/content/browser/ipprotection/ipprotection-content.mjs": "6e5eaa7e7a3d1be071c9fc8e02b922e0c160b764d4b0aeaf0100dd281159d415", + "chrome/browser/content/browser/ipprotection/ipprotection-content.css": "13575ebfb5ce7b646c70dd7ca08b265dae58b28e7e8060cfcbf0d094877d7e96", + "chrome/browser/content/browser/ipprotection/ipprotection-content.mjs": "37c903ef9d652b051627a0d91a6f76801f58c5429381b856a2c3160d692b0688", "chrome/browser/content/browser/ipprotection/ipprotection-customelements.js": "ff4e3e4873c45801d35c2d2f98c74d2f0eef745eaa56d467ffae015f1ee41abc", "chrome/browser/content/browser/ipprotection/ipprotection-locations.mjs": "3ba088ee31af23cbfb6ec118042c10a67cd984d448a15df86be24144d1bdb403", "chrome/browser/content/browser/ipprotection/ipprotection-message-bar.mjs": "58cb20767b1a32b1b8a923b0fe517a43d88a5247a7586b6b7809ee4155bb9978", - "chrome/browser/content/browser/ipprotection/ipprotection-status-box.css": "cb56a644c3917325ed64384f993ad28af8a5d476a75771700a33e30a7553e94e", + "chrome/browser/content/browser/ipprotection/ipprotection-status-box.css": "dff708ef1719fc1f5b57f6f512f42c661c34ab895401f3148d4ef947fb651909", "chrome/browser/content/browser/ipprotection/ipprotection-status-box.mjs": "0a8e87eca33f387e4330aeb0ca0928bf90b0bdb19a4b0260f71660f74a8d5e0a", "chrome/browser/content/browser/ipprotection/ipprotection-status-card.css": "5c1d8e2adea92abe2fb4f4cc9bb689c27492a25ed7edcf9435d87199624be30d", "chrome/browser/content/browser/ipprotection/ipprotection-status-card.mjs": "235ffec078c24fdcee9934212c78da8c3735fe7b7a59165541ccd77a42051ec9", - "chrome/browser/content/browser/ipprotection/ipprotection-unauthenticated.mjs": "d9e9e90bda1f6236c393064874b61881815b1d123970541048598c3bf1b0180a", + "chrome/browser/content/browser/ipprotection/ipprotection-unauthenticated.mjs": "ec15555469bc5b05bd921e176cf09e183edbe3e77b1e1f4d1014c87b2034a44c", "chrome/browser/content/browser/ipprotection/ipprotection-utils.mjs": "7da485e6ff443a0a6724ddd1ada5a0438103081637b7cd6741e59228f9e1a670", "chrome/browser/content/browser/ipprotection/locations-list.mjs": "891a5ece4bf395219bca6737f741e93c30192c16b7b9269b8722e2dcafd13692", "chrome/browser/content/browser/ipprotection/locations-subview.css": "74e65f25ef8e69e05959c121ee0cac8d1a58b9888eede68ce55f7a5ed351e05f", "chrome/browser/content/browser/kit-signed-out.svg": "143ef6844810ca97fd79652d1fa68ccf19db83e2dfa7d122dac3d29bea3f963c", - "chrome/browser/content/browser/license.html": "ddb3c7001881b5cf48d9a3a57602c871b316ec681ee47a8139be9250437c1a1a", + "chrome/browser/content/browser/license.html": "50272c458a6c3a06743e2693263789b5011c98852c964057ad620266d8278495", "chrome/browser/content/browser/lockwise-card.mjs": "b1cdcf93a6d09e139106a9c74b94a44696cc8ae61422ea8496ee0f4ed4f66d09", "chrome/browser/content/browser/logos/etp-mobile.svg": "33ba7fee183bef28cd9df49d066e89f652d4f322b39f8012ccd32bf3b9526c5d", "chrome/browser/content/browser/logos/lockwise.svg": "25e9dc6c98917379c18b381158d90875b00eac0567f555363e7feb8a7b8ccf4b", @@ -604,7 +629,7 @@ "chrome/browser/content/browser/logos/tracking-protection.svg": "9f075b442a7e3051af93fcb45c8badc08236568ec1f927a2622b63e7aefa65e1", "chrome/browser/content/browser/logos/vpn-promo-logo.svg": "c4e29047c64e868ceb35f9665e2affe823eb05036a669099327b813e0b174b26", "chrome/browser/content/browser/logos/vpn.svg": "3add573e9c850e887258f102b596a759dcca3e9e3ff9527405d991c05cf2aa3e", - "chrome/browser/content/browser/main-popupset.js": "556a844bff09a33ad568c7157e96c69b0a7fe85e9e95b833007eb61f133806cf", + "chrome/browser/content/browser/main-popupset.js": "1439f900739a2426f088ddb4fbc9bc7b2c49c95ffe74de21a1654faf8b422f9b", "chrome/browser/content/browser/messagepreview/limelight.svg": "a03b061b96110c235edf1df8ba6274b4119accde3476e2c86f63902d0c5e441a", "chrome/browser/content/browser/messagepreview/messagepreview.css": "ea5acfbaf7adca75a9871e4ca2f7688dea4d0e740ef4002180e444db6114e242", "chrome/browser/content/browser/messagepreview/messagepreview.html": "6591aa5352c128c2a1e4266d5cfa08803f2c06d0b2b75fde4b391c2692193235", @@ -619,16 +644,16 @@ "chrome/browser/content/browser/migration/migration-dialog-window.html": "c421f3064ecff3fb3d5a7c6b87226ac0923c06c2deb8000d33bbccc3c7684896", "chrome/browser/content/browser/migration/migration-dialog-window.js": "834b4f73a73223cfc88f93fbb817abe6958eca57b6428421df9d31f009940e41", "chrome/browser/content/browser/migration/migration-wizard-constants.mjs": "2cded81cfc5a2c39eeba2ca7d796155128f4820ecc62dc753dc510618ce41400", - "chrome/browser/content/browser/migration/migration-wizard.mjs": "90bcd040872b265ca075e550c08b0b2aadcaa6d7097f9a5e5056b64e2442614c", + "chrome/browser/content/browser/migration/migration-wizard.mjs": "0c328e5b2033e5b9dc241397be4c2560aa5901153f6575923d0e95909ba17257", "chrome/browser/content/browser/monitor-card.mjs": "06a150124aaaad9d38c530b9e15d93a074e9438d91095933ad9b942fd05341b0", "chrome/browser/content/browser/multilineeditor/multiline-editor.css": "2a2d2951d5b36b443ae22f82fd6d59b86c72802bcc5f446fa480e9e4d96eeafa", - "chrome/browser/content/browser/multilineeditor/multiline-editor.mjs": "5c37fb9588dbda84ca5d980bea15ee4404dd509d00abccb062de52b1189a8f56", + "chrome/browser/content/browser/multilineeditor/multiline-editor.mjs": "675f1b41823bb319bd52c9e81b7407b1224d2a0e391465b9066953b5f1d30248", "chrome/browser/content/browser/multilineeditor/plugins/CommandsPlugin.mjs": "18d34922f55e22a4fdd56fa5c05d591f187456ebf6a17a7be4f3205a6f6efd19", - "chrome/browser/content/browser/multilineeditor/plugins/MentionsPlugin.mjs": "d5e668368d0b8848bb024a58783da3c4aa591dba9bc531e94e84578652009686", + "chrome/browser/content/browser/multilineeditor/plugins/MentionsPlugin.mjs": "19749d95a9ac49ae46335a5a6e5d9bc51f0d03ac4e5a3c85011f0dbe1ab90e2a", "chrome/browser/content/browser/multilineeditor/prosemirror.bundle.mjs": "27149a2af826ed6dd195544164195bcd65f01e257a45a3b183902fe7e3dda0b2", "chrome/browser/content/browser/multilineeditor/prosemirror.css": "0fab11b82dc31c0a60eef41f7dc1d182073d3d4da4c756f4e58e7344f977f36a", "chrome/browser/content/browser/navigator-toolbox.js": "5cf334ad5115b6fa819013fec74cbfdc39474b61990096f2a5000842573ed539", - "chrome/browser/content/browser/nsContextMenu.sys.mjs": "53fbc40a3c8a875b207f31363330baad2d1c698f50ef4670f8cba1a607049c0b", + "chrome/browser/content/browser/nsContextMenu.sys.mjs": "905c4d676e2ad93b2c1c16c323386897117f2048b83ab94a85df230213faf682", "chrome/browser/content/browser/pagedata/schemas/article.schema.json": "5a18b7ff6c8fa39e87b44307f2a45df3c4f079ffb6096a1b36ac7182287ec851", "chrome/browser/content/browser/pagedata/schemas/audio.schema.json": "af843042b95cf2898bc9bddbf29c3e9850d977cf445532e5584c6799542e76b1", "chrome/browser/content/browser/pagedata/schemas/document.schema.json": "b77699d7ca61ff39cff3b1df17c0c62a9871058251c71d42def53d720314b088", @@ -641,7 +666,7 @@ "chrome/browser/content/browser/pageinfo/permissions.js": "ff249ba965141817fee298713b526ead4f3b2e58dc83a6b0cd69b781f99cc6a8", "chrome/browser/content/browser/pageinfo/security.js": "cd353f1c309dcdddccca2afef5889730c67f80e1760ba808e8b823d3c22c85c7", "chrome/browser/content/browser/parent/ext-bookmarks.js": "2fc477f75c1b512e997033a656066813f594c6a1c6bd35ed0533dd2d6d0fe61a", - "chrome/browser/content/browser/parent/ext-browser.js": "1febac0e78e136cb623892388379d97287c232a500d221d465b6e25bffc538ef", + "chrome/browser/content/browser/parent/ext-browser.js": "633cc4d531e1d017662b007bb24bfc999df94e76de6b0d34c93f58ba90dd555e", "chrome/browser/content/browser/parent/ext-browserAction.js": "cba42a58293759ce6bcfebe52a73103c0db22f160700129f25ccea12be262484", "chrome/browser/content/browser/parent/ext-chrome-settings-overrides.js": "9e2ba9584640dbea438c4b7503dc3c5594845f6d0ea7445cde3f1ca7f606d0ed", "chrome/browser/content/browser/parent/ext-commands.js": "d4b058da23bb5f2f51f4618bd67650cd0b2a5bed48e674682746dfc2e94bc8c6", @@ -651,10 +676,9 @@ "chrome/browser/content/browser/parent/ext-devtools.js": "5a433e9254eef376a4b3beef7191d017383ef073b38a9ba59cffb9e6cbfa91c6", "chrome/browser/content/browser/parent/ext-find.js": "430c38db8106e8d68a7894fe9ee3dc922759852f94caf5c06ae713ef2a987e78", "chrome/browser/content/browser/parent/ext-history.js": "33ed3b8611315ef3c792ed5fc046c17ad0f828946327d00d2729cf75a7b3ebbe", - "chrome/browser/content/browser/parent/ext-menus.js": "760f6e3a0f1a969baad31a5a1166fe0ffc4f6a88944471e18e4bd5ec7b193321", - "chrome/browser/content/browser/parent/ext-normandyAddonStudy.js": "868ab5b28b0bbb13ebba8cd4c010a5e2f46dcf8f58111246f899d6c9a40478e8", + "chrome/browser/content/browser/parent/ext-menus.js": "4693c0b47eef7d202343fbe5d18e8942ef4add3dd755c5144939a06a60bf8c21", "chrome/browser/content/browser/parent/ext-omnibox.js": "7687451433c9e44dae4ab8cfab75320f18f5bd5b734b23c9014a1e1238f915f8", - "chrome/browser/content/browser/parent/ext-pageAction.js": "5b1b1805b14d64f45997121bb88b9991b182609bf6bbc3b97b2b56c0031a528f", + "chrome/browser/content/browser/parent/ext-pageAction.js": "3e172c50c2a7389d2bd9c7b921f1d53a38268cbfd25ca45158542b6aa2278143", "chrome/browser/content/browser/parent/ext-pkcs11.js": "0c89ece3eca0c8cee20296e768ca52342170e30fd040b4094b78d79fb11a7163", "chrome/browser/content/browser/parent/ext-search.js": "4b3bced8577fb65e332f8cfc96efd8cfbb4a387926c526d681bbd978c0894d69", "chrome/browser/content/browser/parent/ext-sessions.js": "5b155e704fb6739ab0bc7e9f9b09c18904d2f818c9cab5db03dd98e8d1377e7b", @@ -663,69 +687,69 @@ "chrome/browser/content/browser/parent/ext-tabs.js": "5358daa858c1ef8746948e90a0db5241d5e05773702e9378e0fd6425371f6786", "chrome/browser/content/browser/parent/ext-topSites.js": "b922d14917535e208ced4c5a79db49ac3ea722d2a4e5caa5134f2854b23dbfd5", "chrome/browser/content/browser/parent/ext-url-overrides.js": "c0dba84adff1781d05b69098e761d01a0907206ccf0d4a5c2beed6ee6c555b48", - "chrome/browser/content/browser/parent/ext-windows.js": "1693aa9e0bcf898665a9b0ee838f0813f5b17cd0a3f93b0b7cb4ec1783c6ab27", + "chrome/browser/content/browser/parent/ext-windows.js": "4464c1082b02187341c99707ea8e2c15f1ebf4b4e8f4b0a222bb97c015b61813", "chrome/browser/content/browser/passwordmgr/login-doorhanger-username-field.css": "0b1b6ed29128c2b8bf290ed57eec375e79a58f3b5782167d3d2cceb2fa8c49ed", "chrome/browser/content/browser/passwordmgr/login-doorhanger-username-field.mjs": "e8d8c9045eea877cbc79cea127ce89bc985b214406dca47c15863571881a560b", "chrome/browser/content/browser/places/bookmarkProperties.js": "d3abfc5c5b8c5bee50b62084212f1fb36316e2b88a4a4ec4b48aa598936abfd4", "chrome/browser/content/browser/places/bookmarkProperties.xhtml": "6a6435f7d60b1d431d0443501642e4d8d2d19d9eedec0632ed6b76a0ea15880d", "chrome/browser/content/browser/places/bookmarksSidebar.js": "188ea580346d73c13742ba83a2d1efe0c6cab0d00811d7a9b40a49ce4418d33d", - "chrome/browser/content/browser/places/bookmarksSidebar.xhtml": "be2cef48d82d8bbe528801dd82de97d0e4395ed9d2fc527275e5049e0c3228b4", - "chrome/browser/content/browser/places/browserPlacesViews.js": "c7dfeb3ffc98bf8e90c0210cc5ed1cc9426875d980978553b936fe0067936351", + "chrome/browser/content/browser/places/bookmarksSidebar.xhtml": "650a9e13676271e75ac00de43d1894a84c0398bba51656b458ca34b70fd0fda0", + "chrome/browser/content/browser/places/browserPlacesViews.js": "cb1b847efa2568393c76b8bc22b6b73cd7fb59118dd23a973d685588303620f4", "chrome/browser/content/browser/places/clearDataForSite.css": "5629e82977e8a942a1aef62cb60063751c470f4159d7de9b13dc6a529a8801d2", "chrome/browser/content/browser/places/clearDataForSite.js": "3fdaa159e30490b22a3ffb8e882e7ccb3c2798dc6a14536e961b9078f15a4e53", "chrome/browser/content/browser/places/clearDataForSite.xhtml": "8e61654f418decd099b65d840f47954ee285f12cc3b5d4f50a0498badc0b1008", - "chrome/browser/content/browser/places/controller.js": "4912bf8848dfd0876d8a5019db8f367c681fd40eb825c3a2c50df3a8213e1940", + "chrome/browser/content/browser/places/controller.js": "4361d93c99d68e5948c784b4471a2a6cbab04402dd4acbbb95e3956fd8d446ac", "chrome/browser/content/browser/places/editBookmark.js": "965369610a33b72d30d94f17892ce4941b0f050eee0213068158c1b41458d64d", "chrome/browser/content/browser/places/historySidebar.js": "b626ab9c5542ea133a2b68ae03082a97e4f3024c2e949f187ad2996d319b7a1a", - "chrome/browser/content/browser/places/historySidebar.xhtml": "38c0b5938f99ac6d6a38d8b04682085b3a768ba851f603444531ecfd0fcc76b0", - "chrome/browser/content/browser/places/interactionsViewer.css": "b78314fd3b6e828174d5e748508e6b6916cbf4a8e4990730f650cdd03844aa7d", - "chrome/browser/content/browser/places/interactionsViewer.html": "4c7aaa8434c1c189a8e0f43811f7be53c81bc1020e4f92eee48931a0741175f4", + "chrome/browser/content/browser/places/historySidebar.xhtml": "bddf31cb2289bd6172c25de0e98397ba2107c68fc5fb811946b7002abae808bb", + "chrome/browser/content/browser/places/interactionsViewer.css": "067df12995e2cb538e81ba1432d0871ae51aa734d17c4a712d04892815c67e39", + "chrome/browser/content/browser/places/interactionsViewer.html": "7aa6acc106dff2272a89444d8fe62160e4c8ccbc111ff3a6ff771c17fe2ddb77", "chrome/browser/content/browser/places/interactionsViewer.js": "18863e1fce7369906ff2c44375e96d14fc1895af96e39ab5000e697d30e1dda4", "chrome/browser/content/browser/places/places-commands.js": "a30267d6c766614a3493ec0c44aa55a325de38ab4e31a6ceb9f9a4282c327e5d", "chrome/browser/content/browser/places/places-menupopup.js": "f4817b08f0a318e13df1f4110861726d1df9ab663b7ad7c4e6ed905a190491e6", "chrome/browser/content/browser/places/places-tree.js": "d0ce8c360e3f0c784127dcc290260b85e14bcd3957c65135c0cbeece62f6b7a0", "chrome/browser/content/browser/places/places.css": "d39186c246d3bedd0046470a0c8b804f1d98cf7ba5fc8484f0cf9807e0608a71", "chrome/browser/content/browser/places/places.js": "73a3a9e5f59e944820546d1b9d8230c098ad7dfbe7965cf8fd7efb8bec8f50dd", - "chrome/browser/content/browser/places/places.xhtml": "d0352bdfec856bd44be6689280ada34de89e95f51048b95da53fce58f52a4b49", + "chrome/browser/content/browser/places/places.xhtml": "f42d2fd2bd053a1fa90a0e520aed810d342235adb2543c47e38075f63d0ce8a6", "chrome/browser/content/browser/places/placesContextMenu.js": "a1b55d8c7791e20cca3e884f9b631f959b39c72ed0642fee5e03ef6386f188d8", "chrome/browser/content/browser/places/treeView.js": "c9c63fdbd93191c4f91d5d211c1546f4a976d2d0f97850ef84a9a3918f8e34f8", - "chrome/browser/content/browser/policies/aboutPolicies.css": "673a398d4d63b0f947122486ffb24f3034bb47a0297f5053e72a1028bee81144", - "chrome/browser/content/browser/policies/aboutPolicies.html": "3957b8784e9749a798dadc4380dce80896cb868a8279aec0d851327f479605a3", - "chrome/browser/content/browser/policies/aboutPolicies.js": "4b1ca2cf5e9fe50f5b92afbec9376f24c2e126dbee749c53983d2692fa80ffea", + "chrome/browser/content/browser/policies/aboutPolicies.css": "bf580c7093e29d5693133e78476b98c4ef2c35dd7ddf3c2484fb995462950139", + "chrome/browser/content/browser/policies/aboutPolicies.html": "f256fadd77d3bc4b635c459f288bd452553a4af5c0f5a84ed0c3072ac19b03fa", + "chrome/browser/content/browser/policies/aboutPolicies.js": "3dbe1d0f042f4493f2ade9061300ec9929754ae6229c2782740479d13e98c7a4", "chrome/browser/content/browser/policies/policies-active.svg": "b25cb73acf5cad8567d018b8d3b50ed85885f46e52f16fc4c55f67db5fcca977", "chrome/browser/content/browser/policies/policies-documentation.svg": "b639e59ce7675ef0c23206cc6017ddb8dd494eaa074e39441aee4b1f9a715a67", "chrome/browser/content/browser/policies/policies-error.svg": "f74ecc9479d911d1f51f95fcf63954f97c2cf2a57902c46e473f73a12c73cfc8", "chrome/browser/content/browser/preferences/DefaultBrowserHelper.mjs": "76364140b10f27e0d345e993ad263f16f27f8d3d49fa26d98715e4dd28a9d7b9", "chrome/browser/content/browser/preferences/FocusHistory.mjs": "cf571fafdd2d866b85918e4069d81e0205bb49b6779e43e4026d9d7ae6dfc5c8", - "chrome/browser/content/browser/preferences/OnDeviceModelManager.mjs": "200a91a82c5d7fe12a376c5d333d745abdda3fbede133d820ba32303b011fc3b", + "chrome/browser/content/browser/preferences/OnDeviceModelManager.mjs": "60c92a6e8262da7b14680f7ddb81e456c34b96ed3249ba18123149de6b517f04", "chrome/browser/content/browser/preferences/browser-layout-horizontal.svg": "94e042dabae52116ede24b12f75a6546480124d61449632f4a6a51320c8fcfa4", "chrome/browser/content/browser/preferences/browser-layout-vertical.svg": "3231da034b59bc67d50de467961f5aaa4ce6ba52916041ff31cfd9f9bd057a65", - "chrome/browser/content/browser/preferences/config/LegacyPaneMappings.mjs": "e9b5f5883ce466ad41c241a0a04d2649db0f0326ab4c508c9291ba996f8e3584", + "chrome/browser/content/browser/preferences/config/LegacyPaneMappings.mjs": "9c1be4b2cb6b230540ff37b0d4a043c06e3966402b970201cb2382a887e8a826", "chrome/browser/content/browser/preferences/config/SettingGroupManager.mjs": "aa9fb0fb9b34b70ceb33d5e0a26b1f1958fc747fd00c617aa12644ca24b3ae11", - "chrome/browser/content/browser/preferences/config/SettingPaneManager.mjs": "1b4ca7d0bffcd76167d47b1508202ddc9497feb2744fd74a5364610b2b59f670", - "chrome/browser/content/browser/preferences/config/about-firefox.mjs": "11fa7ec15dd1d9004be3c27bff02696194f18f923782a34f93536d304fcd571e", + "chrome/browser/content/browser/preferences/config/SettingPaneManager.mjs": "68806c35050799308b00584bcea3c381dd0b7c4306b1d01b4f1ce28a22f1229c", + "chrome/browser/content/browser/preferences/config/about-firefox.mjs": "c6417a2c740f32bf5e22029b8b0ba5e814745c7d8ef78e9f3ee9a2e9b0718626", "chrome/browser/content/browser/preferences/config/accessibility.mjs": "0270b293ea2a18a3a1964a3ce0f04479acda74feb110af418431905b646d4ba8", - "chrome/browser/content/browser/preferences/config/account-sync.mjs": "8a773cc0faacfcf3b4f1a8210ea5da64c7e200d4d31c0f52c50ecc2692303929", - "chrome/browser/content/browser/preferences/config/aiFeatures.mjs": "2ef4bc7f2d5f2aaa1032c650c8701a4a107cfe1bb6d91f22224f91911de65889", + "chrome/browser/content/browser/preferences/config/account-sync.mjs": "efc3daa1a7ec83d093900b86424513e9ebc17346d559f898cecc19fcc3e7e0ab", + "chrome/browser/content/browser/preferences/config/aiFeatures.mjs": "ea772cc61ba8d128084385d85887c4afe46d425411142a650d3e7424f317bb56", "chrome/browser/content/browser/preferences/config/appearance.mjs": "714563f4c05c1cdc667720e5bc0c89ed63a13fdf90170f45c0c88ae2bcda5baa", "chrome/browser/content/browser/preferences/config/block-ai-confirmation-dialog.css": "54aa363a529be6f9fe5a6738ca6f2b1ddb6b01e40a5facc97f9e2e048fdaa850", "chrome/browser/content/browser/preferences/config/browser-icon.mjs": "38c9ea7277625b63b7e8cbfb62612ac0d06db9f1371d88b8a97383a42c035563", "chrome/browser/content/browser/preferences/config/containers.mjs": "716ba2b28c1bdf7f5ac3e360d4c16f16b221d013420e1ad32c89b53ac38dea17", "chrome/browser/content/browser/preferences/config/downloads.mjs": "5ae72f50005aae0da3f1b6c7892fa5ade42f8914d69c005a02c9ff9a1297a903", "chrome/browser/content/browser/preferences/config/firefoxLabs.mjs": "c81a2b9f5ca75f05e2d184ee338dd2928a3ac06f7b7c71cdcfdb1a8069010882", - "chrome/browser/content/browser/preferences/config/home-startup.mjs": "5083820f55e91bbbc91aca17295b5bc1a2f1bfea69c5342bcc79f5222f261622", + "chrome/browser/content/browser/preferences/config/home-startup.mjs": "dd427bf26ef6bd85fd19235809975d1c7c992bec945a7b00b955d25d8b5f8a79", "chrome/browser/content/browser/preferences/config/languages.mjs": "16d6585e9b95a245d3cd65e35220e1bfda368fd0879e540c3530b8f7c38a8530", - "chrome/browser/content/browser/preferences/config/moreFromMozilla.mjs": "dfecc4133e119cd73a8f8b32ff3225c94684f237107b78fc01df8609c42c486f", - "chrome/browser/content/browser/preferences/config/passwords-autofill.mjs": "03dedfadb14e0d3c9de8b3600b99de9ffe2e7cab6dd35bd40e5b9d769ad17a55", - "chrome/browser/content/browser/preferences/config/permissions-data.mjs": "428331da4228f2dd8441a806e5c3cde67ca396fc27b234c7afaa65544e127652", - "chrome/browser/content/browser/preferences/config/privacy.mjs": "f6550c9a4994a4af6d6173c3a28029568e48a4477413c0dfe796944a4bf2c098", - "chrome/browser/content/browser/preferences/config/search.mjs": "cd6c69a53e839813d2e7569d2a40f22969f83fb94d40b962ac52f8f353b25088", - "chrome/browser/content/browser/preferences/config/tabs-browsing.mjs": "c4a076ea585372ee8a4645956f9db45f67c524c35d221688cb311055ae2eecc2", + "chrome/browser/content/browser/preferences/config/moreFromMozilla.mjs": "826138861a5929945cefd7726605f5405c8fb5fc5f070550376a4546e7a5b280", + "chrome/browser/content/browser/preferences/config/passwords-autofill.mjs": "a8582b887be2e9758aec555536af98c643b34e3766a419115f6c8d905d91bef0", + "chrome/browser/content/browser/preferences/config/permissions-data.mjs": "0c2d1697432c5a77ae95880582c43be9d4febf509cf306cd972d12ef80b68e91", + "chrome/browser/content/browser/preferences/config/privacy.mjs": "d7db52449dbf9546b38d34a0026acee4086f4bd941c046284bc1db1b1165a922", + "chrome/browser/content/browser/preferences/config/search.mjs": "e03250b00455dd00b64db3fbc8c3dd33f3ce7f4173d9498f9a2ae8ce6d3d15ef", + "chrome/browser/content/browser/preferences/config/tabs-browsing.mjs": "e8015ffbf1bf09f37f9c8c9baca45dfbe8178b7064ff9633ebee40dced154d11", "chrome/browser/content/browser/preferences/config/translations.mjs": "2583998247f95ed391f91c77a0df813bd1b266a0eafda3233a13592a2c93baf6", "chrome/browser/content/browser/preferences/dialogs/applicationManager.js": "fbfa374d8b58849531ddfcfb6769b7647789bb1bfc2520663eb1c7054769b200", "chrome/browser/content/browser/preferences/dialogs/applicationManager.xhtml": "44053c3a915bc09cb0568403c0d5ddf2124701528000eb6f2725f57cd67a38e6", "chrome/browser/content/browser/preferences/dialogs/browserLanguages.js": "087cca57ff5c48bfbca7a642b5bc8948c814e6cb822bd2d77ce17ed76c88fa06", - "chrome/browser/content/browser/preferences/dialogs/browserLanguages.xhtml": "3847812068cbc8ae76817160d87ad93188e6ad24aaec59bb8cf60863ecc0ffd5", + "chrome/browser/content/browser/preferences/dialogs/browserLanguages.xhtml": "843f05d86ee1229d9cdedc19f8a6de7657cc6de69b584cf0f03dc0d7e8ea448b", "chrome/browser/content/browser/preferences/dialogs/colors.css": "62cda85cb648d563cb4c78d6ea95919bb3f624c29806f19975d3a1b3aeddd27c", "chrome/browser/content/browser/preferences/dialogs/colors.js": "080479afb85cac8bac5576a7549349e31b33de6418a52cb189d8164b8c55e193", "chrome/browser/content/browser/preferences/dialogs/colors.xhtml": "64878a59bc6b9173fe08021e2482dced32f1ed3568b56bb6cd4b8b85539eca48", @@ -740,18 +764,18 @@ "chrome/browser/content/browser/preferences/dialogs/handlers.css": "0eb16305abf7f0506fc0e8ce5ce3f9f92d1f0070e86e2e0110c5d10285ef1712", "chrome/browser/content/browser/preferences/dialogs/languages.js": "adfdcf601680e76f12638f7e49f19e29113eb97aaa565d5dd1303289c3d1efc1", "chrome/browser/content/browser/preferences/dialogs/languages.xhtml": "f3041a9ec1daea79328810b4a0ddbc9260eb812ff9d8875848390ef400cb20f7", - "chrome/browser/content/browser/preferences/dialogs/permissions.js": "d73e3e796aa67300ced59255c28ab673dd9a5fca1b001b696163b53e4d9a1142", + "chrome/browser/content/browser/preferences/dialogs/permissions.js": "9a65b8756aba9ffa027de860559aa1a9972c3eb8b1dcfb5968993828dd345724", "chrome/browser/content/browser/preferences/dialogs/permissions.xhtml": "02d33d569c2e448d3d9d5c814393817b6b4124adcd5589e5d216942974c5a33e", "chrome/browser/content/browser/preferences/dialogs/selectBookmark.js": "861f1a89cf2ba4711b2a1ced485515817673755b96b8e2d85e7b942b87bf8416", "chrome/browser/content/browser/preferences/dialogs/selectBookmark.xhtml": "6ab9b5934bf16a7b9c03650e13c5ddc8734369a0dde729ebc7e3a46c2ba814ef", "chrome/browser/content/browser/preferences/dialogs/siteContainer.js": "eb4f3a0a04883ee830ac5dc6b2e3ac4709541fbb51e23b0a99c9caae8b2d4e97", "chrome/browser/content/browser/preferences/dialogs/siteContainer.xhtml": "6ae6f2560c9363b77a5b53d7c1f4a7df03c1d8497eb587ae3c81f0a738a2cd45", - "chrome/browser/content/browser/preferences/dialogs/siteDataRemoveSelected.js": "d5030004f945356817791a8b5378b126da49fba0b747c19407132c3a4bc24457", + "chrome/browser/content/browser/preferences/dialogs/siteDataRemoveSelected.js": "36829ada518e17bd7d7762d2bcf32d150fb24e04eb417e33687783d8d3ad17ec", "chrome/browser/content/browser/preferences/dialogs/siteDataRemoveSelected.xhtml": "9c685764eb51fbd32131c517e5ddd570a9dc4005466b695b9fee662189df8106", "chrome/browser/content/browser/preferences/dialogs/siteDataSettings.js": "c3b981fd255f5a8f44f0880c8ee40d5d319c49f34482c95ba1db991a7412889c", "chrome/browser/content/browser/preferences/dialogs/siteDataSettings.xhtml": "d529c3947add6844680600665c2a3f8e8c56e3b1c01ce1fe820b2866c0b34c72", "chrome/browser/content/browser/preferences/dialogs/sitePermissions.css": "7fe2c42d4d1955adbd713a7eb15eb1d815a4b90bab882a8a1341159e944425a7", - "chrome/browser/content/browser/preferences/dialogs/sitePermissions.js": "cb9b8342c21f7a9f61cecdd4a0c9a219e35f1294d25f8c52000ef08e19bf7b17", + "chrome/browser/content/browser/preferences/dialogs/sitePermissions.js": "165ccd487dae447b12b3983221c3103451d9d8d55f42e6e2d2bd9f5fe0170b02", "chrome/browser/content/browser/preferences/dialogs/sitePermissions.xhtml": "02876d1456b37c1bf596fe6c5a50e24eccada6ad64d44cd48f399aaf093433ab", "chrome/browser/content/browser/preferences/dialogs/syncChooseWhatToSync.js": "eba46ee0e4a3ff5e4688501c538e5278d55d321674cb7b143c07a8d7e64dad9c", "chrome/browser/content/browser/preferences/dialogs/syncChooseWhatToSync.xhtml": "edbb06bb560e8f1bb1262e95d3745134e84211dbecb2317cdf9c8110139c6072", @@ -759,17 +783,16 @@ "chrome/browser/content/browser/preferences/etp-advanced-banner.svg": "f7256a0d2e2443b9bfc310b03acb4c32372bc7eb64c44c772555603a4f8e52fb", "chrome/browser/content/browser/preferences/etp-toggle-promo.svg": "9cd389e46280fc0e2d6b425a53c0ba24157254498b2ff498efbb396972e317e6", "chrome/browser/content/browser/preferences/extensionControlled.js": "81064d7a0ab04c50c8a1d0957385b1e9069728f9bd4969a46b09fd4b0fcd540f", - "chrome/browser/content/browser/preferences/findInPage.js": "82542ea70efe5921603804a2b0b64823e01ed829a715c6d20f40d286ad65a45f", + "chrome/browser/content/browser/preferences/findInPage.js": "0639cca491c1726f105f79840631b55be38f203ea2755aefd5ea90e2b3d256a5", "chrome/browser/content/browser/preferences/fxaPairDevice.js": "7163e88ce486a1c96664f61cbc71a5008a2c04bd4d49161ca4dca637660f6a67", "chrome/browser/content/browser/preferences/fxaPairDevice.xhtml": "87e79fcbdfbf46b9b3bb1ca6e3aa8a9d567e9e4cff69e06ca48a542def23257d", - "chrome/browser/content/browser/preferences/home.js": "ffff1ca73a0040ddafe5b8507177d0ec7b9068d5e6ecd8593c28f36355027958", - "chrome/browser/content/browser/preferences/main.js": "3c1f6ab05868728394973ea04fdbf8d29a9c112167c433cf9d01387c4db09e0d", + "chrome/browser/content/browser/preferences/main.js": "51d3bfcd315cde9e53370533b6bff159fbe914ce16b7fb1fc64541b0b6b7b47a", "chrome/browser/content/browser/preferences/more-from-mozilla-qr-code-simple.svg": "b17fa6b449aede9da503e48ef88be5be33a9e7aa35fbb2621bf398872522e989", "chrome/browser/content/browser/preferences/moreFromMozilla.js": "9b505c88e121e055ea0506b95d1ee315b19820868d22bbab3e9afed186ceaad9", - "chrome/browser/content/browser/preferences/preferences.js": "fd41499186618c2da1c6c2fb4fbe0cea410dee26a104107e84f70cc5a2a4979f", - "chrome/browser/content/browser/preferences/preferences.xhtml": "08e8f49e6328df95cd41c5db523d93665bf575768fcfbf4db90d71c23eaa8ae2", - "chrome/browser/content/browser/preferences/privacy.js": "d719411bee4b8a3824ebdf06cc3f33870320ee8b3fd6c9c2deb5473f05fe8c1c", - "chrome/browser/content/browser/preferences/search.js": "0ddeba116c074c3a7638fd429e805e10bd8cbf923d4fce9c99d22b5aa588e199", + "chrome/browser/content/browser/preferences/preferences.js": "993ced6c6c155ca202d522bc34c80104fbe8a4afafd6110097132bc56073e9e9", + "chrome/browser/content/browser/preferences/preferences.xhtml": "2004d9911f6e489a470e46ea2bd48b65a86bae17c1bba887c5d1f03d6e1224de", + "chrome/browser/content/browser/preferences/privacy.js": "1f829fb2b4bacbb1439522df7d69cff19ec724314d99ab9a7561cae417696b4e", + "chrome/browser/content/browser/preferences/search.js": "fa51b5579f24c84c4aa04f189b997bfd6d46959b26bb6e771909d230e6c00908", "chrome/browser/content/browser/preferences/spell-check-promo.svg": "174f4ca11ef22170236a414a6af3515855d82f9aa1912ec05c0604cdd631a84d", "chrome/browser/content/browser/preferences/sync.js": "1023000697d044b521da1280ec2a43508d65596705d60061fe7064e820247215", "chrome/browser/content/browser/preferences/translations.js": "b20d6982169512255280fe9251bb76f3a81ed34cb89257c0ee445f67762ed4c0", @@ -779,16 +802,16 @@ "chrome/browser/content/browser/preferences/widgets/browser-language-restart-message.mjs": "a7833b2cc11356494477c4121f451b62f5a86e0379d8b749516a4d1454fbbc47", "chrome/browser/content/browser/preferences/widgets/dialog-button.mjs": "e8f4ceb1b615f5ea801039ce7c13e985ef51133ea8cfc3c2041c8de61ddf1f81", "chrome/browser/content/browser/preferences/widgets/nav-notice.css": "414e73c7c5ec08c2b297f1de4d5a0534ff35158e8b4c2ec48b9dfc6aad4cd1ce", - "chrome/browser/content/browser/preferences/widgets/nav-notice.mjs": "6cfb8617a4c3ae4e18ebca1a28a99753adf4766bec865c8b382f7400725726ac", + "chrome/browser/content/browser/preferences/widgets/nav-notice.mjs": "73175fee577a3c453c327183dfb81b3779245e09b8b5a26e6ef406672e767cc0", "chrome/browser/content/browser/preferences/widgets/placeholder-message.css": "256e39d004aad28b2adbc83ba5bd3af089759cf145480d35717415515ffdf1f9", "chrome/browser/content/browser/preferences/widgets/placeholder-message.mjs": "d339949d067152fd4d88766a44bd82a6f840b6cc403cc9b11bb640c95ed7e785", "chrome/browser/content/browser/preferences/widgets/security-privacy-card.css": "cfa6c2fa4581946f17b266df1d19a8285ba2cebabbe91a122c6360de870a9d53", "chrome/browser/content/browser/preferences/widgets/security-privacy-card.mjs": "9749c3aa00b7d52e1343d04cf55faf356f0542cf6f7f354d7e8a8cc81e60cf5a", "chrome/browser/content/browser/preferences/widgets/setting-control.css": "f2a2131aa1f943414db56901005db240fb23fa9cf910c137eddea0a15117729d", "chrome/browser/content/browser/preferences/widgets/setting-control.mjs": "48ebc2671c8061998fd8808f359b62596e54a1fd66021613268c239bf028463f", - "chrome/browser/content/browser/preferences/widgets/setting-element.mjs": "798b808c65eac64b74f52de181477a151ad38e6ebae821951f08acbcc566d707", + "chrome/browser/content/browser/preferences/widgets/setting-element.mjs": "2564bbeb6e036f3ef28262cd9ea544c6d6db8b5252605b4f8e134f1383c7e7b0", "chrome/browser/content/browser/preferences/widgets/setting-group.css": "30827d0558ab944c7b4293e8620af8611f2f95a433a68c3b946ed6eeb94b1576", - "chrome/browser/content/browser/preferences/widgets/setting-group.mjs": "2de86b476c2dbc9f7c171c4adeadc81a22cd9742450c162325db0241cb759d7e", + "chrome/browser/content/browser/preferences/widgets/setting-group.mjs": "04ba2fc416adff45d2ad27ed7b30ed8f87ce6c74bde1781d6c9c97af124b70c9", "chrome/browser/content/browser/preferences/widgets/setting-pane.css": "f4b508aa0341f4e5416a4a7754883fef1ebfef3b9ada984f75eaf3443ecf4737", "chrome/browser/content/browser/preferences/widgets/setting-pane.mjs": "6c195e27c433bfb7dd319c32b0dae9dcbdc538ec95941bf5d5875686d3d8ea94", "chrome/browser/content/browser/preferences/widgets/sync-device-name.mjs": "462c1f12a1a3d29c82f1ba4a4064a2f85dd0d45fd73e7c8c5158584f91243499", @@ -800,6 +823,8 @@ "chrome/browser/content/browser/preferences/widgets/update-state.mjs": "dd36968378be4fb73c672b09d89abc91bf329210dc4a0731c6f25c7d10d2c6a7", "chrome/browser/content/browser/privacy-metrics-card.css": "abb038b51dfee4e4c2fa50735be827a8dcd459317d7807b811486befdf669706", "chrome/browser/content/browser/privacy-metrics-card.mjs": "ac92bdd27f000d983d5f25f46c19fbfda5fefcedd48a9b462dbc7d1f925e63f2", + "chrome/browser/content/browser/private-browsing-mask-intro.css": "69346319f99e344db4103b08acf4026adcd6f0457e5c3bd8035bd952e45643bf", + "chrome/browser/content/browser/private-browsing-mask-intro.mjs": "209bbe63a92d26659544f13804df85c0a39e489e2c1c1b374f9596f70f6a436c", "chrome/browser/content/browser/profiles/assets/16_barbell.svg": "4fc2620b1c68b5c4e4da865606a638b7a802315a4c4cb50359e81870be264131", "chrome/browser/content/browser/profiles/assets/16_bike.svg": "440a2b00c0ec2c84cf4b03c4d3a7be66f17a2b71023605417ba067874a9872cc", "chrome/browser/content/browser/profiles/assets/16_book.svg": "4010cf8ea2a52d4c12920699070f4f20255b536ab0724c04d77fcd3b878ae79a", @@ -941,7 +966,7 @@ "chrome/browser/content/browser/profiles/delete-profile-card.mjs": "da33a4a3256aca34f9a7b30c5e3157573ea11e80f239a1b851e0a333e85f58ac", "chrome/browser/content/browser/profiles/delete-profile.html": "96addd26d316d45b002769b5fd308432537a5f866f02c98c538261c340e16aca", "chrome/browser/content/browser/profiles/edit-profile-card.css": "5fbb62b91138bb5647b852849fa5045821accc46cc43090992ab321b24f40936", - "chrome/browser/content/browser/profiles/edit-profile-card.mjs": "c14535174559609d56fb4f515f6295e547f9418f7eedeac9e69eb65d98d0a081", + "chrome/browser/content/browser/profiles/edit-profile-card.mjs": "9ece9807cf2c94789d64a776bd6251cfa04d4286fa70d8a55d7eafcf075f2eee", "chrome/browser/content/browser/profiles/edit-profile.html": "05f65fbd4f514a2cdc3e43d2977daf2120c220bab7c904cf0dc789e1dd0b2207", "chrome/browser/content/browser/profiles/new-profile-card.mjs": "a75b15a65447be8169bb66a9410338a0a5f130ebe9a91fc4060855b45bb01482", "chrome/browser/content/browser/profiles/new-profile.html": "3481fa97492c5585ebd375c91630e7ddc10276343a54fca448030bc871c3b69c", @@ -982,7 +1007,6 @@ "chrome/browser/content/browser/schemas/history.json": "43cceed981c0af1533446055925eab8a82294f6b19cd4a3559e360b123a2cd16", "chrome/browser/content/browser/schemas/menus.json": "c600b7900ff372facba64adc152e747543cdb1c675607f77f3a4c8fde5b0c795", "chrome/browser/content/browser/schemas/menus_child.json": "5bf63e5e0c4a9eb39b4533a9c800d550a8791d6776510ee2669c30738003f169", - "chrome/browser/content/browser/schemas/normandyAddonStudy.json": "fa57fea73a728f3b8901976e439ced54cbb6f6ee1509f96f415fadd695efe705", "chrome/browser/content/browser/schemas/omnibox.json": "09f4da41ac2d37257e7eb31c424e240ec755da0cd687930341ae17d30808de6a", "chrome/browser/content/browser/schemas/pkcs11.json": "9dbf62dad02ff2543046707e3d7d3e491457b9a7d0eb73dd6c7da091d381226a", "chrome/browser/content/browser/schemas/search.json": "1dde77d3e5860b4015c479e3e4be188bf885c124f713195ed8efde2071e7790b", @@ -994,11 +1018,11 @@ "chrome/browser/content/browser/schemas/url_overrides.json": "9c0117e61b3ea3ddd6fbf4e5fcd44271c36b44278e5e4a0168902cdf9edd0eac", "chrome/browser/content/browser/schemas/windows.json": "1e57c42100f351109f179d84a8680e50cfa48050040a94f74d6a955a49477a47", "chrome/browser/content/browser/screenshots/copied-notification.svg": "2fcc782167b277dbf5d124d7406c4ce0cba40029fe2dfb6f3ee36bc84320e3fd", - "chrome/browser/content/browser/screenshots/fileHelpers.mjs": "3f53ca2424e66d61912a08c7a923751dc7b945d126c804a4327afe9675183a10", + "chrome/browser/content/browser/screenshots/fileHelpers.mjs": "8de4ae3b9c7410425c9da8b01b585d5de75b8e77a74802a899062cce2d7cfd25", "chrome/browser/content/browser/screenshots/menu-fullpage.svg": "41dda47b068c5da449cb1593c71a9ee0f18e0e92433657a41299dc5c0c8d81b5", "chrome/browser/content/browser/screenshots/menu-visible.svg": "634f6984b9969cfa785193f13eed935f66c8616eb7913443273ea65fe500ee02", - "chrome/browser/content/browser/screenshots/overlay/overlay.css": "80d5943b0e683b84a915f10d8985fdc27546824a1041635d0b428d4e1c5bef0d", - "chrome/browser/content/browser/screenshots/overlayHelpers.mjs": "f14c0f0fc6177cbcab24bd9608411da864604a93901af12aa1fb6adc9834fc41", + "chrome/browser/content/browser/screenshots/overlay/overlay.css": "0d3c048824f59d5eff411b2ea68ddc62c75da481458cf276553c520416b2e169", + "chrome/browser/content/browser/screenshots/overlayHelpers.mjs": "bc6d8ea13e1dbf1cff39fb11f040f5599396fa727f905c49e49280ac6fc8d963", "chrome/browser/content/browser/screenshots/screenshots-buttons.css": "5bcf7a2578795d4881d03628715d65ae45639a418bcd890d7fc78b53c5d562db", "chrome/browser/content/browser/screenshots/screenshots-buttons.js": "462373b26d2842b73bdc795e59dea7b136fb7d02de57e121bf640a4dd4c04935", "chrome/browser/content/browser/screenshots/screenshots-preview.css": "3155f406c9e94f06f1ff4cfe91bb1e86645473c88d5e23d7b337591d44aa7a99", @@ -1008,13 +1032,13 @@ "chrome/browser/content/browser/search/addEngine.js": "2350708a6e374cc169b434d6aca56191037159afd137841ed5faeb117dd1e5a7", "chrome/browser/content/browser/search/addEngine.xhtml": "bfe0bee781b057be2bc7052e56d076149fb6dbbc12629e76ae6232d2b247986c", "chrome/browser/content/browser/search/autocomplete-popup.js": "2ec63436bb93db19498575f73bcb42fbfdfdea598eaefbd6d44730e069668431", - "chrome/browser/content/browser/search/searchbar.js": "22f39ee0ec6d8e93f4c05a75aa32588e377720f150f29382238ef5ebaf6fbb03", + "chrome/browser/content/browser/search/searchbar.js": "179c406533c4f6442ca78bf029c600f0f2dc0c33e610b3014e1b76a8c9fe0b34", "chrome/browser/content/browser/setDesktopBackground.js": "49747833863093bcd0eaf38ac01a9d0277aa40c6bb2951352dea9547823be734", "chrome/browser/content/browser/setDesktopBackground.xhtml": "bcd264148ccc592c9c5143363f00d40923b67bc37deb77bc7a3fdee9d78a11ff", "chrome/browser/content/browser/sharing/background-dark.svg": "60bd0aa6a067de6289aa2e73a30ff97508bdeed5ee79091716bc4ed0d3e6bb41", "chrome/browser/content/browser/sharing/background-light.svg": "97eb42a9adb9a3e37f758886add9d7b678d23b7db806ac69b8796f41339f581f", "chrome/browser/content/browser/sharing/content-sharing-icon.svg": "2eddca2633ddca0e92b46349db30da0e4007e8f790b4d70a74ebb43cac7cb206", - "chrome/browser/content/browser/sharing/content-sharing-modal.css": "a9554ce2e8104cceab1f9b57d2dc3e48b45f7dd6b98d4f2582e417ba0d3f2470", + "chrome/browser/content/browser/sharing/content-sharing-modal.css": "2929bad54161a259187f88824149ada8e874d3c4e73f66b7f39348c4dbf6e545", "chrome/browser/content/browser/sharing/content-sharing-modal.mjs": "1e9c0a4888f6fa0a3f72b5750659545a5230909eafc142b190b3770ae4c5f08f", "chrome/browser/content/browser/sharing/contentSharingModal.xhtml": "e935da84583559f3d1262d35c10e7722d8460768fe4a2d909e3933a465bfc6ab", "chrome/browser/content/browser/sharing/contentsharing.schema.json": "41762213244d70d3ccfd2f9b156c5f16735d715d9c22c467f4af08709d156e5c", @@ -1022,29 +1046,29 @@ "chrome/browser/content/browser/sharing/mail.svg": "d82cf9772c41c6b149a3b5f7f69d005271c3d6483d02fd227b27aadc9b0d0c73", "chrome/browser/content/browser/sharing/qr-code.svg": "ef786c3b940f21552e01bb91a855771d37a0a855961881c7ecdeb828476420b6", "chrome/browser/content/browser/sharing/share-alt.svg": "aab88c987e7cbb73b4b8ca5659a11a8f6dd834b90e2b15c5219aee54417e33a9", - "chrome/browser/content/browser/sidebar/browser-sidebar.js": "ae1c57d1862e15d1eb848232f10be0b0ec614105c8200e55c068dda8e98e870c", - "chrome/browser/content/browser/sidebar/sidebar-bookmark-list.css": "96eed3c72f6b0ceab85c40ec79d7b5c070fd260678aa7a85aa5c16401b5ff641", - "chrome/browser/content/browser/sidebar/sidebar-bookmark-list.mjs": "b465dfb86a9ba1d20c2a360b1303ef59a02fe11a66b18285dfbaac2722b49c63", + "chrome/browser/content/browser/sidebar/browser-sidebar.js": "3d52684328ad35692768ebe731cbf359592988bcb5fa5adc530516707eea4cb3", + "chrome/browser/content/browser/sidebar/sidebar-bookmark-list.css": "d9367b2f6e59bddedde3c654b60120ec0dda20c33bc209b04ca1487f466f6e83", + "chrome/browser/content/browser/sidebar/sidebar-bookmark-list.mjs": "34610d7322b38c9cc6233a899605f9259e9d6ef8b68e3be08be29a9adc5fd5a2", "chrome/browser/content/browser/sidebar/sidebar-bookmarks.html": "f4e9cf412f99809fbc3bf95ca503f51b8682d4728ca3e8a43aa5818fa9d7c57a", - "chrome/browser/content/browser/sidebar/sidebar-bookmarks.mjs": "bc6e935c41f57cfdcb037afa6ac96460f4deecbb134a8819b5696113c40e9073", + "chrome/browser/content/browser/sidebar/sidebar-bookmarks.mjs": "a225243348ec1b8899de605e49820827d8f2ff194d14867b31357d1da1603713", "chrome/browser/content/browser/sidebar/sidebar-customize.css": "8a683855ae3b3ad496ad7d4befb53b50cc50f85386c0ab9ab6b55f29cbc375ce", "chrome/browser/content/browser/sidebar/sidebar-customize.html": "0d6003c06304d0d37902b10176251a4aa35d931db50b294407c97f72d8ef0ab4", - "chrome/browser/content/browser/sidebar/sidebar-customize.mjs": "0732321135652cdc0c5b8da11f1c97a515cc80f1f86554ca4208969b5825eb62", + "chrome/browser/content/browser/sidebar/sidebar-customize.mjs": "691ba76e880eff018602d2ed786ae8484c593146991c76b12ca795b10a1e8b39", "chrome/browser/content/browser/sidebar/sidebar-history.css": "b83b976ac3ffd50649640215dbab4c64b1a68b0933c55a1e84f342df34266c2b", "chrome/browser/content/browser/sidebar/sidebar-history.html": "b1ab0ed8118b8ba43eee9adee434641c68b673f17f23850a80dabfd7cf84590f", - "chrome/browser/content/browser/sidebar/sidebar-history.mjs": "f9b7b8a019feff1444ca1291db04a3fa8204ce0b74530c47dd4f25ff854695a1", - "chrome/browser/content/browser/sidebar/sidebar-main.css": "54fb45f39f4a6f08872c2d8ea877ac31fc47c960ace5a067dd98a6fa997e41a7", - "chrome/browser/content/browser/sidebar/sidebar-main.mjs": "779337a9eeb1e4e5779928c168ed647b9c4b7677c863acb37488c38c3f758bbd", + "chrome/browser/content/browser/sidebar/sidebar-history.mjs": "60f47841fd2701cbd41b17233dfc1609796e68115cab34d67076545ed1f8f8b4", + "chrome/browser/content/browser/sidebar/sidebar-main.css": "722a814257a8fe58c38901667ea62fd96c64ffb9ef80148d91595e59aef0c8ce", + "chrome/browser/content/browser/sidebar/sidebar-main.mjs": "1859a3404415fd8c2bb4babdec5278387913c2768fe4066186b19dbe1ccd7acf", "chrome/browser/content/browser/sidebar/sidebar-opentabs-preview.css": "caeea7e4ad5b3945bb98a136014e2fcb18f994b0b489bb65a7e096c98c0c777c", "chrome/browser/content/browser/sidebar/sidebar-opentabs-preview.mjs": "c576f748893084938dfe213ae2901a86c72778a0d78eb6b2e90868aaa63b25a5", - "chrome/browser/content/browser/sidebar/sidebar-opentabs.css": "a0ef080842c06ef32c3d611b6acffc99c5f68e296f7a93729a6373a52488f7d8", + "chrome/browser/content/browser/sidebar/sidebar-opentabs.css": "c02d9227d82891f42925bdeb4066bcaeb033a6879180cdbcb6de374fc4482a84", "chrome/browser/content/browser/sidebar/sidebar-opentabs.html": "1dbd47db4e26323d02c78b6f4d568088bbc4d1b7c7a548d23d8f38b2d5cd2ba3", "chrome/browser/content/browser/sidebar/sidebar-opentabs.mjs": "b8d289c28bf1b149680c318ed25c93319d2519911806c017b16c966b988c63c5", "chrome/browser/content/browser/sidebar/sidebar-page.mjs": "8e4a7318af2b39ccca87471bde25883c1078ceac948c4f95bd023f4e7c5a86ea", - "chrome/browser/content/browser/sidebar/sidebar-panel-header.css": "e2d4fcb259fd95dc6a6860c27ccbd319428434f4aa94838a3ef4a31967b15db7", - "chrome/browser/content/browser/sidebar/sidebar-panel-header.mjs": "2906b2df53f71e09d441706a723f4a98cd23ad41fa5273c1a8c85bd992fad40b", + "chrome/browser/content/browser/sidebar/sidebar-panel-header.css": "a729728e2478b4de1b3f107cb89680332f3eaf72676e71f5cd24031d9157da5d", + "chrome/browser/content/browser/sidebar/sidebar-panel-header.mjs": "967092195a2e052b1831f31cf0014dbc3fb5a2e7fbc4679785fccc551410d374", "chrome/browser/content/browser/sidebar/sidebar-panel-switcher.css": "bc461a904615d9418912c5ca0f25cccfebbabe0458e010fed8452718c7699ce8", - "chrome/browser/content/browser/sidebar/sidebar-panel-switcher.mjs": "d91a7e028113d5f00aabd0bb16397aa0e6416db4a181c9899f03ecfe4474466d", + "chrome/browser/content/browser/sidebar/sidebar-panel-switcher.mjs": "4f2fb5d5fc47787a5c0b840a76efbc2722e4cac7faeba856970a568670cb319f", "chrome/browser/content/browser/sidebar/sidebar-permissions-ui.mjs": "6920722e0b6f40fb4cf4b6a5cb4ff88874e20c985f49f1c263bb673eb3c522fc", "chrome/browser/content/browser/sidebar/sidebar-permissions.mjs": "350eceaf14d5517865ff31bea3c4dba7549c86837767c763f567e94b681a4caa", "chrome/browser/content/browser/sidebar/sidebar-pins-promo.css": "43e400af2b892b69c911d346ac142c5d109405dae2363b6d882747ff037f2c0a", @@ -1053,33 +1077,33 @@ "chrome/browser/content/browser/sidebar/sidebar-syncedtabs.mjs": "07847cd78bb1a8a83614dfe0f149d167b4f4b0756172bcb9ac560af4c49c1740", "chrome/browser/content/browser/sidebar/sidebar-tab-list.css": "8417d68515fd2d44b201495cb42cb99aab9e0a04b71dff297af2176259f2d6a9", "chrome/browser/content/browser/sidebar/sidebar-tab-list.mjs": "31bd2cf77f1ef2e9624671e3c20b92983a42907a02eec521d3c8825888c0eace", - "chrome/browser/content/browser/sidebar/sidebar-tab-row.css": "8137c5fefa7976e7ea486ebab2eb7c455ebc492fbdaee94a336453d722402ec8", + "chrome/browser/content/browser/sidebar/sidebar-tab-row.css": "d9d83d04964cd0a90b02aad64112905e06bd22427c6e099ce9a4e87590f6f3e2", "chrome/browser/content/browser/sidebar/sidebar.css": "b7b4e84aa228f3ee452f60186c59565136b3c00ab5a419a5861e06600f168d81", - "chrome/browser/content/browser/spotlight.html": "508dd74b28abb7bd2a84d8fbf353a15cfafa4099757eac361117645ad2497f17", + "chrome/browser/content/browser/spotlight.html": "c52d7ca3acc1a13a988743f0d1db58a56404532cc0c91c5520970ee7998d9c67", "chrome/browser/content/browser/spotlight.js": "31fa15dd9494c731eb24ed238a957d4b84e23dc770f1f32d390a9312d9988784", "chrome/browser/content/browser/static-robot.png": "f37ace30c18644d0f3839f2fda570fe8a69850de3dfd396b64474835e6194719", + "chrome/browser/content/browser/syncedtabs/sidebar.html": "a4f01d1bb783455c1847b7861884407bff01032dd072f249a5c57c7174a49dbc", "chrome/browser/content/browser/syncedtabs/sidebar.js": "ba968d8bd6b0c7ae489a0b29f1662710fcac8afbff466f6a3f0bcf720c0f6e3b", - "chrome/browser/content/browser/syncedtabs/sidebar.xhtml": "c28f345a85a08e95d1b5556c2a707dd7e1a81437ef20b2d3342292629357c35a", "chrome/browser/content/browser/tabbrowser/browser-allTabsMenu.js": "605601c6997a89ac60ac657253bc1a322ed6e0b8cd3e8045b4d2a3f6f739dbb6", - "chrome/browser/content/browser/tabbrowser/browser-ctrlTab.js": "5959812782a2da9fa54e9fada182fa52ebe82357d826adfb9bc2b696f7bc24b9", + "chrome/browser/content/browser/tabbrowser/browser-ctrlTab.js": "414a2183fd8671c0b751081936085978c72c4bf597203d491db8f41fc137b3f0", "chrome/browser/content/browser/tabbrowser/browser-fullZoom.js": "df1dbe6572f4df82394348cef68ab3abed2454f1b444ef9bff7b962b53de5344", - "chrome/browser/content/browser/tabbrowser/drag-and-drop.js": "f92a3222d81bc746c5b3349fc839e0873028efd10aac4aa81b23777b78759c8b", + "chrome/browser/content/browser/tabbrowser/drag-and-drop.js": "3fe942d7d754f0f2446bfd7bee1982726400a362e381becf9c60c22f8b9c80e5", "chrome/browser/content/browser/tabbrowser/opentabs-splitview.css": "372c3329887605fba5ed93c7cbc2197797d4c69bc17a0eba8f107d9ccb7bb7f0", "chrome/browser/content/browser/tabbrowser/opentabs-splitview.mjs": "1a3c5e5882575fd1a13672dfb503d72e960ce9f0c52e0eafd29cc0ec6c040c6e", "chrome/browser/content/browser/tabbrowser/opentabs.css": "2c0dafefec484e653bb857ff7e6702e61ac5eae5279c198db310319f37af5388", "chrome/browser/content/browser/tabbrowser/opentabs.html": "95ef5cf78c039d76ece3b0d3d28bc253ec0e02a47a503f026e1e5f99899f707a", "chrome/browser/content/browser/tabbrowser/split-view-footer.js": "1f1922daa3a549b10f45abc90ee45ae5977ebaca78e0db34883967aa01a8ed8e", "chrome/browser/content/browser/tabbrowser/status-panel.js": "62cee3ccc5091019e2f0c2fca2f899040fdb0b93affc4091cb65879b52d8f1ca", - "chrome/browser/content/browser/tabbrowser/tab-bar-visibility.js": "44c4267a974441edc039467cc07e066b8d8aa20bc45af7e5161b68b16ad54eb5", - "chrome/browser/content/browser/tabbrowser/tab-context-menu.js": "4ddf33663a0b99c3c9ab4cd96783b15e10e24d64177f173464702cc0ce2d0b10", + "chrome/browser/content/browser/tabbrowser/tab-bar-visibility.js": "3c42ebf62af4ad34e8fa2ddd27881aaab6ea463d82681e57fb5d87a6a4862d33", + "chrome/browser/content/browser/tabbrowser/tab-context-menu.js": "6085e824cea37a89310de6f64dcc99804ca100fdfb32a50b877395c54604fc0e", "chrome/browser/content/browser/tabbrowser/tab-groups-list.mjs": "005bc10d7daf3bfd13efa4e9d3ee141ff6746deee1fce300a6e7ef815f7248a3", - "chrome/browser/content/browser/tabbrowser/tab-hover-preview.mjs": "38114e007e223cf2e071a67563e98f6abd8eb2816624cb402dd62005f4f6f958", + "chrome/browser/content/browser/tabbrowser/tab-hover-preview.mjs": "9634921631b79f1b923c831dbe56c5fd62425900f6b893b77d9ae5fd37a39cbf", "chrome/browser/content/browser/tabbrowser/tab.js": "7e2dd4745047a0fbc8d557374592d9cf981f64a8cbdbb5dfd212ffc69b3224a8", - "chrome/browser/content/browser/tabbrowser/tabgroup-menu.js": "4e07b4e64ca1e27237fdcbe06a747a0dc64189bb27acd2dc78ad218a6c869749", - "chrome/browser/content/browser/tabbrowser/tabgroup.js": "49b18638863159de720962c35736f1612bc22e3af5b74000c8143c0126879c94", + "chrome/browser/content/browser/tabbrowser/tabgroup-menu.js": "c6a8220dd1df143253416433382038f1952b4fc9481b1a6e69fd21cc9dc7b296", + "chrome/browser/content/browser/tabbrowser/tabgroup.mjs": "2553fa15bd7fe06ba1be5abea54729083350518120ebdf9399c44bbda17712c2", "chrome/browser/content/browser/tabbrowser/tabnote-menu.js": "cfa4a48bac4881bb3b91f72f29c5cb3d75bdfaef4e2fd307f2f86428b498f160", - "chrome/browser/content/browser/tabbrowser/tabs.js": "676f1a7837144686a577a0b0deafda579a11413feff4637c529083df70389f2b", - "chrome/browser/content/browser/tabbrowser/tabsplitview.js": "ecb4db1e733c19723bcaecf249f478bb7a1e9714a1725b2c8d5b5965712fb36c", + "chrome/browser/content/browser/tabbrowser/tabs.mjs": "461d9d7c5ac16f8093afcebb9eb9db8cffe1b619de4bffe242f1cd79ad4dbcec", + "chrome/browser/content/browser/tabbrowser/tabsplitview.mjs": "e4b16b000ac1ae542ca7b7d9cfe60035f5b92ed3fa9de06176a8ed40597de28e", "chrome/browser/content/browser/tabunloader/aboutUnloads.css": "b81a608efbe003bc157505740a00e193aac69a64ce95b0dfebe927955828da42", "chrome/browser/content/browser/tabunloader/aboutUnloads.html": "080c65ac1c33803bc9a33c530c1d0df9086545badb2218534e83ecf3bf914c2d", "chrome/browser/content/browser/tabunloader/aboutUnloads.js": "feae0121d5829200ffcc1a7574c6e16083c7df1539c70519e921aefb6d3dc2a0", @@ -1088,38 +1112,38 @@ "chrome/browser/content/browser/textrecognition/textrecognition.html": "da70f6d90fe620794f309b4f7a74d845e5c13d6ae501aac28b6c39ae69f4a9fd", "chrome/browser/content/browser/textrecognition/textrecognition.mjs": "ab024093b4094055ce5b34fd3437d1e15ee3f0408940ae44a011cf50ccb1f755", "chrome/browser/content/browser/translations/TranslationsPanelShared.sys.mjs": "709cd70e1e9ab107f56415ce74d61bda5e384a706ae7f70a5ab9c1cf556c28bf", - "chrome/browser/content/browser/translations/fullPageTranslationsPanel.js": "9b4eff22d3202f81bc609a98e9e2ce66c866d29e9f3404b1fe7e8b100f98a993", + "chrome/browser/content/browser/translations/fullPageTranslationsPanel.js": "28b1fde306b23234d2bb71855d39d901c722f6204160900c84ecc869ccfcc154", "chrome/browser/content/browser/translations/selectTranslationsPanel.js": "1eb13e1916d5178e8b9ed1dcacf305444d56fc986bc434b6086ca8b5b3538b7a", - "chrome/browser/content/browser/urlbar/L10nCache.mjs": "d5310992378443906a84b141126032aceba3751d3caae84da6b639b107f55556", - "chrome/browser/content/browser/urlbar/SearchEngineStore.mjs": "b119d60a05e3d49b1be42cb2a6b4281cf68a7f97762981d3f892f914d9b6b34d", - "chrome/browser/content/browser/urlbar/SearchModeSwitcher.mjs": "82ffb95884964723ed293b084f5b6af1ae0477158a88e35c56ad449c69284e59", - "chrome/browser/content/browser/urlbar/SearchbarInput.mjs": "ecdbebff7cf4f522d9fd57d12b1dc1aeea5e55704dd0b0496606d187340b223e", - "chrome/browser/content/browser/urlbar/SmartbarInput.mjs": "8926e29095699a41d0b17f4260ae5c00b3316c432b1e8819173a321db6f5580f", + "chrome/browser/content/browser/urlbar/L10nCache.mjs": "39b4191dc424603f5828d0cce4c0f8d3c368bcf1b1f58538aa3526c5ee421c31", + "chrome/browser/content/browser/urlbar/SearchEngineStore.mjs": "073f365683ac957f70537fa3ca0fbd9c86f80302cde7f1ad4ac056f3c0a2ac44", + "chrome/browser/content/browser/urlbar/SearchModeSwitcher.mjs": "92efaad86a7822ddd87b2232b4abf177ee531690715b2dbe9b83c09b313c6661", + "chrome/browser/content/browser/urlbar/SearchbarInput.mjs": "cb4a97abe74032df4ffa2a98b3633299a71c9b869d11da9af77c4a6f735371fc", + "chrome/browser/content/browser/urlbar/SmartbarInput.mjs": "63100a2f0f44f2096fc2403e26ceaa049b27c1e19c1098b5eeae33022282337a", "chrome/browser/content/browser/urlbar/SmartbarInputController.mjs": "65376916e25e7cd707b1c1f9276e0b37e6c2037362c64880316a6b40adbe275d", - "chrome/browser/content/browser/urlbar/SmartbarInputUtils.mjs": "2dffe923507e191f756c96d82cdcb3d95bf5ae87d6c45494fca9a6f02a3493cf", - "chrome/browser/content/browser/urlbar/UrlbarChildController.mjs": "55589c4aefdee40516dd91a0ea8ab0ed6482aafefbdaa0a8222fe505ddc278cd", - "chrome/browser/content/browser/urlbar/UrlbarChildTelemetry.mjs": "66cf6e8fb07a9d945cbfdb0e7a5c2370af198db3c70d2d69a84f8e8b33049ed7", + "chrome/browser/content/browser/urlbar/SmartbarInputUtils.mjs": "017113e2ea38b000fbafec829359340efd85376687e3dc92516832dc4ac695aa", + "chrome/browser/content/browser/urlbar/UrlbarChildController.mjs": "3bda1a3b420656cbd48f83e56a55a4fb5fedd967356bbb0762d05805a3da30e6", + "chrome/browser/content/browser/urlbar/UrlbarChildTelemetry.mjs": "d0ebf9804327f9d9b1a4294d3801b11d9aa0b928917ce9178c11a5b8a3672290", "chrome/browser/content/browser/urlbar/UrlbarContentPrefs.mjs": "d8ec73846bb3121a54b6090bbb850b29248058934e7c06ffe370d6ea60b801e4", - "chrome/browser/content/browser/urlbar/UrlbarContentUtils.mjs": "a9d115e44e8b2599aed2e176441f85feb14f3b8637c842ea31ddfe7ee6158e7d", + "chrome/browser/content/browser/urlbar/UrlbarContentUtils.mjs": "45d9c8932e5ecea768a7b02823de434f7650968360488a8b33c25a4e79deca2c", "chrome/browser/content/browser/urlbar/UrlbarEventBufferer.mjs": "304e516b3f552a68c7cb3e0fb6abea4b650f0d124a499c5967a9d221f63a4a9d", "chrome/browser/content/browser/urlbar/UrlbarInput.mjs": "1b81135bf2d13be23a4ae4a7360d7cea2c491b5b11ccaf4bf3ff71f6aaa795e8", - "chrome/browser/content/browser/urlbar/UrlbarInputBase.mjs": "b8ac35c469458f61bfd3ca10885076f371412f8bdbb4eeedd6ed04a51f0ec1f7", - "chrome/browser/content/browser/urlbar/UrlbarParentControllerProxy.mjs": "421d4cf94b17db6588cc7be9778ea69edc63df0bec1d89a4264609e19113e6e6", - "chrome/browser/content/browser/urlbar/UrlbarQueryContext.mjs": "fa8b3a444cf56efd9afb61c3e68bc3250d1aa8cf2becbe89dbc804927543010c", - "chrome/browser/content/browser/urlbar/UrlbarResult.mjs": "c6d7f644ee6eea0bc90daa211286b46955853c0f8e8232fb38f8a2b205bfa5a2", - "chrome/browser/content/browser/urlbar/UrlbarShared.mjs": "f155d11c0e547b6e129608a7a98c6fcb2f3bec21243b98f9fb0d9fb9736cb1bb", - "chrome/browser/content/browser/urlbar/UrlbarTelemetryUtils.mjs": "2cbdb00db61b507a70e8304038e174e3d211e7b0b252f6fdbefcc5ce0bf87c55", - "chrome/browser/content/browser/urlbar/UrlbarView.mjs": "04d769eb076be2030c84ef10b9df81578c8883a9c120cc28faf533d74664ea87", + "chrome/browser/content/browser/urlbar/UrlbarInputBase.mjs": "7722256eb3bbea8b3f40f4347ab0064ca72480de16177c1e2b16a4a53d28715f", + "chrome/browser/content/browser/urlbar/UrlbarParentControllerProxy.mjs": "8857161060cfe4c7ec58e9130f6301cffd4dd932774b46c30a3d16210c738e56", + "chrome/browser/content/browser/urlbar/UrlbarQueryContext.mjs": "ae1e3648d4961903589a4f228369ccddb2c595d64c6fc990fd553d2924f2c6de", + "chrome/browser/content/browser/urlbar/UrlbarResult.mjs": "78f42efaebebc97d35a33df2300eed6ddaa42067bac165de6feab5fde91edaf8", + "chrome/browser/content/browser/urlbar/UrlbarShared.mjs": "83f2d0f0913e038be867fd90fcb38c405cbfff371c4e38e582d97573ffdc2cad", + "chrome/browser/content/browser/urlbar/UrlbarTelemetryUtils.mjs": "a39825a566add1d5d7d2ba287592791cf7a77b9faacc78caf8fe6bbfa9b80d13", + "chrome/browser/content/browser/urlbar/UrlbarView.mjs": "eb465c513941b5370296206dc775cfda18d2fe72a9798569eacc1aef716fb238", "chrome/browser/content/browser/usercontext/ContainerCreationPanel.mjs": "5a2921ad459cefc8326c1a215f482e06abe6a52c9cd28046a0775c52df909f55", "chrome/browser/content/browser/usercontext/ContainerEditor.mjs": "a8a57d0536c7e6f7cde110aed12c0bfcc5576ea3cb362b4a4c6d84e9c62d8f4b", "chrome/browser/content/browser/usercontext/container-select.css": "e51a082c24f572ef4b35cb215959b9139636bf38f246b105a7d4aad1064494f9", "chrome/browser/content/browser/usercontext/container-select.mjs": "1fdee989d0e74474b7acb413df5753633ea27147a21daa4ecf880c8e4ce9a0ef", "chrome/browser/content/browser/usercontext/usercontext.css": "70de41d4e1dd8d7c7fbdbdd1e6c60e974f01b7664265802b67b1c80073eec86a", - "chrome/browser/content/browser/utilityOverlay.js": "fdad5de96f002ebdc8c7d0b929f5201c27250de2e8a0765beccee77995835b60", - "chrome/browser/content/browser/vpn-card.mjs": "8c503bf2962ae8455d2a01d00dc9e07bab8e2b73ece9d7b81c8e2c2029f6f8cb", + "chrome/browser/content/browser/utilityOverlay.js": "05c6efa056d69f0ace53aa7bc59a97c36e411759cff1ca83b73f4c91eaa6e1e0", + "chrome/browser/content/browser/vpn-card.mjs": "c91a17396426ad951b7bce089a2cf94f99d2057849cdd42fbe4ebbb1ed8bb320", "chrome/browser/content/browser/webext-panels.css": "10745e919b310ba7fdfc08a43b34566c600f5e83cb7817f2b78ad24d05eaf92f", "chrome/browser/content/browser/webext-panels.js": "8dee72de8be80b5e045de1ec3260cea8b103915e8aa55cc04c48c4f9c36cacd3", - "chrome/browser/content/browser/webext-panels.xhtml": "1a5e4e9185f23b92cbd8986421d220a8009b00de8a55277ab69a9040b2b7e30c", + "chrome/browser/content/browser/webext-panels.xhtml": "8039721ff5e2f5a14fc17b602606dbed9bff8bf09d5c046e0396cafbb2e396ae", "chrome/browser/content/browser/webrtc/webrtc-preview.css": "5b52f43eb41413781576c172db7856cca6ebb062c49b7af67635c07f8d2579ed", "chrome/browser/content/browser/webrtc/webrtc-preview.mjs": "688800d838f14e19b1bf58960ff473c10e8db63621918c4df89e4c64e4f4dbe3", "chrome/browser/content/browser/webrtcIndicator.js": "c0e6b4cf24bce4048a42cdcb3bdfa124d4c8d5ac0b41eeb9551e68fcf26752fc", @@ -1136,7 +1160,7 @@ "chrome/devtools/modules/devtools/client/jsonview/css/json-breadcrumb.css": "3e38ad1f66c0c9e0c274764d54ece40c6604bb59aa23b180d46e0952651e9516", "chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css": "86350049085d60f86becf7b5e9c116feef6d77576c660de070fb50248f2c5f29", "chrome/devtools/modules/devtools/client/jsonview/css/main.css": "f65f308066c5d3e63e1313fd776c22ebdbbead9774f27548d8932667736b543c", - "chrome/devtools/modules/devtools/client/jsonview/css/search-box.css": "7170b25f55cfb9b5029b35d3edbb3c1ef780504bd417523666df4bcea483c30b", + "chrome/devtools/modules/devtools/client/jsonview/css/search-box.css": "0931876606fde0e56686784a61ca60170772d2807828630f7ed4dec08c981863", "chrome/devtools/modules/devtools/client/jsonview/css/text-panel.css": "c13a2426560383372810c43b4972be840ef750b7b5258ce60f71e07fea6f9f80", "chrome/devtools/modules/devtools/client/jsonview/css/toolbar.css": "bf641e089966acb715f024ea495a70f5dad0849b51646104a35e20ca9a07b101" }, @@ -1155,11 +1179,11 @@ "chrome/browser/builtin-addons/formautofill/api.js": "f1933a30f201a669e5c8c3d3406cb977d7a2e004570a1bde9dc5efcbe24fb4ad", "chrome/browser/builtin-addons/formautofill/background.js": "68b642ba65e0b799d9f540c91657d95da9ee1ca4e06153dc38267563798f48d9", "chrome/browser/builtin-addons/formautofill/content/addressFormLayout.mjs": "38ccabd4ef149ac0cdb4d367c86cf304f2af898116ec13153d8e83aec0684297", - "chrome/browser/builtin-addons/formautofill/content/autofillEditForms.mjs": "3c2a55e9bfcfe96e2ad0d28fb337dc4769d7a04f4fbd2a423c4ea2f263414b46", + "chrome/browser/builtin-addons/formautofill/content/autofillEditForms.mjs": "cd5329e528571336af3fa2729427b8721b80b3b2bba335d86a0d711b899268e6", "chrome/browser/builtin-addons/formautofill/content/editAddress.mjs": "934f127977d998401f27a99968702fda4770307b5fc52b5872c037652b6eff67", "chrome/browser/builtin-addons/formautofill/content/editAddress.xhtml": "251d2a48fe194ddb7a1c1156536da47fc6005c7af0c4767e55139a5cdd35037c", "chrome/browser/builtin-addons/formautofill/content/editCreditCard.mjs": "836f151bf2b3431a028aa6d1599fef03b047434eff2b9caa6db5ba030e712ce3", - "chrome/browser/builtin-addons/formautofill/content/editCreditCard.xhtml": "afa2b4d7082bd7974835d1f5d31617fe35374d075741fee1246c71e5e95d3158", + "chrome/browser/builtin-addons/formautofill/content/editCreditCard.xhtml": "6af7b86c1bfcc91d35e327fd9fd36e9c09686c9172e551d77c7c6521a88a7d2c", "chrome/browser/builtin-addons/formautofill/content/editDialog.mjs": "5988bda7cb7c72f593eae0a06c461a08c77728daca1b3396ff78d7fa6bb3b57a", "chrome/browser/builtin-addons/formautofill/content/editPassport.mjs": "ddd25704a3518c24fff88207211cbcea76aaa26ab931b0c4a4929a0b871555fb", "chrome/browser/builtin-addons/formautofill/content/editPassport.xhtml": "97e19082fcfcc2634667bb4c27f9c558cf169245f2b2231b444eefa95ec64b6b", @@ -1171,9 +1195,9 @@ "chrome/browser/builtin-addons/formautofill/content/manageCreditCards.mjs": "2af804270c7ebf3a77a7e7b4ca4b6e3a180d8836fe4f3adda3fe2f744616429d", "chrome/browser/builtin-addons/formautofill/content/manageCreditCards.xhtml": "09426774692183b6ec9b98476771a2649fe25d1844be637040b5a6147c43b18d", "chrome/browser/builtin-addons/formautofill/content/manageDialog.css": "0374563fb6e75a42a4604cf613ab2603c6b4d80daf00f413e40bf022e88955c7", - "chrome/browser/builtin-addons/formautofill/content/manageDialog.mjs": "078dd1eb1d7c77851daff59c0f75138e2d91e76fd26cbfb237f0a0591dfe672e", + "chrome/browser/builtin-addons/formautofill/content/manageDialog.mjs": "6c949eb7a1d41d170b479d216ab2f6273bca4a3b944062622adf4c55bd2883e0", "chrome/browser/builtin-addons/formautofill/content/skin/editAddress.css": "aeaad412fbb32c04260ba5371a03ef5cf120274bfdb52dc664cd6e9c23a3e1e5", - "chrome/browser/builtin-addons/formautofill/content/skin/editCreditCard.css": "6e72c04665b5dfb2763e2bb031e3a608ccd565c2e67d9c92e5bc3752e603ac15", + "chrome/browser/builtin-addons/formautofill/content/skin/editCreditCard.css": "58d69d3abdc2b1951bac8393eb926b8a4acd5e15a90655be162fa4f6f8c01e19", "chrome/browser/builtin-addons/formautofill/content/skin/editDialog-shared.css": "761221b8de1ea7ea184c33dbdc25712d5a9ac20cd9eec6c5a30a9373e45d3fa2", "chrome/browser/builtin-addons/formautofill/content/skin/editPassport.css": "de23b32729f46db0d71af9df4b136be4a8a07900844336563c69b8712559fc7c", "chrome/browser/builtin-addons/formautofill/content/third-party/cc-logo-amex.png": "b8d367bed8eba153a6060abda35b9a8cff1cf209b90f4c8fad0c759ad2fe245e", @@ -1190,7 +1214,7 @@ "chrome/browser/builtin-addons/formautofill/content/third-party/cc-logo-visa.svg": "ad7119992bc1a213c01da0830eee5708b79dde3101274bb27a003b3af30d1afc", "chrome/browser/builtin-addons/formautofill/manifest.json": "29052208552bbfc97816afa009d795382d7a91cebc93d10d9f454056b65ccf82", "chrome/browser/builtin-addons/formautofill/schema.json": "37517e5f3dc66819f61f5a7bb8ace1921282415f10551d2defa5c3eb0985b570", - "chrome/browser/builtin-addons/ipp-activator/api/parent/ext-ipp.js": "bdbed49daa8f67077b9c197575da93650a28cdb3a8dcee10ef209cb64b0715c1", + "chrome/browser/builtin-addons/ipp-activator/api/parent/ext-ipp.js": "d806eca1389aaf3078a0f99a1244440ac24ad59ce8385e94c3ad177a644ebdc4", "chrome/browser/builtin-addons/ipp-activator/api/schemas/ipp.json": "d2acc75518940a29de4cf510371e0bec4027e2b1707b4fcc61ef0cfeb81a3f1b", "chrome/browser/builtin-addons/ipp-activator/bg.js": "26d2dc2eaaed85a7257cc0dedd86835954e73efda31681a395573d7a7d3c99a0", "chrome/browser/builtin-addons/ipp-activator/breakages/tab.json": "a1eb560d3ba4497f82b9008194f69245128b01f80faa7a973a33f586b5d86c6f", @@ -1206,31 +1230,31 @@ "chrome/browser/builtin-addons/ipp-activator/conditions/url.js": "6d77ac8471c12bece22a694b84b83701f5ab81871ec4374958b5504432ae0c77", "chrome/browser/builtin-addons/ipp-activator/conditions/vpn.js": "dc1a18b061906fee6e729c184f32f902f0a25c609ec49b9c15cfd2bfe76083c2", "chrome/browser/builtin-addons/ipp-activator/manifest.json": "a916b6bfe2a13fbde85ad50cd97fec8997ae86e3f0d8f0805230c3a92147cb75", - "chrome/browser/builtin-addons/newtab/common/Actions.mjs": "edef27112e9f3d6d530b863049bec72a878aaa31c461ca860939a52cc8db2353", - "chrome/browser/builtin-addons/newtab/common/PageLayoutVariants.mjs": "e313c85b8fd31f952366c2b7c5126c561c68926e522fb36418effb0e19c97e53", - "chrome/browser/builtin-addons/newtab/common/Reducers.sys.mjs": "2bad99a493011b6dc3ada543d11ddadf8047f275e6a2ad84a75aa62cd821065d", + "chrome/browser/builtin-addons/newtab/common/Actions.mjs": "983532de42f33843132989ac0fe45f3339028ad48c9fa1069cec644461151ef2", + "chrome/browser/builtin-addons/newtab/common/PageLayoutVariants.mjs": "0001e05739882a19560bbf1425284ff878e58abd19e4038d75f4e731207965d0", + "chrome/browser/builtin-addons/newtab/common/Reducers.sys.mjs": "1c9b969f8ad340f28263bac2293a0036c758e478c5b5407c179801bfc89cc3d8", "chrome/browser/builtin-addons/newtab/common/StocksWatchlist.mjs": "0e80e0fb4853e50151a9ca7c701d6da44fb859697bf941439a6c25e3d77f92aa", - "chrome/browser/builtin-addons/newtab/common/WidgetsRegistry.mjs": "f50b212a59ed233a1de83cd7267b51261b22489ad1176d40910820c88d70147a", - "chrome/browser/builtin-addons/newtab/data/content/abouthomecache/page.html.template": "71c248d472ba1a9f93ef2ffacc41b9dc3d88420102bfb9262224f81c27149c01", + "chrome/browser/builtin-addons/newtab/common/WidgetsRegistry.mjs": "945f285a2f38f912abf03cdba2c55e360fddc2ba3fe0e8d47b6fa371cf1eeb42", + "chrome/browser/builtin-addons/newtab/data/content/abouthomecache/page.html.template": "88a08cb680f1edf1a5594399892522db8d3aed5474cf9e5f92fcc99a33913ed8", "chrome/browser/builtin-addons/newtab/data/content/abouthomecache/script.js.template": "6aa18363d2a9e6869a93edfb73679e0de4ac0493d332d02b3371d3fe309cf2a8", - "chrome/browser/builtin-addons/newtab/data/content/activity-stream.bundle.js": "db9e3fdf24d03364f3773203f0699d03e64eb27af823ba6f95075488f2076663", + "chrome/browser/builtin-addons/newtab/data/content/activity-stream.bundle.js": "e34788166032cdee26611d95c161ca80104baec048d4cd6db7493899534aaf3e", "chrome/browser/builtin-addons/newtab/data/content/bundled-renderer-index.js": "1406078a39468102e3a0da5333a83d50534a62ecb18d23fea9a767f3e898bfc8", "chrome/browser/builtin-addons/newtab/data/content/bundled-renderer.css": "c631e1f856beb946b22713ca51ff754a70ba676bc3eaa04f3dfef2617b16faae", "chrome/browser/builtin-addons/newtab/data/content/newtab-render.js": "321ab2dcd28f7accbd8bae417b2651ce320f4a4f101675428700a4332476d235", "chrome/browser/builtin-addons/newtab/data/content/remote-renderer-host.html": "2e66cbe7d1807a0511327a3a936f8b4d8c45a4a38d6c77ff98364d4f3403a572", - "chrome/browser/builtin-addons/newtab/data/content/vendor.bundle.js": "1ec1fc0eb28f6fee179387af9d08ee83d98fa626aa7e5a5616c7940174f25418", - "chrome/browser/builtin-addons/newtab/data/css/activity-stream.css": "6de3d989860434f6ec8c45114ab6f5af98d635f080a68e115f3a5e9eee7cda82", - "chrome/browser/builtin-addons/newtab/data/css/nova/activity-stream.css": "80ac54548ca07cc577f4719cc9db8d131c753e98606d28691ff420c39baa1925", + "chrome/browser/builtin-addons/newtab/data/content/vendor.bundle.js": "c8f60c1c070a77a97851f50ffa80248d10fd512e5b4d39d3f026f338fef4d8d6", + "chrome/browser/builtin-addons/newtab/data/css/activity-stream.css": "3660035c2e1c8a8cda9b8088d5ea82ab3620c34356922d4d8156d98b343e944f", + "chrome/browser/builtin-addons/newtab/data/css/nova/activity-stream.css": "9b2e4857f88dd83dfde8c89832de542e727b0791fa1db15cc7381b6f0b75b902", "chrome/browser/builtin-addons/newtab/data/data/content/assets/arrow-clockwise-16.svg": "6998e010f11498c3bb302f3d59c644ba56f883030aa28e8da7915d469302660c", "chrome/browser/builtin-addons/newtab/data/data/content/assets/download-qr-code-var-a.png": "11ffdfd0965e0ebf9135c4830a0b3ff9ecb159dc9c7a99a8f5c8d78897c051b6", "chrome/browser/builtin-addons/newtab/data/data/content/assets/download-qr-code-var-b.png": "342f1dba0ea37115ed922526e9750b98376a1564c111f78755e081901fc84c96", "chrome/browser/builtin-addons/newtab/data/data/content/assets/download-qr-code-var-c.png": "f753cb5b05288af65b1b28fd2e900dba269f1158775c30d59084f56c5020cd2b", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-dark-narrow.svg": "5b82a09d32977d59f0ad8eb8f05f8524b68c701639d9470a0923f82916c46c2d", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-dark-responsive.svg": "3869ea4d3eb090252de9c74289257299f54ab66a6b212cea2cb8cab9cb9a2760", - "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-dark.svg": "8edc59d104fe365b5fe9f1dc603d444f10050149c6ba80002f007387270c8b7a", + "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-dark.svg": "82c68df0d090f2668531f10a25c4d8545290ed0840406705ec8b7731c13ae54d", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-light-narrow.svg": "804107a43f17a7e6ea13bc0f7ba9f53b5b4753e8965c94b6aa411ba492655e0c", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-light-responsive.svg": "1f824cae7cec505ed17dd256636b3098d6fa11d932191f2a15b03237e7ebfed5", - "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-light.svg": "7a4bb0804b7ddc2898b2e8b7b7ae03c53412112de055b97dc29505f9f265ee7b", + "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-heart-light.svg": "f48f20092b123d36408ade00b3015eff82d3272a582661e6d281ac68d50b54ea", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-mascot-prop-paintbucket-rgb.svg": "fe375718daae7f7da0a72e52a09cd3b75c8006caca12b473d15ee6f719ca42b9", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox-motion-head-pop-up-no-bg.svg": "b39fc55824cb7e6f6e293c6008ee5d7d3d424378c8c7f27cf64afce7dd9c7a0b", "chrome/browser/builtin-addons/newtab/data/data/content/assets/firefox.svg": "e477e1f25b0bd9ccc2055c341bde968490084ca276677188288e3b051ec9b9c7", @@ -1260,6 +1284,7 @@ "chrome/browser/builtin-addons/newtab/data/data/content/assets/kit-default.png": "48c0661dc1e157810911e6452c8ed34338b59346b79c6ed3515300b78f79755d", "chrome/browser/builtin-addons/newtab/data/data/content/assets/kit-default.webm": "05b52d556302fb42864f308d23c667c5822c0294a30aac769502d2a499430d18", "chrome/browser/builtin-addons/newtab/data/data/content/assets/kit-in-circle.svg": "44719c4d1a387d70288fb1e9a0809b46ea75dd784e0325d31d9b3d8626aac7cb", + "chrome/browser/builtin-addons/newtab/data/data/content/assets/kit-stocks-watchlist.svg": "12056ec80eb2ab2c075d36837108c33b9ae93c9a998b5c37991e43b753c5b9fe", "chrome/browser/builtin-addons/newtab/data/data/content/assets/kit.png": "f793e5f18af6dc9b203ff7b6a4e032d64d57df30804b1237e20a97ccd122561f", "chrome/browser/builtin-addons/newtab/data/data/content/assets/lists-empty-state-comet.svg": "df09274c910b746459dbbde8d3bd96f7d42b865c02be7d24729d1091cba0d007", "chrome/browser/builtin-addons/newtab/data/data/content/assets/lists-empty-state-dark.svg": "72aa52e19e090f881468f9d503160bd7480bad0530a452e1726978a85565b54e", @@ -1283,7 +1308,7 @@ "chrome/browser/builtin-addons/newtab/data/data/content/assets/wallpapers/light-sky.avif": "5190192b009b6645fe3c0fba17ea6d7d5895654c39c09f3dc3fbf72583ca5546", "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-message.png": "97c98b74fbfcadb8702f798b7fa2a735852af425758974ab14e72a6d57b0cc06", "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-bolt.svg": "29c8dbfdbed4f36d930312b3558620554d198b3bcfb389449e49937ed07c913d", - "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-etp-off.svg": "66599ad1abc5958c5ff40f0ca6a45a20c1ed8724db3da9ad6040e4df459586db", + "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-etp-off.svg": "24aa05e890c3d2d62f12e9c9e055a016261b2d5cf643a311ac8681267c59b169", "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-kit.svg": "0d5ea856608870bdea0ee6c5da965ffa202e73be4e171b57147c0d80a27e1235", "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-planet.svg": "ed15ea0558982620c2331e509a5246fb6cc8ec6edcbe0dd5fcd9e5ef6b24b35d", "chrome/browser/builtin-addons/newtab/data/data/content/assets/widget-privacy-shield-check.svg": "bb8dd2e5e0b1f770af1d32c0eec62795f9114adbf15cb734b9d04e9f83c45b2e", @@ -1297,18 +1322,18 @@ "chrome/browser/builtin-addons/newtab/data/data/content/assets/worldcup-medium.webm": "c14c80b61384a41bb3d3b7dc401d19d94ad74a7aebb4ebd563325b4898bc1c40", "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-message/ASRouterNewTabMessageChild.sys.mjs": "d414313a47e24c01e177ae5df0764144897044955c9b02f91af8edf2b37345fa", "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-message/ASRouterNewTabMessageParent.sys.mjs": "d66f2323dcc235a82b765e3a96d489257ebc88ff399617c42c4a9d7cecfdd062", - "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-message/asrouter-newtab-message.css": "3cf8097c14145bade5daef2fad4a4aafc4c52f6ffcfd4cb477a1cd6738551f2d", + "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-message/asrouter-newtab-message.css": "d553248b933f80365f478c01e5c8db7390ed10b487892e313960fef1c5db6753", "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-message/asrouter-newtab-message.mjs": "642f561a14caffb61a493b93702d86052596e0a884a15c97bf215752ede59d9e", - "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-multistage/asrouter-newtab-multistage.bundle.js": "6b464c225ed973e27559833ae9c79512b8ae6bf8d99b73f8cd36ae7e82f5f45d", - "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-multistage/asrouter-newtab-multistage.css": "363489abc080a3fe2e8fca559561ff248ab9c1ef2f99fa8b431957705fc485f0", - "chrome/browser/builtin-addons/newtab/lib/AboutPreferences.sys.mjs": "f42615cc022756b3f857305fab6728361d4969196cd0db8f508563772ab59c1c", - "chrome/browser/builtin-addons/newtab/lib/ActivityStream.sys.mjs": "6d713113f28a3949e96d4e8719742a9b2052653ad77f1706ef4344e245399bb9", + "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-multistage/asrouter-newtab-multistage.bundle.js": "a2cbdae8b89f73ef3f5215659393024c404bf7dff6968bc892fc19104e66b025", + "chrome/browser/builtin-addons/newtab/data/data/content/external-components/asrouter-newtab-multistage/asrouter-newtab-multistage.css": "d99b5e11beeed648ac0df274a3728431475643bce3b6641f9fe845bbba342e0c", + "chrome/browser/builtin-addons/newtab/lib/AboutPreferences.sys.mjs": "ba872ffa1bb19028459bb8176e65e4ea047e8293be19dbcb67f05d02a1c21b6a", + "chrome/browser/builtin-addons/newtab/lib/ActivityStream.sys.mjs": "c065e724433d3e4fa17a31a3f184538f18fe9a0ad3e52f7b5ebd1135d9318bf0", "chrome/browser/builtin-addons/newtab/lib/ActivityStreamMessageChannel.sys.mjs": "d9dc982d7a7a6c7c2baea6a24b4b3f23aadb030e7978c19a477158810b4d1627", "chrome/browser/builtin-addons/newtab/lib/ActivityStreamPrefs.sys.mjs": "c762ee679968056e3fe61517b3b76945ec3bc00587ad9a9fc64ddb522301ba3f", - "chrome/browser/builtin-addons/newtab/lib/AdsClient.sys.mjs": "0bbe1fce72259f5ce6ff4554097956c9c8cced3d93ba0db97b1da75cbc593292", - "chrome/browser/builtin-addons/newtab/lib/AdsFeed.sys.mjs": "3d33c2b4617b8c10397e0c6d58d49e6f1981e07894cf7c385c850332b613d3d0", + "chrome/browser/builtin-addons/newtab/lib/AdsClient.sys.mjs": "7a39190b918f44bc3037677792441e348f366b8ede82574b46c5890d32e11dfb", + "chrome/browser/builtin-addons/newtab/lib/AdsFeed.sys.mjs": "b8b8589fda9a774bbf6b30ac757a16c5dc85eb36154a2201df9438ab1cd70322", "chrome/browser/builtin-addons/newtab/lib/DefaultSites.sys.mjs": "bb12d78e3957e57cf12bcc7e4bbb521df955ad96fefa4319c114ad3320b9cdb8", - "chrome/browser/builtin-addons/newtab/lib/DiscoveryStreamFeed.sys.mjs": "bc273c16ce74d3ca5d26ff0810624e054111cf3969fcf3d0d350bf2d697bb579", + "chrome/browser/builtin-addons/newtab/lib/DiscoveryStreamFeed.sys.mjs": "04db644e868b839c8940de08bb4db13037a66ed8ef2cf9a2105f99ffb3560a0c", "chrome/browser/builtin-addons/newtab/lib/DownloadsManager.sys.mjs": "6bf116f7d2acf17a51af63f87ae26356b560608cc78e76101f9860f340041ccf", "chrome/browser/builtin-addons/newtab/lib/ExternalComponentsFeed.sys.mjs": "86ecfe55ecd4ee041a4b6deda517e2dc4ecee399328dcef303c681d6f1fe4272", "chrome/browser/builtin-addons/newtab/lib/FaviconFeed.sys.mjs": "f06ed0d0395348ff3fe9b55e447e251d7b824ebe1d3a448ec81ae27e3b65dc5b", @@ -1322,49 +1347,52 @@ "chrome/browser/builtin-addons/newtab/lib/NewTabActorRegistry.sys.mjs": "9f0a15a084bc956fe7a222a4949079f8ce7656e0767aad14ccdcb5c286c32c32", "chrome/browser/builtin-addons/newtab/lib/NewTabAttributionFeed.sys.mjs": "eb77b5e2f81e9216df40c7585895f265e823161f70c62b32301f1ad89475687b", "chrome/browser/builtin-addons/newtab/lib/NewTabAttributionService.sys.mjs": "4cb2f3a5480660d2b44bf54dc54062d742bf79a04935e8101272a14100d681aa", - "chrome/browser/builtin-addons/newtab/lib/NewTabContentPing.sys.mjs": "2db9a6c15bd4c67ab6813ed06d95c376f303e58cba0ec99dcf52aae51f88775b", + "chrome/browser/builtin-addons/newtab/lib/NewTabContentPing.sys.mjs": "5bf37655564a8e598a5ef6eda4c01205c9138773ee186ec45637c6b00da2e7e3", "chrome/browser/builtin-addons/newtab/lib/NewTabGleanUtils.sys.mjs": "d8ccd0342ec5bb45c260ac6642708728d99c7a9ae6aa00719e8f5921f93a08be", "chrome/browser/builtin-addons/newtab/lib/NewTabInit.sys.mjs": "5cf30aecd70ac990a721fb219ff9745ad8035630f3ae51f52019979017bda437", "chrome/browser/builtin-addons/newtab/lib/NewTabMessaging.sys.mjs": "b678d60b0fa44f521e65d9e8577bbd9b1195f6365f055c7c48f6e03541e6cd54", "chrome/browser/builtin-addons/newtab/lib/PersistentCache.sys.mjs": "04eafbd27ecd2d847d327acdb9cd430a7a439179f1f07ffef06727107decda1a", - "chrome/browser/builtin-addons/newtab/lib/PlacesFeed.sys.mjs": "90ac4c3598f638cf0dd4ce83c27d1193f1a75e3d0c83b3116d823f35946fef2a", - "chrome/browser/builtin-addons/newtab/lib/PrefsFeed.sys.mjs": "ff0d1afd5b2058c76a7d18f57c3fc9700cbbd60b3b33614db2ac8b3033b72a64", + "chrome/browser/builtin-addons/newtab/lib/PlacesFeed.sys.mjs": "f532969f675e5fba2fdaf514d48386b80ada2925e2ad1c25663b99c9cca6464c", + "chrome/browser/builtin-addons/newtab/lib/PrefsFeed.sys.mjs": "a0a4af3bf4b09955860df2d5d8456f9aff4965de6e49b39db4211d9e893c7de1", "chrome/browser/builtin-addons/newtab/lib/RemoteRenderer.sys.mjs": "07f33c33e308e0d836e467aae6aa203215d4fa60e14b8a13ae7d31789113fab1", "chrome/browser/builtin-addons/newtab/lib/Screenshots.sys.mjs": "202ab1769bf0d0c091c35f95c3acc624b0cc469c30b03ae29f7ce76b53def0d3", "chrome/browser/builtin-addons/newtab/lib/SectionsLayoutFeed.sys.mjs": "a2d8f4f5672143b160c1de0c2d5062b021c4ed70d91f64fd1bad5348d2731a50", - "chrome/browser/builtin-addons/newtab/lib/SectionsManager.sys.mjs": "deb5bb35e0d2ec7de52a466e380c42fe842223f9a605ded530bfd4106ed7e69f", + "chrome/browser/builtin-addons/newtab/lib/SectionsManager.sys.mjs": "5b954b4728cd69810e4e594bb75b92fdf49d5c398e56b05b6ab6fb58ad4c19b5", "chrome/browser/builtin-addons/newtab/lib/SiteClassifier.sys.mjs": "5cafa8c2dfe5295ee06f5fc7ad473faad7ab653c9f2b036a186c158137260c7a", "chrome/browser/builtin-addons/newtab/lib/SmartShortcutsFeed.sys.mjs": "d36f6a8df145ccbc99917d8fcfd9c8ebdc4377030bad8add387f1b99a11ef66b", "chrome/browser/builtin-addons/newtab/lib/SmartShortcutsRanker/RankShortcuts.mjs": "b32a5a0dca655f1b152a74d7cbf62e3a254c1bb9f06bb570716448ecead92874", "chrome/browser/builtin-addons/newtab/lib/SmartShortcutsRanker/RankShortcuts.worker.mjs": "341e95f7fe29d3574b43d6e0d89ccaad65c6f2b6b01022994d24685309bf7060", "chrome/browser/builtin-addons/newtab/lib/SmartShortcutsRanker/RankShortcutsWorkerClass.mjs": "b1e87a0e92c1c6877f6e12e63208cf78f3e1c45fcdd6337f5b6687a7c5cf588f", "chrome/browser/builtin-addons/newtab/lib/SmartShortcutsRanker/ThomSample.mjs": "2809f33072c5e83e4f35628f553c7adb9e915833ad1625a18bb20bde81617e66", + "chrome/browser/builtin-addons/newtab/lib/SponsoredTopSitesScoreProvider/SponsoredTopSitesScoreProvider.mjs": "07d09d670d7feedbf37419dbdfdf60f57b3d9e9a6166dd081e10ec2337b84442", "chrome/browser/builtin-addons/newtab/lib/StartupCacheInit.sys.mjs": "87b5e6b5fd90feee10f195f01ee6e57b7653fc4b40e4dec0a98afd76e3be1372", - "chrome/browser/builtin-addons/newtab/lib/Store.sys.mjs": "cfe05370e5bb0aab8a4c3106ad4b8a06262f510cf8beb1ed3e6a7e54539d108c", + "chrome/browser/builtin-addons/newtab/lib/Store.sys.mjs": "5a63b8aa45937dd207dfeb2c583169aedcf50ba14b824fa0b2ccb7e22ef46719", "chrome/browser/builtin-addons/newtab/lib/SystemTickFeed.sys.mjs": "ef1339896ae961216c7a5630f185bf66da4af78a03d36195b09abc6c8748ddbd", - "chrome/browser/builtin-addons/newtab/lib/TelemetryFeed.sys.mjs": "f16a71cc9b3add552d4f98975dd0b337bedf868187e2747a12ca8cddf9402ec8", + "chrome/browser/builtin-addons/newtab/lib/TelemetryFeed.sys.mjs": "38532a07dfe0dbce440f5df5f6b764595cabba60002690beac98357ebef25fe4", "chrome/browser/builtin-addons/newtab/lib/TemporaryMerinoClientShim.sys.mjs": "b265b03828c5a9d28e31f5fac7e05490bed4941e76c85afe85b8bf66ac52b2a4", - "chrome/browser/builtin-addons/newtab/lib/TopSitesFeed.sys.mjs": "0fe69e827f83eaa736b8809f0f011b9c70f47dbc18c8a9ff930eab47e7cc11ed", + "chrome/browser/builtin-addons/newtab/lib/TopSitesFeed.sys.mjs": "69ead8c613e08de737aec16e7f932871d41744f315c6802d22e3640921dcfd88", "chrome/browser/builtin-addons/newtab/lib/TopStoriesFeed.sys.mjs": "39f015735cce2c4eba5f844a0b1a59e8b7cc5a20086ea8d2ce1a3dc85c888aab", - "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs": "8970d8a18a9f3414c6bee2da306eb1de902b5f61380653ec89fab2655f8609e4", - "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperThemeUtils.mjs": "4e4ffbdb4d8a46a34afe4e90d2f30b13a142806bb0d71d42d3731bd638ae0d1a", + "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperFeed.sys.mjs": "6025488da433e671f6b340d76641c77dac62a0627b4af6df0138a021f88e3b88", + "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperFileNames.mjs": "bd62db48f67f1d47d3e249422ac7173e82d61cc95baed10fd4b84b4671d5d398", + "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperLibraryPref.mjs": "54049311cf5fe60b86f99a8499cf87eb17c1caa8d5546dc6002b4eebee8b087f", + "chrome/browser/builtin-addons/newtab/lib/Wallpapers/WallpaperThemeUtils.mjs": "59b61a710e510aad92a59c3fbbd9dd46fbf42123db89bcab86ed9b28632b8945", "chrome/browser/builtin-addons/newtab/lib/WeatherFeed.sys.mjs": "3726e56fb853b83751ea21820536a9a54661f504ff3b3d38705c51104ad67a0e", "chrome/browser/builtin-addons/newtab/lib/WebNotificationsFeed.sys.mjs": "3c2504e2dc2467de1d76d729cd44f2a1006ba2a85bc46078e89bef22b359b440", "chrome/browser/builtin-addons/newtab/lib/Widgets/ListsFeed.sys.mjs": "e6b156bf062e2d3a9d99843f39af4aa07c5d20ae9cb7080ce94132be20642c0b", - "chrome/browser/builtin-addons/newtab/lib/Widgets/PictureOfTheDayFeed.sys.mjs": "63f360f746bc54acc98ef2cc7c22452474488405b36f2f6e92db81480ecd8bcb", + "chrome/browser/builtin-addons/newtab/lib/Widgets/PictureOfTheDayFeed.sys.mjs": "b5db0fc97500a5f413e00031593d81ee2e3c1ffbedfe2ae735638be4bf1dd8eb", "chrome/browser/builtin-addons/newtab/lib/Widgets/PrivacyFeed.sys.mjs": "923f0ce267e086abef41eceaddf833e8ef7a0a1e65861c91721e4098e04bd9e5", - "chrome/browser/builtin-addons/newtab/lib/Widgets/PrivacyMessages.sys.mjs": "58d9410226e7b430b28f1bcbe6ed9d392d1dbd0aa3658007d4f2c333a8ad00ba", - "chrome/browser/builtin-addons/newtab/lib/Widgets/RecentSearchesFeed.sys.mjs": "cb2d424263eb9fba4cff748abc63ea5d4ae5a723df7b178a7c61b7fcd035081b", + "chrome/browser/builtin-addons/newtab/lib/Widgets/PrivacyMessages.sys.mjs": "b6e0bd6a63ce12e803279ce1f0731616625da2062a80ae6aafec01e461696b60", + "chrome/browser/builtin-addons/newtab/lib/Widgets/RecentSearchesFeed.sys.mjs": "564a1fbc6dcfa0a56381d4f9718d49a8eb7519d6f86f3787115ace5c5b65b805", "chrome/browser/builtin-addons/newtab/lib/Widgets/SportsFeed.sys.mjs": "8289ddc69ee2916f930d4ad7dffa68318b9b355307763da5077cddd102806984", - "chrome/browser/builtin-addons/newtab/lib/Widgets/StocksFeed.sys.mjs": "d552b12da186c38cd8d662707ff1c501e864900f789e5624e85ae74519e1d053", + "chrome/browser/builtin-addons/newtab/lib/Widgets/StocksFeed.sys.mjs": "eef0cd061b4d72af3098f7f1bf6d7c77823e20c60116085dcd382b998966c5c3", "chrome/browser/builtin-addons/newtab/lib/Widgets/TimerFeed.sys.mjs": "b0c27aecb89702cede360562a0982d2aac76904d344aec4826d6b1248943a5bb", "chrome/browser/builtin-addons/newtab/lib/actors/MozNewTabRemoteRendererProtocolParent.sys.mjs": "5444c15fb4939482aea0aab534289d0428c4a97f72c64ac77b29ff6f3917ac6f", "chrome/browser/builtin-addons/newtab/lib/actors/NewTabAttributionChild.sys.mjs": "0defdd6055a067dbc59bdca68a62aa683f496ad8786eca10502f4b3c831b320b", "chrome/browser/builtin-addons/newtab/lib/actors/NewTabAttributionParent.sys.mjs": "d6f6b7990c90e6802a933731771017c47c28923a8a98c445f28ca64e8cc603ee", - "chrome/browser/builtin-addons/newtab/lib/cache.worker.js": "d42525101dc6ca500513b2ed17742b752ef6841b026bf0763db38e39e8f1b290", - "chrome/browser/builtin-addons/newtab/manifest.json": "3589c9ee230f9d29fc39e098b445f3842ba3e8119595ff77e6fad976347f1101", - "chrome/browser/builtin-addons/newtab/prerendered/activity-stream-noscripts.html": "db3071708ff82a96a4ddd38359be3433a9b3db242601f2c417912201d813a125", - "chrome/browser/builtin-addons/newtab/prerendered/activity-stream.html": "8a1efce350306281193607c41ffd3bb2643b6d092eb8d8b82dae1bd30e166c64", + "chrome/browser/builtin-addons/newtab/lib/cache.worker.js": "98c195fcd621765710b71232fa8ad13a9bcae5cf4dfd6133e8772da205203e52", + "chrome/browser/builtin-addons/newtab/manifest.json": "ccb3d8089138d7646aed206622f73d1cd168052623c61e1d9e932d145c9c6362", + "chrome/browser/builtin-addons/newtab/prerendered/activity-stream-noscripts.html": "cd496e3a17a8692f181372b2104077d2e8c1a694ab72b4d206104afcce4000d9", + "chrome/browser/builtin-addons/newtab/prerendered/activity-stream.html": "92538846caae35eb9a95d347bbfb1ed6f2ed702d24484a488704d76a6febb450", "chrome/browser/builtin-addons/newtab/webext-glue/background.js": "62b2d6b764635431cbbdc94f524ba69e8451743a76f1f02fc4986ce66153bd23", "chrome/browser/builtin-addons/pictureinpicture/data/picture_in_picture_overrides.js": "2448501e9e74ff49a01c47d7f3a51b89158bf6b505f709c57383d12e6f6b0eb3", "chrome/browser/builtin-addons/pictureinpicture/experiment-apis/aboutConfigPipPrefs.js": "5ec014bad994bfc3d03052ffd5a7ad0dbd25fcb47acb7c4b71431d5b470e983c", @@ -1380,7 +1408,7 @@ "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/bbc.js": "7ed736284bde768087ed4d2f1773f5c05bf57553805c3d2584280857ceaa2fb7", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/canalplus.js": "1e8b1884542739e026c8752000112db7694c046507a1ba7e14d5aec80b97a0ac", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/cbc.js": "c069ef9f850209177871d3d3fb961cde28a334c8d6fe613e7b4c4ac80283bc1f", - "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/dailymotion.js": "a6121ea4187045850934403469b56b4ae2bd5d83bc631bb35ec8c7b4431b34f4", + "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/dailymotion.js": "5e27d0590b907c3a14ffe7fbdec9c6218ac04b5501f40bec051d9726518923f9", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/disneyplus.js": "ed8297e9b48560dcd59862d656c3977d3f07f12dab7ad581305a3fc23aae0ae4", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/edx.js": "65986b2e234037795db8e541f58eaf401cbfd9d7810246b1da9cd445218029f7", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/hbomax.js": "4d1bc3f511bc1a4e0812ef2a57d4ccecf981ed50c129a505200f2c167a7e6c6d", @@ -1405,7 +1433,7 @@ "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/videojsWrapper.js": "d1e83d1ea14fbec62c34c69dedc65dfa85a42ddede19670331421700d5aa5203", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/voot.js": "3eadca3c644a1810b9b3c616f73b4fd2eee7cb382681c8b1640bed20b9e2e7f7", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/washingtonpost.js": "a580b4859a130be3ad1fe3fec850d2119ca802eeecb40f899c943df3a8d7e36d", - "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/youtube.js": "e06c820bb9a9463167a477a11ad2ec1df6ff5084f310c7aba3b9d0af42b32167", + "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/youtube.js": "6ea765230e43ff0b447e284540a3e0c14af250c889457b14af995357e162cc12", "chrome/browser/builtin-addons/pictureinpicture/video-wrappers/zdf.js": "7c765b934f7cf7d39815ac03dd0cfec61bd8fcc50a4ca69ebfa451660010d8aa", "chrome/browser/builtin-addons/search-detection/api.js": "a413c6f939e6fdc7c73d01e5139370a47f83baa3caf6259bf3ae6fc757dfb704", "chrome/browser/builtin-addons/search-detection/background.js": "c23a9d48f80898fd81c544f25859668aff3dbc9110967dbb7ae8849d5ca33915", @@ -1828,7 +1856,7 @@ "chrome/browser/builtin-addons/webcompat/data/interventions/2060224-alreadyordered.no.json": "ce3ee788f6abcf1bacbdb9683ceb4061bdcbe3dc14c861457cfa6c130e4393a2", "chrome/browser/builtin-addons/webcompat/data/interventions/2060611-youtube.com_background-video-playback.json": "549e70132e6ba0c9c49ee95be2a1c4b1bc70e532a843733876f9224ffdbc9d0f", "chrome/browser/builtin-addons/webcompat/data/interventions/2060760_fwicloud.com.json": "3c9e28a8d9e5dc1340860cb773453bc9c487b97c9124fc0236082d27b951b10f", - "chrome/browser/builtin-addons/webcompat/data/shims.js": "06d4b7aeb965f9048967496c558ad3c4a538178b2e3fb67e4d7ee2a75b4008c2", + "chrome/browser/builtin-addons/webcompat/data/shims.js": "f387e93a0e8d2a3ef269ce65738691fdf51da77878b16062abcaa86fb9ce523d", "chrome/browser/builtin-addons/webcompat/experiment-apis/aboutConfigPrefs.js": "62d3e1ea97195a8657b2dfa3d7378ab270a527d2da2b93933c0b3f5745102c9b", "chrome/browser/builtin-addons/webcompat/experiment-apis/aboutConfigPrefs.json": "dd254a02c0e41a96c10d8c2f3781a01ed3ebd01db83bd534174a4a4f8f8523ae", "chrome/browser/builtin-addons/webcompat/experiment-apis/appConstants.js": "5d7ccbeb787349a35058a9bda51fc3e0a9effef2194d7dfb8814dfe9bfa3570f", @@ -2082,10 +2110,10 @@ "chrome/browser/builtin-addons/webcompat/lib/remote_settings_update_check.js": "6f986c84ac1a5504f7f982790a5301b51582d22ae1e65866e0a3ed946f3d3771", "chrome/browser/builtin-addons/webcompat/lib/requestStorageAccess_helper.js": "a857be1d2e50b2075e0ed5f50ef07e86857c2b0f3c1903b36e98f8d80327166a", "chrome/browser/builtin-addons/webcompat/lib/shim_messaging_helper.js": "30ed6392b8de4590bd974a4a797ee0b12b382f2141738115bfd2d692cfa6ec17", - "chrome/browser/builtin-addons/webcompat/lib/shims.js": "92713bce63ddf3e33974a1e9e7a5b6c9ee3c068330f3f1922b867b6a1dfc3ee4", + "chrome/browser/builtin-addons/webcompat/lib/shims.js": "176f140dceac5e47faed358f64d7c4a0594ba8add91b27024c59e658712433f5", "chrome/browser/builtin-addons/webcompat/lib/smartblock_embeds_helper.js": "485a3ba616d2a045c4950597c7baec5795e658d959df53d072b4f896bc228f95", "chrome/browser/builtin-addons/webcompat/lib/ua_helpers.js": "d0abfc6ea8cf74ab9d1baffb90ee02a79c5165297db3e3cf81d52602e32edaed", - "chrome/browser/builtin-addons/webcompat/manifest.json": "ba6118e71045724ae62ca08817c8948ae388bb833683dc54c43785a34d99b2e2", + "chrome/browser/builtin-addons/webcompat/manifest.json": "affa14be3e1936ad36110ad81cb6996c3e94d6075d510cf848a7eb3186ce6c92", "chrome/browser/builtin-addons/webcompat/run.js": "47f53f28899df94074aeade8561fd00ee0487a6c46d054570d35e2127d06d0c1", "chrome/browser/builtin-addons/webcompat/shims/addthis-angular.js": "7213fa380bf61f60d6e3ac49c02d4b04a8bc0fa7697be3108b61355e6e19b3f6", "chrome/browser/builtin-addons/webcompat/shims/adform.js": "6edd9cebe87e1e20c759d1408cdfe63e6f0ad8f2ab2e35941785a673e2eb0dec", @@ -2094,20 +2122,21 @@ "chrome/browser/builtin-addons/webcompat/shims/adsafeprotected-ima.js": "d7253d7877b93c0b21af64f2321407c74aeb5585c1aa7f7e5eeedafb22627f67", "chrome/browser/builtin-addons/webcompat/shims/aliexpress-language.js": "bbb4a0dbb83356f0ce745710e9da6dd4c3561dc284436db3b2180336e2b3fd74", "chrome/browser/builtin-addons/webcompat/shims/apstag.js": "a40372250602dda1c7837f52bd2cd4d5a3ef023f9959362764f64d1a2f793bc1", - "chrome/browser/builtin-addons/webcompat/shims/artstationLogin.js": "39432827db81a509356cf6069d7bb286e8e7c3753571d2cc613acaec01f1f7a8", - "chrome/browser/builtin-addons/webcompat/shims/bmauth.js": "2d3a3d2be96ce36e2014231356b90d2d5415b19dd580ea63ec787516ebb76777", + "chrome/browser/builtin-addons/webcompat/shims/artstationLogin.js": "30f676acd62ff29cdf046b26516c31c9d23150939958fcaee50f27186ac1ac84", + "chrome/browser/builtin-addons/webcompat/shims/bmauth.js": "d5b56b704a24770a67f636fa785073c75f7755f6d855de48c16917a2ef3b672c", "chrome/browser/builtin-addons/webcompat/shims/botd.mjs": "50f28f8b97f940a452183c8183b552ddb8b439130c8c06a8c12e791d21eaa599", "chrome/browser/builtin-addons/webcompat/shims/branch.js": "aa4ac1ca3a7a18419f7fc2233eea1f173117d384145217c89156b4a1e6916c3f", - "chrome/browser/builtin-addons/webcompat/shims/cambridgeDictionaryLogin.js": "2abccb9975e858ad3641065d2c3f881fb064d4214092d7e61a0e2469780afd82", + "chrome/browser/builtin-addons/webcompat/shims/cambridgeDictionaryLogin.js": "76d73c15dc756f996231fd26d72420c0f3b16262e64f4d367dfb83acd8e7ff70", "chrome/browser/builtin-addons/webcompat/shims/chartbeat.js": "8611f60203f8714502c41abb6aa3555891d91ae18fc682fd4e4535fa269e9941", "chrome/browser/builtin-addons/webcompat/shims/crave-ca.js": "da7fc59e3743378238d56ea3aa9edd40d3daefd98c77b598ea48db2bf9d4fb5d", "chrome/browser/builtin-addons/webcompat/shims/criteo.js": "bcb81782443535cf1dde05361ede295434e0323c34185d7d9471be0132bcdd07", "chrome/browser/builtin-addons/webcompat/shims/cxense.js": "f8c8c24c152c971c3732faf6acf005ddfc6e3e81e09cd0771019516bdb82bf77", - "chrome/browser/builtin-addons/webcompat/shims/disqus-embed.js": "f88b7c425bce1e5ddea316e3de79e99e99e265017932ad03dc4cfc315f4efcd9", + "chrome/browser/builtin-addons/webcompat/shims/disqus-embed.js": "9604cc6f8d135ae2d3f193b1dc3c21f8ac476704ee76def4a121c6e82c339fbf", "chrome/browser/builtin-addons/webcompat/shims/disqus.svg": "3cfada2ba463ec58c7c82482ceba87c68dac5ccdc9f73caa3681651787516696", "chrome/browser/builtin-addons/webcompat/shims/doubleverify.js": "497cc441afbe837c2c3e804f35063b3be62d159e9d2e86a4557261a6e7149b58", - "chrome/browser/builtin-addons/webcompat/shims/eluminate.js": "102e7fa50371e9de083e6b2b1d99e7681c997f8f6be77a0125f3acf2e0919922", + "chrome/browser/builtin-addons/webcompat/shims/eluminate.js": "1328661df450a5c77ca9b85ff591efeb583dd67cba5722fc5f998d36f7b15d0e", "chrome/browser/builtin-addons/webcompat/shims/embed-test-shim.js": "d52e3f9ba72e6ccdcf7774894258b9da2cbb975bf9843b75d44f10e3bd5bd9dc", + "chrome/browser/builtin-addons/webcompat/shims/empty-page.html": "889f1036aa3fedb7ad02b8546fae8c0803505d9605ee701535ee6f18a4dde8f7", "chrome/browser/builtin-addons/webcompat/shims/empty-script.js": "cee8c177d918a93cdb029c7616478f4a5ca2585c7b4f8115a597dbc326c9822b", "chrome/browser/builtin-addons/webcompat/shims/empty-shim.txt": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "chrome/browser/builtin-addons/webcompat/shims/everest.js": "5b279827e5b40da8732cd30e1cd43f5517499ef957e1f4fed86cf3e175ccae79", @@ -2117,15 +2146,15 @@ "chrome/browser/builtin-addons/webcompat/shims/figshare.js": "057b8df6acfd44eacd61e5e3de78fc2be42e90a09fd4b9b2e28b60867b6a6f2a", "chrome/browser/builtin-addons/webcompat/shims/google-ads.js": "1468d954f25ab75355f3c0f42cd9c84efd64a67922c47d3b69bdb6d0eb399e69", "chrome/browser/builtin-addons/webcompat/shims/google-analytics-and-tag-manager.js": "b33ed8fd08f8cf0138f219167d4bb5817f1b09c1d9ac7431e833899ecfff40f1", - "chrome/browser/builtin-addons/webcompat/shims/google-analytics-ecommerce-plugin.js": "6d0859d8b847f03dafb1123c5329ae5b8bd9820afb720c6d4da291505e6277f0", - "chrome/browser/builtin-addons/webcompat/shims/google-analytics-legacy.js": "bbb1ca9c206e0ed72478ea72f3ca038cf739fd540d5d1c2da19620c942e4c4f4", + "chrome/browser/builtin-addons/webcompat/shims/google-analytics-ecommerce-plugin.js": "4d55e68e131851393d5d4241ac147f09f5a2999d8b598e0a71961beb056e67ee", + "chrome/browser/builtin-addons/webcompat/shims/google-analytics-legacy.js": "3f6763aa5bb2008f7e37439bab5a98133cff89f8f4f45ae1b4186276e0bfebb1", "chrome/browser/builtin-addons/webcompat/shims/google-ima.js": "56f6a413141da3021a41ed0cf5788da69cdce43fa358e88ac6176bf84682fede", "chrome/browser/builtin-addons/webcompat/shims/google-page-ad.js": "29f7a6bbf7aa0873beb433d5bb81427abb31c96bc0cc9cd8080c2ef085de35c9", "chrome/browser/builtin-addons/webcompat/shims/google-publisher-tags.js": "0df5f6c4d90f315b1935960ae73cd9a548cc3f7f337c0f115b457ff6254efca7", "chrome/browser/builtin-addons/webcompat/shims/history.js": "0176997b09e64af575761b739781189de9f054914e342abe84cc855016998be8", "chrome/browser/builtin-addons/webcompat/shims/iam.js": "0557d4483f842efa235ec48d40d311da73a6c2fa2fa948daf15bcd05465b3714", "chrome/browser/builtin-addons/webcompat/shims/iaspet.js": "700f74901b105f80a2be55f4499d0a98bdf6567b16cefed72f1db69747435755", - "chrome/browser/builtin-addons/webcompat/shims/instagram-embed.js": "fc3f4e3139c1dcca6cf2ae035e38c58b800e21ef912b582bbc98aa678b5ae05d", + "chrome/browser/builtin-addons/webcompat/shims/instagram-embed.js": "7d63b5dc712cac711e5be84758679602fb75dcc979ff2a47c58c929d566751ce", "chrome/browser/builtin-addons/webcompat/shims/instagram.js": "2d27e7e7c85e9e5801e0d13e1567b32f5184d0c825e754818eabec13aa53c406", "chrome/browser/builtin-addons/webcompat/shims/instagram.svg": "0d71d5e5e7d571faa05fb397fca92cf84a285e4baef876b96c68592629de41bd", "chrome/browser/builtin-addons/webcompat/shims/jira-zendesk-support.js": "7e2a31f144d75d67f8b3bbcf13c614e3cd1da48643d7bcdcf1d70d0b64cd4c4f", @@ -2133,8 +2162,8 @@ "chrome/browser/builtin-addons/webcompat/shims/live-test-shim.js": "b57c20bc2a264fbf42aaf2d693242380b58114b33aea925bbeab4c4ac0693f3f", "chrome/browser/builtin-addons/webcompat/shims/maxmind-geoip.js": "e7bb2e021f2dee0bb45f8f13af67dcbe850c7759f2df00194aff4f94553dc2f1", "chrome/browser/builtin-addons/webcompat/shims/messengerLogin.js": "831b0a1db778bb67227ae9be3d5275a4662ae5cd870bb425af65f14604030775", - "chrome/browser/builtin-addons/webcompat/shims/microsoftAccountIcon.js": "4b39a58104ef85bcea06cb52c770920bff27a34e60cdf5da318d1a3672b917f4", - "chrome/browser/builtin-addons/webcompat/shims/microsoftLogin.js": "2e125d310562f672cee34af75c17fbef19ca1b7e9b3aa82829120d2d7f074cfa", + "chrome/browser/builtin-addons/webcompat/shims/microsoftAccountIcon.js": "e426a8811847ce14f56f43f332ecbbd2e0b2282c25e2a2a369664357d1c4aff7", + "chrome/browser/builtin-addons/webcompat/shims/microsoftLogin.js": "ca2bea9db29e2494c8153e7bb671c47a79be04da154a29348fdcfe9d7c6a69d5", "chrome/browser/builtin-addons/webcompat/shims/microsoftOfficeAuth.js": "44405ef1b93a2a3c8b54b9a9b85c533e632f0e4a57b1f78a34c9d1e72bdb424b", "chrome/browser/builtin-addons/webcompat/shims/microsoftVirtualAssistant.js": "b0df447cc70cc434b5887698e3663d68db50c3b16a7eeb82715ab9b3c2cf92dd", "chrome/browser/builtin-addons/webcompat/shims/moat.js": "3e8b177734ba32690acb5983b6835313b90f1b31788f6bbde8fe6d528c45f04c", @@ -2144,16 +2173,16 @@ "chrome/browser/builtin-addons/webcompat/shims/nielsen.js": "f81f5a62f54bef8d4c4a06f7792770ffb0df85ad0818f2b3e0ef75384d58787d", "chrome/browser/builtin-addons/webcompat/shims/optimizely.js": "0609bad67850c27c401330a47e2c86e05469df851a72723a7caab62eb38b9ee7", "chrome/browser/builtin-addons/webcompat/shims/play.svg": "38b70069ec125c344bad7684fc1cbcf448f654aa39ac80dee1a4c128e6d1acef", - "chrome/browser/builtin-addons/webcompat/shims/rambler-authenticator.js": "06bb8efcfde41f6d4c6692d1acd52a2ef933f782315bc3d4a6ac5cc51e483f7e", + "chrome/browser/builtin-addons/webcompat/shims/rambler-authenticator.js": "2c141550f2a58707c10ea6b5b4b61cc035f8588c4e30858e2a717fec8f90cfdf", "chrome/browser/builtin-addons/webcompat/shims/rich-relevance.js": "ef4549b34cf98b8f32d9f67522c0cc784eeca25930b840b08c10f9f7d458cebd", "chrome/browser/builtin-addons/webcompat/shims/salesforce.js": "6fa04e9cbff238119c3090eb6883e1c3730871fbe20545f4abe1325a6c815197", "chrome/browser/builtin-addons/webcompat/shims/spotify-embed.js": "601d277cbaf6f3cf10be451af2aa6da5c49d455e4ae91dfb908310dc9a886dc2", - "chrome/browser/builtin-addons/webcompat/shims/stackoverflow-login.js": "757174d00da758af28bea6421a13269471def7c8eea1fba72ab2b11edc400b6d", - "chrome/browser/builtin-addons/webcompat/shims/tiktok-embed.js": "605a5467424c33d55ee86b5fb6b7d7a25ccb1940e1de3a5aa06df5f4ef9fa227", + "chrome/browser/builtin-addons/webcompat/shims/stackoverflow-login.js": "492793b1ac870c7efcb57672aa5db9ed86014ec26ac6c3c67d4c41673ad702c7", + "chrome/browser/builtin-addons/webcompat/shims/tiktok-embed.js": "23b6f40d64523fc96fd2d4fcc5075bb04c039d9c46961a23606a0bc672fcb7a6", "chrome/browser/builtin-addons/webcompat/shims/tiktok.svg": "90fe4358aa6c0887f545f455ecad9d88b14dd020d62b0e771e6c30010c588de5", "chrome/browser/builtin-addons/webcompat/shims/tracking-pixel.png": "a73237a07cec4d81b7cb7995220839f554e2e8936e5d5ae25cc47753f9737c07", "chrome/browser/builtin-addons/webcompat/shims/tsn-ca.js": "6578c7a6a57a8d0448766136ea76b16dc32b1657efea65a8a16a66247788bb81", - "chrome/browser/builtin-addons/webcompat/shims/twitter-embed.js": "ff99fc5ee4570c8e8342bd17be03fac00c74ea9e90c7280133d34903f38b68bf", + "chrome/browser/builtin-addons/webcompat/shims/twitter-embed.js": "5178dad34facdd19dc5d40ad4fc589cd58925d65196a89a80af2be6df3471baf", "chrome/browser/builtin-addons/webcompat/shims/vast2.xml": "713dffdafb5bac4d5a1cc9fe9a4162b04fd75048a0e42bf424e3c22dc28d8879", "chrome/browser/builtin-addons/webcompat/shims/vast3.xml": "44a809d569ff3cc1431d811948df5b899daf3d33eed3166493324e39ba0a9812", "chrome/browser/builtin-addons/webcompat/shims/vmad.xml": "7c9d3f7c69e1c970674cca2d89f386d190c2bbda741c9d996213f1afab66262d", @@ -2167,7 +2196,7 @@ }, "browser/omni.ja|resource|devtools-highlighter-styles": { "files": { - "chrome/devtools/modules/devtools/server/actors/highlighters/css/highlighters.css": "01278d68a89d389f19e6935f011328db3b166ca9f357fc42ebc25574968a007f" + "chrome/devtools/modules/devtools/server/actors/highlighters/css/highlighters.css": "a9922a783f4065c415eba3a13551931825970c03fa30ad59a61d1a9126026508" }, "prefixes": [ "chrome/devtools/modules/devtools/server/actors/highlighters/css/" @@ -2207,24 +2236,24 @@ "chrome/toolkit/content/global/aboutGlean.js": "cc8b1c3afad15ef07511e7d8d04ef0b39e69cb5108a463faed91d65a11276433", "chrome/toolkit/content/global/aboutLogging/aboutLogging.css": "47a1ac28e53a2197874673d9718d20798692e24413b4752eb6a2e5d9208769ed", "chrome/toolkit/content/global/aboutLogging/aboutLogging.html": "a7e498e9ebc5d55cf43f262153e4a1399dfee728c37973e0be6494ed7a00210b", - "chrome/toolkit/content/global/aboutLogging/aboutLogging.mjs": "e8e0139bbda435ed83d4581b80ab07de10225071640886843e1bfb193335104d", + "chrome/toolkit/content/global/aboutLogging/aboutLogging.mjs": "c68cc4f25f679e49c2f84fedbcf27c9cd77daff2004fb146ebe50f0b9b889a2e", "chrome/toolkit/content/global/aboutLogging/jwt.mjs": "d9bd2e98b0007440a2468d20601c9a6e89b14a3e215d51a89681c2f8b639320f", "chrome/toolkit/content/global/aboutLogging/profileSaveUploadLogic.mjs": "0777d1dd63c95d5c2d3fe5376db9fab8aede5de051894662b17dda4951d05c69", "chrome/toolkit/content/global/aboutLogging/profileStorage.mjs": "ffc5d789b958f2a5940ab7922218daff6e85ee99826818dd02d7c667d6602430", "chrome/toolkit/content/global/aboutLogging/uploadedProfilesManager.mjs": "3a4dbaba4ffdeacf436beb4ee2e3dfb23b7f02b4b1eef382d404d149584d87e7", - "chrome/toolkit/content/global/aboutMemory.css": "1192e28c7bcf6037be918ecc470bac591dfec886115645e22d5dd419808d5350", - "chrome/toolkit/content/global/aboutMemory.js": "aa66080e3977611d92249e0a0340b78dbb7a78287ce9e2b01c5480c38a88fb45", - "chrome/toolkit/content/global/aboutMemory.xhtml": "5cbbf7f82916762a3e47ea8cdbf2129258e0d18486ffeb1eb097751637f38386", + "chrome/toolkit/content/global/aboutMemory.css": "109a3d2515d5346dcc768ed3cdd73607156845bfc1622d8a3b3ad60c59860640", + "chrome/toolkit/content/global/aboutMemory.js": "96e0fc7d4cbc32338404fe2d3bb1f7248395c3d4036e2663e9c2b929ddb2cc1b", + "chrome/toolkit/content/global/aboutMemory.xhtml": "05eef609657e64be30cb810c7b91eec79d7bac67f55a44c4948e0d31457ecc96", "chrome/toolkit/content/global/aboutMozilla.css": "fc58e89fd658a14f806ff0b2733922cbba9e0d6e4a696f534d96200af5349901", "chrome/toolkit/content/global/aboutNetError.html": "da8cbe14f63867397f57efa74307a7e04adf9254bc21249b95a05fc23341e737", "chrome/toolkit/content/global/aboutNetError.mjs": "8b5984cf31c7d5d2eafd7907d4298bf545b60f2e262008dafb3a7f51f766d0e8", "chrome/toolkit/content/global/aboutNetErrorHelpers.mjs": "2b5c67341fc4fb26cff47cac66069956289355d959d6c1b2b5cfe1c1f8ae1572", "chrome/toolkit/content/global/aboutNetworking.html": "4b518b3dbddce3b522a1dece97f239c0e3013bb69111d9eb5510629e5cca4f9f", - "chrome/toolkit/content/global/aboutNetworking.js": "6b1c5cad7043a869fc1707056482cffe26e627ed85033a0e446cc7cea1b0ea72", - "chrome/toolkit/content/global/aboutPDF.css": "783ee5570fa6987ff5c7a94b9fd6603204db72382d3258b5abdf3368bd4b1c6e", - "chrome/toolkit/content/global/aboutPDF.html": "82234ba9ba7c110a47a099b230f1c7263990536c01b2cb092f24dda82020c37d", - "chrome/toolkit/content/global/aboutPDF.mjs": "6f4b93f635f1cfd9907ac5079a97edc318228ccaba2d4e940c8dbf9fa9440e4d", - "chrome/toolkit/content/global/aboutProcesses.css": "d7a2161ce6619ba71a0df03a4ff230433dc9bbf4d6707cf981e99b2fbd267559", + "chrome/toolkit/content/global/aboutNetworking.js": "b25db43fdba3d9e1ea93096b60ff90f70dd7ee0a249e7677c227f6d58c2556a5", + "chrome/toolkit/content/global/aboutPDF.css": "23aac92602174ea6f3d1f11b0b753512c6e1b52ca84b172ce26e2a433763be2a", + "chrome/toolkit/content/global/aboutPDF.html": "f533c94ee2f106aab945b9efbe544eb15dc90b3baccd141eddcbcaac8387f247", + "chrome/toolkit/content/global/aboutPDF.mjs": "0920b33656c603a6647dace28bf2d75b324c38dc6e33d6673ee9455464f1996a", + "chrome/toolkit/content/global/aboutProcesses.css": "103d6b18634ac04e0261688af530e38ff482a9a4a4ea8ee736567f0e7d0401d0", "chrome/toolkit/content/global/aboutProcesses.html": "ef65dbfd6ebbeab26444e9a127d94ef55b501291ba44b92ae1982d0a3bbe8f01", "chrome/toolkit/content/global/aboutProcesses.js": "3f44d2dfd81b7b25461b4a449f55b5493fbeac12e8cca9afcb105a9fcaba9814", "chrome/toolkit/content/global/aboutProfiles.js": "4a24b40392692539314bd5bc616ec756aa43e303fd579b2d41b4e9bc46a0d97c", @@ -2234,11 +2263,11 @@ "chrome/toolkit/content/global/aboutRestricted/aboutRestricted.mjs": "acda7c65b11a6784e20a13bf09a0ef6d454a58f06be90d790955017677a7282f", "chrome/toolkit/content/global/aboutServiceWorkers.js": "babc232c7c3c967cf7a84d2fe2586bf7f48e333b83c53f95add0c904f93b8e1b", "chrome/toolkit/content/global/aboutServiceWorkers.xhtml": "ee05a23749f4c4ce5f3344c623dc506dd5dae43d704cb478d8329c22e5398ccb", - "chrome/toolkit/content/global/aboutSupport.js": "8b075326ca88cb7b6451282d37f765c69f1e7451eab69738e14f7dfd38ee8f92", - "chrome/toolkit/content/global/aboutSupport.xhtml": "bbfba82338ac108035ebecc478515c3365c44854867dfb25fd843946c0261041", - "chrome/toolkit/content/global/aboutSyncLog.css": "7429feb4c279da080f6d2655447ae4c2ea82a83583563ac942d1e22b1cdef3d3", - "chrome/toolkit/content/global/aboutSyncLog.html": "6c2d01692e4baf80e24b34caba188c6a70e614d8ad4c0a7ecface67090e3507b", - "chrome/toolkit/content/global/aboutSyncLog.mjs": "6f503508db0ea87d52edd910243320d59fc00b0b166d24e521bb4a9a91c029d4", + "chrome/toolkit/content/global/aboutSupport.js": "ee2be525b650d0126115af7b64cb0f6f18f90479de16f66585d587a4d1499be3", + "chrome/toolkit/content/global/aboutSupport.xhtml": "f77b8e27a270d5b10e7df07b3f878ef7e5a251832aac531835733bce92cba434", + "chrome/toolkit/content/global/aboutSyncLog.css": "abd521e193702aee5a87ce7007a6483e708d8ed3d6c075e842be7cd77c4c5334", + "chrome/toolkit/content/global/aboutSyncLog.html": "95caad9890ab141d087b6995779fa090218bdd322ac3095449d02f84cb92879c", + "chrome/toolkit/content/global/aboutSyncLog.mjs": "6e60690173bf92fa1aabc1d18367a878c49add6c1ca9f30139a77b67d86aa5a0", "chrome/toolkit/content/global/aboutTelemetry.css": "625f95ea572cd14bd5e4038bac82aacb44d7fca563070419ecd7403a07ba6bcc", "chrome/toolkit/content/global/aboutTelemetry.js": "11160dfb7cd665d1aceb38d7087c7bc411240a54a7e371e70072db9b374b0dd5", "chrome/toolkit/content/global/aboutTelemetry.xhtml": "885d49793b3ed516ae73b5cb25fabdefbd1904bf01df8904e898a92bc4248cbe", @@ -2255,7 +2284,7 @@ "chrome/toolkit/content/global/aboutconfig/toggle.svg": "518412fd86ee8d7021e69113cafe33b9a85d922dd3df72c8997438866d5abca3", "chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css": "b9240f60e1d3b8ac155f257952e1bd4ffef4c6bc73de053d4ef1b8850d1dc956", "chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.html": "3cef202d2e8b15a70826a4c2539abf06e48016b72c52d127e9d2c647814bd9cd", - "chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.mjs": "9c41095722bbce9853bf60dfbcfbfad8973369f2eb3139908a1e625304715f63", + "chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.mjs": "0fdb13976b8d9595a2be34337f182a24187986ab53d7fa98d399c233375361b3", "chrome/toolkit/content/global/aboutwebrtc/configurationList.mjs": "8ccacb1276053bcf5ba1e5c7e480ce197088629a3e32457f47965fc5f4101e84", "chrome/toolkit/content/global/aboutwebrtc/copyButton.mjs": "88d88f7cc7f946337d1bdceeac9ec61b4c7941288a056a2c98e0f50110c7c994", "chrome/toolkit/content/global/aboutwebrtc/disclosure.mjs": "eec3fb524d8ce50134a824307b99fd7771223572938439d0c434d10eae40efae", @@ -2265,12 +2294,12 @@ "chrome/toolkit/content/global/alerts/alert.css": "1ffe507179bd92d05aec26a4e1324a1482fd58575990e1edbf27d143e54f708b", "chrome/toolkit/content/global/alerts/alert.js": "2964a467da9f818be931c9bad81e19f42f4314525aac7726914a1b364690050f", "chrome/toolkit/content/global/alerts/alert.xhtml": "3233016214ee0e7242ddff255ce26842adb4a0e9ef15e2bbf7c08d6d658e4585", - "chrome/toolkit/content/global/antitracking/StripOnShare.json": "d30985fcc6bb6a4fd6b87aba213844d5b9b2e8104ff810726782230f0c290b45", - "chrome/toolkit/content/global/antitracking/StripOnShareLGPL.json": "7d40d9afec588e1d25799c0ed8f322b1d4df620befbb6b89fd30857dae03f966", + "chrome/toolkit/content/global/antitracking/StripOnShare.json": "1300235f099b0bc1d9d5aa6475d8907c7ecfa0067b4df931fa888d0e26c39706", + "chrome/toolkit/content/global/antitracking/StripOnShareLGPL.json": "7b54e8c3d32cf4043fdef26bfd9fcb4fd7d6dbe522937a7e61a058bbc6677e0c", "chrome/toolkit/content/global/appPicker.js": "46d567bed09e599fd66cc9a7e82fa693a5df1df5c6ff2d2609359a6ec5237923", "chrome/toolkit/content/global/appPicker.xhtml": "8dca536b5e9d6be1bd74a8fd9d87a688f3d017f009647b8dbf31330efbdb637c", - "chrome/toolkit/content/global/autocomplete-row-item/autocomplete-row-item.css": "a9a48a53a1e34ac949efa2a3337b675b083fd62bdc9e09820618c83d69683be1", - "chrome/toolkit/content/global/autocomplete-row-item/autocomplete-row-item.mjs": "fd152d83e5280f7304d89bd1bbf7792956d1e9b13ced2f1d4adf1f9f598c2aeb", + "chrome/toolkit/content/global/autocomplete-row-item/autocomplete-row-item.css": "3604f3e1f26a79143bd138333f3eaeab4da4910117c6751f641598d46f864c2e", + "chrome/toolkit/content/global/autocomplete-row-item/autocomplete-row-item.mjs": "8a790da026bd7618405ad3191a0b3bc40bfc22dc8b2133430e73651436214235", "chrome/toolkit/content/global/autocomplete.css": "8538b233b3c6c20cdb7146ced51dd06640437955acc4a813db12a6301fb2de30", "chrome/toolkit/content/global/backgroundPageThumbs.xhtml": "f8f4962d7b1978789a28b113de86903efa658753260eefd9a4b6a24283dc8cbb", "chrome/toolkit/content/global/bindings/calendar.js": "0a4026744028fa883fd5116d2fa5f4497346d4311bad84d5825deec44a5e5e54", @@ -2283,7 +2312,7 @@ "chrome/toolkit/content/global/bindings/timekeeper.js": "fdccc112a17084dd6881027d5bd4a899a4403892b79c422d04c126385264fd29", "chrome/toolkit/content/global/bindings/timepicker.js": "8b63f5cbdd80b4739fab5a7bd1675c520f98a4a1c316c3c7496bf155ae5f941d", "chrome/toolkit/content/global/buildconfig.css": "e9cd781bbc7ee82f28a71520352a4b2c7ade454a87c51ca6c882ba69720a2330", - "chrome/toolkit/content/global/buildconfig.html": "01a6d6dffff03096eaf7e6cf0f61eb081a59555cbaac85cd1651132d6eee5b28", + "chrome/toolkit/content/global/buildconfig.html": "fda2315f9ccf97cccff6620b092b02da11d751abcbe09447dd8e474bd0c09bb1", "chrome/toolkit/content/global/certviewer/certDecoder.mjs": "03ba917df792554ed07ff559b30a846ca7e3315f838d0f2931cb527a86ad4fa5", "chrome/toolkit/content/global/certviewer/certviewer.css": "66defee9ba236bfb58d0e0283ec9abfe3509648bd6704a831edf7b69537213f1", "chrome/toolkit/content/global/certviewer/certviewer.html": "4b1478b882e97771965bfe39403455349f1a7a02a1ca7e716a6f711e1432cdaa", @@ -2303,25 +2332,26 @@ "chrome/toolkit/content/global/certviewer/components/info-item.mjs": "724bd7c6ad30f242f2a19015a2524fa9c5b2b24783a05256da0ee2f6257d9ab0", "chrome/toolkit/content/global/certviewer/components/list-item.css": "34f7e960d6a15f0685d561e2a1aa93c5d602febbdbe7a8f5c0ce93181db58589", "chrome/toolkit/content/global/certviewer/components/list-item.mjs": "69dddbdbe57bc1c4d86ac1c606066e8cff1d202e26d19395f41f80ac01c3bca7", - "chrome/toolkit/content/global/certviewer/components/logNameTable.mjs": "131422415b72b07fe2b3889db65133f3ac83bc9340a0c678cbb59930c2e1fff1", + "chrome/toolkit/content/global/certviewer/components/logNameTable.mjs": "23510bdbea06ac5352ee2c685f3064da06c17b6aca699bfbaae01ae10280e2c3", "chrome/toolkit/content/global/certviewer/components/utils.mjs": "45e4edd401315dee58a031a542868fc1acf91a1c39fdac00f2bf3c8f760889ad", "chrome/toolkit/content/global/certviewer/vendor/pkijs.js": "026c7602becff84bcab078641ea9e381a8560959b69428d6d15ad35c84d41974", "chrome/toolkit/content/global/colorpicker.html": "125ab64f87518781fa6436d5c40bc4353e3e7c98286562e76eff2462934b7594", "chrome/toolkit/content/global/commonDialog.css": "c0e6403e2a443aa85d58935711ae0b019fe7b554d6e4c4344b543174eb8ea912", - "chrome/toolkit/content/global/commonDialog.js": "f47fd0168c1801c099dd0e40f611ad29c32766369e7932aa959764860225110a", + "chrome/toolkit/content/global/commonDialog.js": "e068add5817c22482f73f5b13a75dfb8f157c14ce1b4b325931874b8e80ec2f9", "chrome/toolkit/content/global/commonDialog.xhtml": "356de33666e094f029c34b08303d45a1b0d40c1fe2a7271d2c0d2621606ff41a", - "chrome/toolkit/content/global/contentAreaUtils.js": "35287242a195809eeae0008cc2ad84865faaced4fc39f653d96a2ca500582224", + "chrome/toolkit/content/global/contentAreaUtils.js": "ffd34ef5b4da374dab762fea2b3072d45d78f5a1901f8edd2968acc09507cd48", "chrome/toolkit/content/global/crashes.css": "5e436c0c55978994fcccf640230f1a42827aecd3603b04bd24a683563f38504a", "chrome/toolkit/content/global/crashes.html": "fc9a33b819c3fab9b0e08913dccb93ccd4b04df57a41957b734a3552922a1aef", "chrome/toolkit/content/global/crashes.js": "9aa9786a236b7498b032051f5c053ee104aaf2919c9b4092d13248925b131198", - "chrome/toolkit/content/global/customElements.js": "9f442b4d4814592c7245b52f272a2ef1f4d0bc0888bb7c9e187595a343f891a1", + "chrome/toolkit/content/global/customElements.js": "17fcb1dfa8b41520cefcc8b92f4eb9427eefbda8963018710509f65f02127e7e", "chrome/toolkit/content/global/datetimepicker.xhtml": "46e9c4a66d673d6cbfe81821e04aa482ee17512cea878ba8e50d90197825b9aa", - "chrome/toolkit/content/global/editMenuOverlay.js": "c6c1b2040a63680bf84072343e4b3dc11cb7f8661cf00762ff44d32137c8ea5f", + "chrome/toolkit/content/global/editMenuOverlay.js": "44a6621d103065d6e3eccf1b8f877a897cb8a7ac5d526107f8cef1eddd5d2214", + "chrome/toolkit/content/global/elements/accesskey-check.mjs": "4f68f13c5cbddd7bf2176d386894643ebc01ebb94cbab258b41beb804ef972e1", "chrome/toolkit/content/global/elements/arrowscrollbox.js": "63cec0c26f21fec2e1cc10ab12427c261da366ae97f3fd5cd2e1927603ad712f", "chrome/toolkit/content/global/elements/autocomplete-input.js": "d62ad6c5d0f319a7e237f3616f8e9a7c02e6e0dba2ad529ac7ef44b51b2daf70", - "chrome/toolkit/content/global/elements/autocomplete-popup.js": "7f9fea3824f05b637e51be01ce2819e00e0b94b2479f211180602853f388df2d", + "chrome/toolkit/content/global/elements/autocomplete-popup.js": "b52928a8be8d0c615223c698cec43f28ece42c655f252f24f1ebf1e7db281444", "chrome/toolkit/content/global/elements/autocomplete-richlistitem.js": "a71586b475ef5c4e21b46e802c61635e31afa22a63afd7939339180c8b481270", - "chrome/toolkit/content/global/elements/browser-custom-element.mjs": "48988c373c28c40588c66f0bc1384b58ed41400fb46072f8d94a2f32aa3b8614", + "chrome/toolkit/content/global/elements/browser-custom-element.mjs": "b0e3531b7df01dc97b73d47ea285a222b85b235e2f38650935bc8bb34c0badf5", "chrome/toolkit/content/global/elements/button.js": "9e9270093451a3058c28e030e5e31e808bc48a5f5d18ab05bb472724ccb9cc77", "chrome/toolkit/content/global/elements/checkbox.js": "6fdf91482faa26d48150f93f0faf210784b4f183342f1de876e9389335bc6c2a", "chrome/toolkit/content/global/elements/datetimebox.js": "8de051a7f18634f062d23880be05f8ab52da2e1dab0f0a6d9e483e3abfafee2e", @@ -2329,13 +2359,13 @@ "chrome/toolkit/content/global/elements/editor.js": "ba65a005ccfd608e56278a68f806de8768cbb59e3515fde21fb626d1436d385a", "chrome/toolkit/content/global/elements/findbar.js": "2e6f6fe7648223910c2ae9e2464cfcbb9aae85f6e042c75ad364243304b9b10c", "chrome/toolkit/content/global/elements/general.js": "4e2b2f382e10898b56f922db3516a36847c44ebb60a7c551f60c8a024022d9cc", - "chrome/toolkit/content/global/elements/infobar.css": "24a878373e86097498eda594cf31cbb2e64f893ba5c2d4f95c4c0c0eab4760ff", + "chrome/toolkit/content/global/elements/infobar.css": "a8075060d447e3ec73fa01521868a528aaea46d8111bead6dd07e2876ee18f58", "chrome/toolkit/content/global/elements/marquee.css": "fb0f046d2c12256fb46f1d325b5bb760a5012c58dcc505ed62859f10379bebb3", "chrome/toolkit/content/global/elements/marquee.js": "8a4fe09a43f40b33919d532424451bca93459b4d950ce1dc1ff7c86ba8fbed51", - "chrome/toolkit/content/global/elements/menu.js": "55db6c67766375cef2130b652cc17138b2416506c3cf0ebe37e69c70b4fc51d8", + "chrome/toolkit/content/global/elements/menu.js": "c00135f321ccfc41850750fc22612d9f4ec24f1621b7bbcc383ecbeb9138fec9", "chrome/toolkit/content/global/elements/menulist.js": "ad68b81ea61f83dd23b2589c766ae25e2ab7e9ebf335ff48493c5f6c7d7447e0", "chrome/toolkit/content/global/elements/menupopup.css": "e0e2963750af1a3ca096eae4419b645b73883022e1234bb85e00b1303f27f9e0", - "chrome/toolkit/content/global/elements/menupopup.js": "a86e752af2a57314b10c0c74dd2ff5e3d3a2ebba632643533577bc2ebd7a60c3", + "chrome/toolkit/content/global/elements/menupopup.js": "3cf08221605dd23a0c961c9703ee1116b21795ce3cee0423804a0f1f79bebac6", "chrome/toolkit/content/global/elements/moz-badge.css": "5b85f871c0ae8a7a6697b40d1eb29fc258238e5f459c230bffd2cae440daef72", "chrome/toolkit/content/global/elements/moz-badge.mjs": "803b4363e4eb1803c27d4db71aac047bac231c6474dbf5a702dba49e6f2a1752", "chrome/toolkit/content/global/elements/moz-badge.tokens.css": "906cd6d76ce9291a2f0fe3b674a536a2337721df8f24c72895a94c0b2f7163d1", @@ -2344,46 +2374,45 @@ "chrome/toolkit/content/global/elements/moz-box-common.css": "c0a78f65d513a292ad97705ded7176dcf75c5f2eaaf1d88a844fc034430721f0", "chrome/toolkit/content/global/elements/moz-box-group.css": "d621e6622680807381bf1bf580e499bf385a8383b899b48d8d064c1b578a98a3", "chrome/toolkit/content/global/elements/moz-box-group.mjs": "7b708bad2614ee49d899d30b143657c2944269dd0d38d95780ee3d4e0335b9ad", - "chrome/toolkit/content/global/elements/moz-box-item.css": "0cd6c33094d3dcae4f7fa727936906fa786b2fbcc8c06489ab2e5721a84523ed", + "chrome/toolkit/content/global/elements/moz-box-item.css": "96ea4db946fc0841ed17b1ad61441e2a8216a281ac7af411c03f4f64372989be", "chrome/toolkit/content/global/elements/moz-box-item.mjs": "58eb34a1d7daafa3c7e6449259c642d4c4ba983a126663cfa9b154b222da3c3f", "chrome/toolkit/content/global/elements/moz-box-link.css": "11c2f8508cc9321f8f6e1a33a6753ad82b9c04319c148b7078655e2a1bcb9bdf", "chrome/toolkit/content/global/elements/moz-box-link.mjs": "7da9d7df6a8fa89d04d666663de7a526f0c34ce2a913136963672a56d2c85539", "chrome/toolkit/content/global/elements/moz-box.tokens.css": "8931d4cf21c90a2cdc91605bb7c709e725e965a312834a835c0dcb45672b54f7", "chrome/toolkit/content/global/elements/moz-breadcrumb-group.css": "3366ebc245062ff9647da18958b9651675f04d62ba73f98d17cb473714949dc0", "chrome/toolkit/content/global/elements/moz-breadcrumb-group.mjs": "60707f0f83955fae276b2d8986132d4962052a23b21dd54aab41b288b18f6f20", - "chrome/toolkit/content/global/elements/moz-breadcrumb.css": "96bed6700506ad402793cf6be4300593ce73a2ea9303dee8180d22df0e32ab00", + "chrome/toolkit/content/global/elements/moz-breadcrumb.css": "038e85ca4e412ccd0ec896cf237e3db6422979b54a68a8878cffd9c621156ccb", "chrome/toolkit/content/global/elements/moz-breadcrumb.tokens.css": "060eec1b3d61660bfdf683a20e4e71f5eeaa8a443f895eec15b07dfcf20fa118", "chrome/toolkit/content/global/elements/moz-button-group.css": "f841160d13ab1f8434c971dc7464c52d3f244bb302cb0b8e8d8c142b49419a4a", "chrome/toolkit/content/global/elements/moz-button-group.mjs": "be23180b7c9697a81629b5016880074a4d6abb0c9fb747d233bc70a2c007ac95", - "chrome/toolkit/content/global/elements/moz-button.css": "87b82943c2ef95c8f482c0274c5857219c9a3ce92cd0cf7a36c58c3ed1582810", - "chrome/toolkit/content/global/elements/moz-button.mjs": "4b885dc10fe651896f6dc6bbdc11ce0357a108d666df312769119576b2990f5e", + "chrome/toolkit/content/global/elements/moz-button.css": "50450b0a987a2c59567f18415b45931333eec065e33e711902ea265fd43c5d82", + "chrome/toolkit/content/global/elements/moz-button.mjs": "d00ea03391f2aff46b683e2b246ca1967aed2ee7917dcb842ab3054d5f727be3", "chrome/toolkit/content/global/elements/moz-card.css": "56fc322fffc729f148c9fb9a31ecb7062440a2f0df8443128f431e5afe4688a5", "chrome/toolkit/content/global/elements/moz-card.mjs": "1ee5705ed12d1e0f9e66fa1297ff852262f9c6843aefcb34e00f10bd9a1bdc1d", "chrome/toolkit/content/global/elements/moz-checkbox.mjs": "c97841b7403397113bc26b09b36157de428e68722dabb6612d08e58dbd7a699f", - "chrome/toolkit/content/global/elements/moz-fieldset.css": "19f83eb73f2e7a6af7213ff107f916a1323f3b0f6e126f8c79ce766a0557f132", - "chrome/toolkit/content/global/elements/moz-fieldset.mjs": "7bb29d4a4b930c952e38914d4029c4f19115c33e817f51e8f35cbf096f8ea8c5", + "chrome/toolkit/content/global/elements/moz-fieldset.css": "80e7ba642fdd04e0ac73c16b1ebe1a071c9f989a1898b115c46b45e2642a5685", + "chrome/toolkit/content/global/elements/moz-fieldset.mjs": "f445afecd800552685ad7cbc6acafcc849d1766bfcc6e54a57fec29f4a50a125", "chrome/toolkit/content/global/elements/moz-five-star.css": "c3fb7ba7e1a73ea90d5e30de3216eb6f73bd4503d77cdc6e679900793ccec58d", "chrome/toolkit/content/global/elements/moz-five-star.mjs": "8437883852f5b321313da78682716c8a0a80c761fbdd5f70078591d5683f5ab0", - "chrome/toolkit/content/global/elements/moz-input-box.js": "f4cef0132d308a23efdc2c575c100afe487586ecf626d70d6202c0106b759027", "chrome/toolkit/content/global/elements/moz-input-color.css": "4a557fe2ca7393696ec36bc2a5bf6152ba6be2037fda15823bf9b73699e06dee", "chrome/toolkit/content/global/elements/moz-input-color.mjs": "a7930dc48c23f3fa11848773af12958bd281f014887220dffc445dce9524aed3", - "chrome/toolkit/content/global/elements/moz-input-color.tokens.css": "422fe932c3e756c9ad8695d3039da313c16de69ad6d16837c95c0e77e30f806b", - "chrome/toolkit/content/global/elements/moz-input-common.css": "9cb7d7fa31b79646d053a6f17bc79564e4ade90b57c3bd7c3cc186f1ba9ef06b", - "chrome/toolkit/content/global/elements/moz-input-email.mjs": "e0c7b4651f06696c5f225d39392fdedd35260c3803070c11458290832ca775d5", + "chrome/toolkit/content/global/elements/moz-input-color.tokens.css": "3548ee630ab944e6f39631a51d3707de182efa51741738969eec6ca89e82340d", + "chrome/toolkit/content/global/elements/moz-input-common.css": "c50d6754a78275810add98bf6416cc8a5f6a612b152d6814447243c4298d6c1c", + "chrome/toolkit/content/global/elements/moz-input-email.mjs": "f85a699dcec0d02bfb32e81f86f8ec927bf30a2b850ca0196c07f9858450f941", "chrome/toolkit/content/global/elements/moz-input-folder.css": "4c62227f3ea9230cbbe3f22098d68bf24d09512901a32f179662d7a45280d166", "chrome/toolkit/content/global/elements/moz-input-folder.mjs": "b0002e3b51d58d09f2bb1ef85e67f01774bb1df2d3b617a8a18bb6a8bf3ee74d", - "chrome/toolkit/content/global/elements/moz-input-number.mjs": "d3b8cf1c0bd73b842b51439b26914d48efb4f122a4abdfdd79a65716ccc6c923", - "chrome/toolkit/content/global/elements/moz-input-password.mjs": "3d39d9212064a071d37d4415eb1dc78f3e38456030c4f1506739215d86acd0a9", - "chrome/toolkit/content/global/elements/moz-input-search.mjs": "cefa046364aee572a1389be99d82462c8e9d8dbb12412dbc59f28194b73e3021", - "chrome/toolkit/content/global/elements/moz-input-tel.mjs": "1a519762924bb11cc9187f1bdc4e1e76ab53092aae5f573a59ffe593f86a2523", - "chrome/toolkit/content/global/elements/moz-input-text.css": "76942449ad69429237e810bf4147ac0b6fa2f6cf6074b7074a964e17627797eb", - "chrome/toolkit/content/global/elements/moz-input-text.mjs": "b753499ec75da3b356b2b22dcefdb9d96ccd66c5b0f9d12d81c35cc5eefdaec4", - "chrome/toolkit/content/global/elements/moz-input-url.mjs": "ecd8f8f7f2bb08901e445632d8106989e9764f5dfa8fb786a2acca20e7e1658a", - "chrome/toolkit/content/global/elements/moz-label.css": "6879dc5cfe3b05e3982b123e9a761fbf03d30092a977997cbb14fa9967ba771e", - "chrome/toolkit/content/global/elements/moz-label.mjs": "faa9b1e97ec80a027a5d96bdf82a0b36a61eb50e96ba00c142c0ff600e6cbe5b", - "chrome/toolkit/content/global/elements/moz-message-bar.css": "b4e1fd227bac19ef24645b69f368cf935b81bd6be213de20c5e8d1fe15c1284d", - "chrome/toolkit/content/global/elements/moz-message-bar.mjs": "a0cbbb37ef1c6ed3d246b7b38957dbe64f8b3f1cab5c33a1a79466645717799a", - "chrome/toolkit/content/global/elements/moz-message-bar.tokens.css": "cb227087fed61894653b8f3de0e3ba052bd9539662a1306237edb5a5e3ac36d4", + "chrome/toolkit/content/global/elements/moz-input-number.mjs": "256344bfcca157ef739f69e4964213508c04dd81b5b084bb3691ec0582dc7947", + "chrome/toolkit/content/global/elements/moz-input-password.mjs": "b462a82d0befc65a08c10a3ca7d59484c16f5ecb78e38b0e9b762e754e26bfbc", + "chrome/toolkit/content/global/elements/moz-input-search.mjs": "f2a21ac5edc13a2e2f602093fb5273040f3cb50dc905d0f285a5a9967c56fe81", + "chrome/toolkit/content/global/elements/moz-input-tel.mjs": "3ef9cdaa3d4109c872835cdad16642c45545a57734c099b3e0e31c8f203cee68", + "chrome/toolkit/content/global/elements/moz-input-text.css": "db7f01ad963060ca1bda65599d68f59f2eddb5389f8b1535af21205b6b948bc6", + "chrome/toolkit/content/global/elements/moz-input-text.mjs": "e78d7380d11a099d6d51c8aa98bf6869597a907f0a009fe7075a47ee23b7cceb", + "chrome/toolkit/content/global/elements/moz-input-url.mjs": "15ec46271fc45207f833f0ec5b163de0f39c77572942d1dbaa67d7aa778f068a", + "chrome/toolkit/content/global/elements/moz-label.css": "d8baf92cd83a47123cce74eb064c21437e21e0da1705a8101b87886b1d4f29ff", + "chrome/toolkit/content/global/elements/moz-label.mjs": "d229c34093cdefc08c3a690bcaaeb099aea95864bfda4db06b15c20fb9b5c029", + "chrome/toolkit/content/global/elements/moz-message-bar.css": "757c07b0cdb9f52260275a6a1e56984a9f9dbd7645eefec9ba22cfe5418820f1", + "chrome/toolkit/content/global/elements/moz-message-bar.mjs": "19c762123072fa275b938f72fe4660b7d31ba60a3783b05844779b5b5abfeb19", + "chrome/toolkit/content/global/elements/moz-message-bar.tokens.css": "ad53238fdb6cf823ac6b92e567fc59a0dbefeb28cf6bd2f8514c6d117e9fd612", "chrome/toolkit/content/global/elements/moz-page-header.css": "57da71b1e5fdc1dbedb8ded9e8796d8393eb4dcb00c1b1265f6460214a38f3e6", "chrome/toolkit/content/global/elements/moz-page-header.mjs": "9dd9ed08428bba40a8cec91d545bd297a37282a827b4b2b9da07653e5cc87090", "chrome/toolkit/content/global/elements/moz-page-nav-button.css": "fbc5580768225b86eb1d13fea5d2dc5b4132d5f6b154434f4712cfa2a7c5c5f1", @@ -2392,54 +2421,56 @@ "chrome/toolkit/content/global/elements/moz-page-nav.tokens.css": "6686817c76ca73fdf1076c5ffeb2db320fbb254822de75d31c5276cc5b4eae52", "chrome/toolkit/content/global/elements/moz-promo.css": "d718fe62d6b0de1f7772e7dc85b77a73d3fa8f55b6efa09ebbd21c7b1f062a19", "chrome/toolkit/content/global/elements/moz-promo.mjs": "94a81c5d085b6851944343917b05eeceac76f6674a1572abdf2388d22b117ffb", - "chrome/toolkit/content/global/elements/moz-promo.tokens.css": "e581abd6b8397e2a273b62e6e525388c930639ecac949321e444ca0ffaee46f7", + "chrome/toolkit/content/global/elements/moz-promo.tokens.css": "2c6db2522b10d489d0d9b56d0332a00f5e233dc409366db19758ae2abf8fcb1d", "chrome/toolkit/content/global/elements/moz-radio-group.mjs": "701f5ad1677dc388b10e78815b236754d227845708f719912cb35c1fc256fbad", "chrome/toolkit/content/global/elements/moz-reorderable-list.css": "679d92d5607ae72588749c8150ef5cf1932cd393b18d99a324f9a31bee8664b3", "chrome/toolkit/content/global/elements/moz-reorderable-list.mjs": "e9a48f78c5ca852fc097724c5508ef09a05d147f4a038c21ad210daa7da423d2", "chrome/toolkit/content/global/elements/moz-reorderable-list.tokens.css": "65193b4e43c59049054019ac687118966214d35bbbd42484f2f62801aa0c9dab", "chrome/toolkit/content/global/elements/moz-segmented-control.css": "e6b33a46ce165c80cc23efc60f5161a4e1260c0e54874622ec6026fe4fcdea9d", - "chrome/toolkit/content/global/elements/moz-segmented-control.mjs": "e92d419a3f5622b3a226b2dd1e0463d79b9229ebbb338f2c08491fd8b4d6329b", + "chrome/toolkit/content/global/elements/moz-segmented-control.mjs": "f4d322f94bf8874a697edd0213c822fcda8a74d91d30254c19ca86750b3f246d", "chrome/toolkit/content/global/elements/moz-segmented-control.tokens.css": "d3ed2cb0b91bdac4ad45c4d683d958a15e51964f4798033ae185c8e008169bc7", "chrome/toolkit/content/global/elements/moz-select.css": "a43564c55c9a747058e034efa90486adb9ab15251faa1649655be8fbd9bf4291", "chrome/toolkit/content/global/elements/moz-select.mjs": "cd10fefc752ba43ffe98d1951946c3e367ddb49b0c7b78ad4cdc2c240c60ab73", - "chrome/toolkit/content/global/elements/moz-select.tokens.css": "89727b99ce0f4fe7aac9adfbf24fdfa11ac5c41f3c5c8d1b5510e2ac38c6139f", - "chrome/toolkit/content/global/elements/moz-support-link.mjs": "cd71dac0b84624daaeac8752a47b6ef481b75152e989b91695b229d929a7f4ed", + "chrome/toolkit/content/global/elements/moz-select.tokens.css": "eb67cdf0d36afff3186253c8d0a4130e7efdc4187dbfc574f34286b0555e1445", + "chrome/toolkit/content/global/elements/moz-support-link.css": "9c9a71dcfb602b570a325e2414f10f614b249c79e49e512473dce31c01983eb7", + "chrome/toolkit/content/global/elements/moz-support-link.mjs": "014daa3aefaa6871290334a3e99b3a601482f84b3704e29861bb4661b64ae0bf", "chrome/toolkit/content/global/elements/moz-textarea.css": "732e864398a349fceea4bf91ae3ef3f7fcf7ae53a18d7ea54e85acb71096c05a", - "chrome/toolkit/content/global/elements/moz-textarea.mjs": "9a2065d2826147911ecbbe7a2da64c6c97cff043e36592f152d7c9812e4399f1", + "chrome/toolkit/content/global/elements/moz-textarea.mjs": "38d3270b60164d97de7807fc375bb3e6452cf399b1242a8192842d2bc65bee2c", "chrome/toolkit/content/global/elements/moz-toggle.css": "e4077c7775d9aa6a3184bc83b47fab1e7604ea7c67d45d8ce8a7507bce7e5dba", "chrome/toolkit/content/global/elements/moz-toggle.mjs": "7c0cdb5c7e1dec5d1058c356f8fd088c7c2bea93038a6de6205299cff6db3314", - "chrome/toolkit/content/global/elements/moz-toggle.tokens.css": "1a39b74b3332aa6ca522a69185c4fc2ad655dc6e63799faa8471a6d096bb1b97", - "chrome/toolkit/content/global/elements/moz-visual-picker-item.css": "3e9bc3e03670534706ada5d64204194526ae711ceaff60c6e6d2df11dad5a186", + "chrome/toolkit/content/global/elements/moz-toggle.tokens.css": "91a9525c07973dbe937b41f7ba96bc6e3723a08640053603215b2cf49804c2f4", + "chrome/toolkit/content/global/elements/moz-visual-picker-item.css": "cbc63bf383d7b6f803962e17990ac9ab275adf8534f035d9ca09f9f3d87a5139", "chrome/toolkit/content/global/elements/moz-visual-picker-item.tokens.css": "1eb9eccf175fe1e8817626d5f45759016a383e88886684e969f2d42145010220", "chrome/toolkit/content/global/elements/moz-visual-picker.mjs": "ac45af36f9b9c69d1db9247cd03670eca802039ef59e2218d88ec7e98033d7ef", "chrome/toolkit/content/global/elements/named-deck.js": "0caed8260d829939db6f086b6db55a600ab66c00cf989483b3c1f33a7a38c390", "chrome/toolkit/content/global/elements/notificationbox.js": "07e18a3cf4225e25ad6885a92b610d7db26f7a99104362d1030d59a82107d1e7", - "chrome/toolkit/content/global/elements/panel-item.css": "0d67b07c5bf1f74a0520ee0d5a1ea83bb0cf80182bdb0595c112e5a44c1c9d83", - "chrome/toolkit/content/global/elements/panel-item.tokens.css": "e77534e7358067dfa72d06f4cd6604a26d1ff9d8e33013ea851590f997ff40e1", - "chrome/toolkit/content/global/elements/panel-list.css": "1d2bf750d502f940cba4ab0f0dd5d5c03f86555031184104d75ee300e3510d2f", - "chrome/toolkit/content/global/elements/panel-list.mjs": "e423c42e59e2ab0c5f00aa1c3c6666e9cb97e450667be0118fe839413d729b2a", - "chrome/toolkit/content/global/elements/panel-list.tokens.css": "79f67eeac5b68924db2936d03119223d1f6c70406493b851391cec639c7d3b13", + "chrome/toolkit/content/global/elements/panel-item.css": "266b8a0f1b58857c2d111ff1bd3135d38dea2b8394dcdc73a00f4e88e89de2c8", + "chrome/toolkit/content/global/elements/panel-item.tokens.css": "177d2ffd8f90bdf7770eb827f480d5243a5c2f45f5ffb7a06b7a8badd9b44c76", + "chrome/toolkit/content/global/elements/panel-list.css": "52e535b5c29e60ce65c5f863b3cba2a6f0efd1313e3bd39203025ade23f6ab97", + "chrome/toolkit/content/global/elements/panel-list.mjs": "69693d4cb524a90118a2e7498564e0e4f8346fe317362b01df3ebdcc0ecac4ec", + "chrome/toolkit/content/global/elements/panel-list.tokens.css": "172bc5251ec54636a6af6752bdc41f9103735ed18bf73a56574a477f7ffe9aba", "chrome/toolkit/content/global/elements/panel.js": "a15f171ae368a837c5a7e5c06c98e39023f0e43c13b543442144e177e16cc842", "chrome/toolkit/content/global/elements/popupnotification.js": "e98776280cdd42f26366082728f1fd54bff96dcaac2adfa58f248edca5df5fd2", "chrome/toolkit/content/global/elements/radio.js": "429620586c7911316acd03af9ef950ff55ce5e87331b5ed2fbcce8b83bf49d40", "chrome/toolkit/content/global/elements/richlistbox.js": "5f3fdd1fb9539c12c6fc9f81222a48072692169ea5d5ea32ac3c6c25d6915553", "chrome/toolkit/content/global/elements/stringbundle.js": "21afef97104c799ab6d3aab6beef27252d47ff4ae75a524f53b13cab1479e0e4", + "chrome/toolkit/content/global/elements/styles-mixin.mjs": "756649b6888ea70c998e68d0d935d42e12aa13f281212aaf3c157b69abcd8f02", "chrome/toolkit/content/global/elements/tabbox.js": "2141ce058ee6302c50b82cb3e2568555c96bcbc4fb1dd537164dfafc29193075", "chrome/toolkit/content/global/elements/text.js": "d7f123a7b525737b97d669b462965c589118af68cb9c8ae18583069f3b3f5d35", - "chrome/toolkit/content/global/elements/theme-picker-direct-controller.mjs": "e33f2d38d08b5ad724c6dfba3c726cff67334948637c83225e172159f64c371d", - "chrome/toolkit/content/global/elements/theme-picker-remote-controller.mjs": "e02c43550dd70e547e5624003d750229c8aaf6d90583142d244f1291fcb9b1e1", + "chrome/toolkit/content/global/elements/theme-picker-direct-controller.mjs": "26f5608418a27e4847cb510439eceb8784bd4c46e8cf30e276e2971aa8dba92e", + "chrome/toolkit/content/global/elements/theme-picker-remote-controller.mjs": "631f8f58fc05bbac552d734aedd5cb4d9a11658fe0b5c6b10f33bd09693280e9", "chrome/toolkit/content/global/elements/theme-picker-storybook-controller.mjs": "a327fdadf7a0a6023208a7fea969cd00fdd554d69eca8970eed5b73ea136a593", - "chrome/toolkit/content/global/elements/theme-picker.css": "c64f8ed7cf075d2af2046b5443d49659515643c663a9442f26ab6793d61cfc52", - "chrome/toolkit/content/global/elements/theme-picker.mjs": "1e0e3f4dc6ff1018aa58327250320ce5d5ad2073891f22c7d7dba6431738d075", + "chrome/toolkit/content/global/elements/theme-picker.css": "47bc42c71ab3baab00b787b5b3be3e9925532a0c0daf3a0c7a04112f9fe22f1f", + "chrome/toolkit/content/global/elements/theme-picker.mjs": "40a6095951b23c4fe3831fdcbcbddd5dca343a5f245166fb0a704d0b1401fbaf", "chrome/toolkit/content/global/elements/toolbarbutton.js": "aca4431af17b9eed68523896bb293167b4007d1cf0a23518d25ba27bed6b256e", "chrome/toolkit/content/global/elements/tree.js": "ac29e3dd014f680d86c83299d88f2fb911dc8ce5134cd5068475aaabd5a3ba84", - "chrome/toolkit/content/global/elements/videocontrols.js": "6a3965e8ed722b6fa669620eb2a44c6a354bb5d3de7fa0c57f809871ccea00a1", + "chrome/toolkit/content/global/elements/videocontrols.js": "dde007243198f460360461af6b7df9a29da0c297904174248c5868902213e168", "chrome/toolkit/content/global/elements/wizard.js": "49753fc93cd49226d589ad4f48c29eb650163cd81deb5705dc6538f92a948a4b", "chrome/toolkit/content/global/errors/cert-errors.mjs": "752ff1d5b55d08a76314f497b6c7409deae8d211d52da97d344beb7779328d3a", "chrome/toolkit/content/global/errors/error-lookup.mjs": "b1c059b0b5ce38ea9ccc5fde7da4eeac27086903410637272d3f68105d0df231", "chrome/toolkit/content/global/errors/error-registry.mjs": "5fdb919280c3c3e2a8f5c4531a815e7dcae66a4bb2d530f4f1870ce90b27085d", "chrome/toolkit/content/global/errors/net-error-illustrations.mjs": "6bc18198cc58edf9e74df4bb2395d2038c12312d11b5496669e0d3e4e97a1823", - "chrome/toolkit/content/global/errors/net-errors.mjs": "b25418f2b908544461e6acdb712c9d8dbd45f57b81decd8bfeaf15330ed6228a", + "chrome/toolkit/content/global/errors/net-errors.mjs": "3827de0bdfaa657886e3be6d9a490398f9f801ff36aa78155eec403b42fee8d4", "chrome/toolkit/content/global/errors/pkix-errors.mjs": "4ee68a9cd6f8ed0ff59502dc1d21df1d12af15ba5d30a483041dbbfeb407e478", "chrome/toolkit/content/global/errors/ssl-errors.mjs": "82030b79b110fe5f82c1ad27e95456697b50bc9768d7ddcaf4a21fd7b34f454d", "chrome/toolkit/content/global/filepicker.properties": "e00dec1cf8909fd9947f590fd550217700bc046559bae09e9c33c0ded57d606f", @@ -2450,12 +2481,12 @@ "chrome/toolkit/content/global/httpsonlyerror/errorpage.html": "d888a613c6b6ed11a8ec0d5a08d16f829d3df243b544808f537a7a3681d74164", "chrome/toolkit/content/global/httpsonlyerror/errorpage.js": "1aef2602893362712c9fe632ffb1aaa1ef35b5d451c3b3b71c437f59a8da6adb", "chrome/toolkit/content/global/httpsonlyerror/secure-broken.svg": "8d3bb669a6a8f6721a09d8ba1ca332a0cbba049c6dc9857e2417c26c80658202", - "chrome/toolkit/content/global/license.html": "c1b934120d148f6cde534a622be525e454adca11ed068966c325a2220948b9e5", - "chrome/toolkit/content/global/lit-select-control.mjs": "f2c7a6339ae60920c627217f3ef86bd89fa4e13ecbe1d1e6f6fcc6e0c8c7cef0", - "chrome/toolkit/content/global/lit-utils.mjs": "511cba61bee93807e0ab97ee874fc54549cbaa24449a6ced2a851013a152191d", - "chrome/toolkit/content/global/megalist/MegalistAlpha.mjs": "72d96f2d433f87aafef91a049bdf54538e6686b1a5febb0d7879e74435062aff", + "chrome/toolkit/content/global/license.html": "25b3a5b7f09335efc0e1c5f1a5fb35dcb612b272a0ef6260a0554b85748b15ce", + "chrome/toolkit/content/global/lit-select-control.mjs": "627f38af47ce948439f7a5a6063033583735cb9fb1f863d471a80c8ff98cfbbe", + "chrome/toolkit/content/global/lit-utils.mjs": "0832b5f6e6e3f2e95e1b83d9bb2430f7176d37b4748d85d7c8a755891c700680", + "chrome/toolkit/content/global/megalist/MegalistAlpha.mjs": "912d85e2e2f5049e045477b407a2f7d901e4229336301adecb1d63e4dbae5aeb", "chrome/toolkit/content/global/megalist/components/login-form/login-form.css": "6454913badb1b17a9d31edecdd4f0721a63fe2de1de7e23b65264960c42a1798", - "chrome/toolkit/content/global/megalist/components/login-form/login-form.mjs": "4cb201b27b2cbb1e81bd8940dc05b445e6d0d693f427aac2652f0dfd24e32fab", + "chrome/toolkit/content/global/megalist/components/login-form/login-form.mjs": "5c6c6a39a92c2de04fe99e612b677e7c1f84594a78e4dae11087a22d8504ba96", "chrome/toolkit/content/global/megalist/components/login-line/login-line.css": "6866a93f94301b4195cc7c65bb478fb1d69325377d57c0a74a512d99d71ef1fa", "chrome/toolkit/content/global/megalist/components/login-line/login-line.mjs": "fe8ea3611231154713710235e1edd7540600c38b463536fcf10f48d47f00cef5", "chrome/toolkit/content/global/megalist/components/notification-message-bar/notification-message-bar.mjs": "914f0c5c61a05ad5e45d4811ffb0bf286f38ffba1e3c4fc5b20feff02a862f3a", @@ -2464,13 +2495,13 @@ "chrome/toolkit/content/global/megalist/components/virtual-passwords-list/virtual-passwords-list.mjs": "ff761f6fd2704bd252b4e63b6ebb36dcd54e25afc4cbe742f263b315a47fcc9b", "chrome/toolkit/content/global/megalist/icons/cpm-fox-illustration.svg": "b21ba63deabb9518b439985c4b0a86882ef9b80f01faf811aad21d98dbaf04ef", "chrome/toolkit/content/global/megalist/megalist-agent.css": "2bdf47294e0b2669f9a27a77980f781aa40ccc5cd5454175c486a3748e28cf39", - "chrome/toolkit/content/global/megalist/megalist.css": "eb329026a8fc387a5ee5131e0cf292f72577dee397c6a37924fd1af53024c86b", + "chrome/toolkit/content/global/megalist/megalist.css": "6b499bb9019bfeebe6294247799e8d447718670d13019ae7564e0a5745449a71", "chrome/toolkit/content/global/megalist/megalist.html": "9cbe254bbd4c15a909d413c52b6589fe7fa565d6d547cc787973a738775dd5e7", "chrome/toolkit/content/global/ml/AIFeature.sys.mjs": "658da57febbfe8e02e188df0e57ce76e4bac2f92f14c0402a2f48a4a06000168", "chrome/toolkit/content/global/ml/BlockWords.sys.mjs": "f08acd5939a0b3326615258e3f99e55c64e055dc81d541c3526b74abdfef0d8e", "chrome/toolkit/content/global/ml/ClusterAlgos.sys.mjs": "0d65d31d1bc40102d6b126da95062357c01b1696ab4fe7aa8802001cd917b310", "chrome/toolkit/content/global/ml/EmbeddingsGenerator.sys.mjs": "71e6a71cae0f82cff6a00cc44816246d0e3cb63a42449b00bfaff8e6528ee851", - "chrome/toolkit/content/global/ml/EngineProcess.sys.mjs": "529b0c05affbcef1261944fd1af82032fea1c48d880b171527426c8ed089f8ef", + "chrome/toolkit/content/global/ml/EngineProcess.sys.mjs": "766cf8253edd7dc67165020c76eb05cbb0288271631454f9efbe08344568505c", "chrome/toolkit/content/global/ml/MLEngine.worker.mjs": "1f24bb5b97f8051e4279c183f9f96e246560452c28de0c1bb5b2b3386c91bd1f", "chrome/toolkit/content/global/ml/MLTelemetry.sys.mjs": "125afd81553bc3b16291e2de7674e7feb586eb9a8d3835a709de065cc7f1b1b0", "chrome/toolkit/content/global/ml/ModelHub.sys.mjs": "f6a62800379a26eb6779376b084a798a5c66dc1e4ae193d8583ca5090776f6d9", @@ -2478,37 +2509,30 @@ "chrome/toolkit/content/global/ml/OPFS.sys.mjs": "07ddde6ec626c048eaa0a1a6ee04b10457ebbb2ee23953ac82f01f2e05526910", "chrome/toolkit/content/global/ml/StopWords.sys.mjs": "2fe79ffea4a140bbd02d70fb69717706842aff10ecb81be3a1425d300ced0586", "chrome/toolkit/content/global/ml/ThomSample.mjs": "15689c72a6215913a192a8618b4ad0a185016eb7bd20c031759ab203dfce3257", - "chrome/toolkit/content/global/ml/Utils.sys.mjs": "9895ad51282059043c1fe910874ae2db14a19ec3d770042ddfaf04f195bd3b68", + "chrome/toolkit/content/global/ml/Utils.sys.mjs": "3306965a8f8ba8b0f2c254d72ea24fe813ed0544be5ffa554abb7d3eec62debd", "chrome/toolkit/content/global/ml/backends/LlamaCppPipeline.mjs": "41b9803258a8890206049c318c4abf117eb2595b368df6552d83b9e2c45ac2ce", - "chrome/toolkit/content/global/ml/backends/ONNXPipeline.mjs": "ae006cf54ee53ec74c18ad215af41abd5c34bb4da253a26f4f4f489281b1f26d", - "chrome/toolkit/content/global/ml/backends/OpenAIPipeline.mjs": "3b55a4926c621eb02d8187c212f537311af3fd6aa9e15d37f34b9b4e1dc386a1", + "chrome/toolkit/content/global/ml/backends/ONNXPipeline.mjs": "046e9437ea275abe622cae8fb306677144ded3b2829de13a0af429f44bc802b8", + "chrome/toolkit/content/global/ml/backends/OpenAIPipeline.mjs": "9cdd03d714239bd485fef57f51d3f6c235d90356da39ac28771ab6793de581e6", "chrome/toolkit/content/global/ml/backends/Pipeline.mjs": "adfa37ee8816f5ef9a832f82c9c917724777a8b89b022f8d8235bc6e40b4f4e7", "chrome/toolkit/content/global/ml/backends/StaticEmbeddingsPipeline.mjs": "183b19fe0cf25f0833fb1697b68666ff68e2bc77322fd7dce2db566f6dfdc1e8", "chrome/toolkit/content/global/ml/mozilla-logo.webp": "c47dbb392a6cb491011ed68fdfb29715dbb54c89c0ada9b6019b3161ed27e6ac", "chrome/toolkit/content/global/ml/openai.mjs": "05721c8556f820d564eefcb5a10d66a4d0c89c7005ebc4d4263ebc0c5de07eae", "chrome/toolkit/content/global/ml/ort-wasm-simd-threaded.jsep.mjs": "08fb86ec433c78bfb032c5d84a68b8e8e5a8d81268fa39e24314179a5767a5b9", "chrome/toolkit/content/global/ml/ort.webgpu.mjs": "0e8b345c2fa92adac1a309e0d01fb8ba3aaf1e42140734bbed6f4ffad0bfcfd6", - "chrome/toolkit/content/global/ml/security/ConditionEvaluator.sys.mjs": "76e7576262dd36078db3b2db338f92fd48de060ccf60106b1897bda351331163", - "chrome/toolkit/content/global/ml/security/DecisionTypes.sys.mjs": "d1dc76a5f8f99f7c6519be5f83671fb6e19e3f25404d10d639db15a7abc87835", - "chrome/toolkit/content/global/ml/security/PolicyEvaluator.sys.mjs": "b70b1db8a419fa3b0ba050a1cd7674618c7599fd3cb122661c6585c579efd416", - "chrome/toolkit/content/global/ml/security/SecurityLogger.sys.mjs": "f41bf671d6e0430dff1fe4816f97210def2e5b63138a3927eaac31307add07fb", - "chrome/toolkit/content/global/ml/security/SecurityOrchestrator.sys.mjs": "4b04e77383b55937e0def41dcc3ff2a420898a36bdb2db55430bdff16b66cf81", - "chrome/toolkit/content/global/ml/security/SecurityUtils.sys.mjs": "8d1de1a5eb07b772874352b58314ef29470ac211059d96c9b4d1fde791a5dd1d", - "chrome/toolkit/content/global/ml/security/policies/tool-execution-policies.json": "7c2ca513506f1931f0617b87bac108af255b167374d7a41b53f4fabf630597a5", "chrome/toolkit/content/global/ml/transformers.js": "0c084f3201ea5f832a51669d3ba0d193b19673fa55037214e0ea483a7eb94456", "chrome/toolkit/content/global/mozilla.html": "a29a0212af125eb157c0b642c3df80b17371d3e96bdec72310bb634ce523ed1e", - "chrome/toolkit/content/global/net-error-card.mjs": "af7455f0c02c66f093feb83616e2c8066abb5eefe7cce9f747810301e69adac6", + "chrome/toolkit/content/global/net-error-card.mjs": "96aa2eb249f525657b700a7200b3333c577fda93512b1557030c059b2ee55bfb", "chrome/toolkit/content/global/neterror/aboutNetErrorCodes.js": "25ec76b91bb96800e84e93ba8f6cca629137dc3f0c9ce0ab7148e11a7d76703d", "chrome/toolkit/content/global/neterror/supportpages/connection-not-secure.html": "e96448a83cb3c48825b9fabfbc7e65e54ec0045d8f4ed1388daa7450dbfca688", "chrome/toolkit/content/global/neterror/supportpages/time-errors.html": "61c041ff0e15434ed3053fff56df6fa43b0079793496782848aafd200ae25069", - "chrome/toolkit/content/global/pictureinpicture/player.js": "b43870aa59bf954c1c491aba4ef8c7c3ca68e7cbec6fa0d1799cdad525fe4815", - "chrome/toolkit/content/global/pictureinpicture/player.xhtml": "b3d7b54300c399c510001dce569cff900d3327c76f17a921c4e1d077889cc3ec", + "chrome/toolkit/content/global/pictureinpicture/player.js": "464c3de66ac37f42343b4e99245f6394706245677ac5dc3dcd6dd00cdc56a236", + "chrome/toolkit/content/global/pictureinpicture/player.xhtml": "e8719346e79e14d7bd08dfce82be070f6687ccb635effc0ab274c777d3933f43", "chrome/toolkit/content/global/preferences/AsyncSetting.mjs": "b7555e72504bfb75d6207b977fde994f9fd44bc36c275acce36f84953cac2239", "chrome/toolkit/content/global/preferences/Preference.mjs": "f491de490dc0840e2a1eb5ba8c85e8a47bc74582125649f878a964d0ba21bb1b", - "chrome/toolkit/content/global/preferences/Preferences.mjs": "2d5aec7a7a2d21cde748ce9d5b52c73f4343df86408ea0759acc40054516571e", + "chrome/toolkit/content/global/preferences/Preferences.mjs": "928f90c065f867a0a1bc119cdc397253185f008b53eb866ccd6e170eb0ba63f4", "chrome/toolkit/content/global/preferences/Setting.mjs": "924e9c9c7c620d1ad607ed494bd62f28b29a758346212d9a92dd2af1f0b1d156", "chrome/toolkit/content/global/preferencesBindings.js": "186ddd21a1c73850fcaa7d8f87781dd862fa0bfba835c9fee7d91336caa4658e", - "chrome/toolkit/content/global/print.css": "424bde4b40adb9faa80ca66387c5d453b3cb02ed7c187009492cb26ed4e3352c", + "chrome/toolkit/content/global/print.css": "143fac3e37d37e3323736c82aae0ea166e63bcd519ba165a1dcaa56d08d9bdf1", "chrome/toolkit/content/global/print.html": "21953ac39388bb6e1211e351d17971a414bc0ffbc2bff74e1aa2b8c7cd6098f2", "chrome/toolkit/content/global/print.js": "e62f7b5c6dbfd9a38b09011739ea845fc91ef0f3ff531dfba8d45e25e613c8ca", "chrome/toolkit/content/global/printPagination.css": "3a0af1a53f5bf30364980cb0f6949403d3bcd3f151d3472f34afc373ed6c528e", @@ -2534,7 +2558,7 @@ "chrome/toolkit/content/global/translations/TranslationsTelemetry.sys.mjs": "8a391c7735b5fa4ab56071f8192388aea41b7acf8835fcb9a978147e956b2081", "chrome/toolkit/content/global/translations/TranslationsUtils.mjs": "e018c30b62bc3f3b939b199768e7f9e993443207610ab8213e2d39e014a0be21", "chrome/toolkit/content/global/translations/Translator.mjs": "ccc5d2faca19f7968f66f58bebedec8525a14dc116e8019fbb4be83bd87ca79c", - "chrome/toolkit/content/global/translations/about-translations.css": "a52e1805ec87841ffe87626f3e7cee3d93bb7cff7ad1619427bc9b9ce6977934", + "chrome/toolkit/content/global/translations/about-translations.css": "e5606d51eb399516b70246d9f144f6f1505902807751bd452eee08bf9a68070c", "chrome/toolkit/content/global/translations/about-translations.html": "59962ab412d83acf48fd90ce041973c10e0f3fc24d115b2458bcb568446593eb", "chrome/toolkit/content/global/translations/about-translations.mjs": "1de8b5539537807d0877c47e3744101ce021a8b8f66825e39c3ff0de159e7909", "chrome/toolkit/content/global/translations/bergamot-translator.js": "faff1ef6285b0d26f01787776fd49299dfb756ecb9688aa990c250e66797b47d", @@ -2562,7 +2586,7 @@ "chrome/toolkit/content/global/win.xhtml": "74318236486bd65b9b14149f1f3db9aa39478168ef2119a0bed3af857ae9f9a3", "chrome/toolkit/content/global/xml/XMLPrettyPrint.css": "61ade6aa84e8668d2a4e23619fcf554088ed9e16b1a824e8b76c1b48e911458e", "chrome/toolkit/content/global/xml/XMLPrettyPrint.xsl": "6d19611c92b9fbfe74cd4c0848b06eb13dbcee7386439b7e7757a95a43cc6c0b", - "chrome/toolkit/content/global/xul.css": "fc62bad7fa88eaf53ce1c629db1f207adee047e0fd2ee3cc8374ac993514ffc7" + "chrome/toolkit/content/global/xul.css": "b15fa61cc541e033d47c9acffe2d13c9633f29bc90ab19532fc57c96aca48c9b" }, "prefixes": [ "chrome/toolkit/content/global/" @@ -2650,7 +2674,6 @@ "devtools-highlighter-styles", "devtools-shared-images", "devtools-webextension-fallback", - "extra-themes-previews", "gre-resources", "messaging-system", "nimbus", diff --git a/browser/scripts/package.py b/browser/scripts/package.py index 606741d5..8c525585 100644 --- a/browser/scripts/package.py +++ b/browser/scripts/package.py @@ -65,6 +65,29 @@ def font_groups_for(groups_file, oses): return sorted(out) +def ascii_file_names(root): + """Rename every file under `root` whose name is not ASCII. + + The release zip is extracted with `unzip`, and unzip 6.0 under a C/POSIX + locale (a Docker build, a bare SSH shell) reports each UTF-8 name as a + "mismatching local filename" and exits 1, stopping the consumer's install + -- though the zip stores the names correctly. The font bundle's Hiragino + faces are named in Japanese. Nothing reads a font by its file name + (fontconfig and the flat CoreText/DirectWrite directories take family names + from the font itself), so the ASCII part of the name is kept and the rest + replaced by a short digest of the original: stable across builds, unique. + """ + for dirpath, _, files in os.walk(root): + for name in files: + if name.isascii(): + continue + stem, ext = os.path.splitext(name) + kept = ''.join(c for c in stem if c.isascii() and (c.isalnum() or c in '_-')).rstrip('_-') + digest = hashlib.sha256(name.encode('utf-8')).hexdigest()[:12] + ascii_name = f"{kept}_u{digest}{ext}" + os.rename(os.path.join(dirpath, name), os.path.join(dirpath, ascii_name)) + + def add_includes_to_package(package_file, includes, fonts, new_file, target, version, src_dir): with tempfile.TemporaryDirectory() as temp_dir: # Extract package @@ -158,6 +181,9 @@ def add_includes_to_package(package_file, includes, fonts, new_file, target, ver seen.add(digest) shutil.copy2(file, os.path.join(fonts_dir, os.path.basename(file))) + if os.path.isdir(fonts_dir): + ascii_file_names(fonts_dir) + inject_locales(target_dir, target, version, src_dir) # Remove unneeded paths diff --git a/browser/tests/native/test_gpu_display.py b/browser/tests/native/test_gpu_display.py new file mode 100644 index 00000000..df4d0504 --- /dev/null +++ b/browser/tests/native/test_gpu_display.py @@ -0,0 +1,147 @@ +"""headless='virtual-gpu' on a real GPU. + +Needs the card named by CAMOUFOX_GPU, Xorg with the card's driver and, without +root, the machine set up for it (`python -m camoufox gpu-setup | sudo sh`). +CI has no GPU runner, so this is a subset of its own, run on a machine with one: + + CAMOUFOX_GPU=01:00.0 python3 -m ci.run_native --subset gpu --binary path/to/camoufox-bin + +The GPU-free half is python/tests/test_gpudisplay.py. +""" + +from __future__ import annotations + +import os +import signal +import subprocess +import sys +import time +from pathlib import Path +from typing import Set + +import pytest +from playwright.sync_api import sync_playwright + +from camoufox.gpudisplay import ACTIVE_VT, GPU_PREFS, GpuDisplay, select_gpu +from camoufox.sync_api import Camoufox +from camoufox.utils import launch_options, sync_attach_vd + +READ_GPU = """() => { + const gl = document.createElement('canvas').getContext('webgl'); + const info = gl.getExtension('WEBGL_debug_renderer_info'); + return [gl.getParameter(info.UNMASKED_VENDOR_WEBGL), gl.getParameter(info.UNMASKED_RENDERER_WEBGL)]; +}""" + + +# Opt-in, like typescript/tests/gpu-display.test.ts: without a card named, a +# plain `pytest browser/tests/native` skips this file. `ci.run_native --subset +# gpu` refuses to run without one, so a requested GPU run never passes empty. +pytestmark = pytest.mark.skipif( + not os.environ.get("CAMOUFOX_GPU", "").strip(), + reason="needs a GPU: set CAMOUFOX_GPU to the card under test, e.g. CAMOUFOX_GPU=01:00.0", +) + + +@pytest.fixture(scope="module") +def gpu(): + return select_gpu() + + +@pytest.fixture(autouse=True) +def hidden(monkeypatch): + """Nothing here may open on the desktop the tests run from.""" + monkeypatch.delenv("WAYLAND_DISPLAY", raising=False) + + +@pytest.fixture(autouse=True) +def the_console_stays_put(): + before = ACTIVE_VT.read_text().strip() if ACTIVE_VT.exists() else None + yield + if before: + assert ACTIVE_VT.read_text().strip() == before, "the GPU display switched the active VT" + + +def xorg_servers() -> Set[int]: + found = subprocess.run(["pgrep", "-x", "Xorg"], capture_output=True, text=True).stdout + return {int(pid) for pid in found.split()} + + +def wait_until_gone(pids: Set[int], timeout: float = 15) -> Set[int]: + deadline = time.monotonic() + timeout + while pids & xorg_servers() and time.monotonic() < deadline: + time.sleep(0.1) + return pids & xorg_servers() + + +def test_the_browser_renders_on_the_named_card(binary: Path, gpu): + display = GpuDisplay(gpu) + options = launch_options( + virtual_display=display.get(), + headless=False, + os="linux", + executable_path=str(binary), + firefox_user_prefs=dict(GPU_PREFS), + i_know_what_im_doing=True, + ) + server = display.proc.pid + with sync_playwright() as playwright: + # Raises GpuSoftwareFallback unless the browser rendered on the card. + browser = sync_attach_vd(playwright.firefox.launch(**options), display) + try: + assert display.uses_gpu() + # The identity claims the card that renders, not the desktop's GPU. + vendor, renderer = browser.new_page().evaluate(READ_GPU) + assert gpu.vendor.lower() in f"{vendor} {renderer}".lower(), (vendor, renderer) + for pid in display._display_processes(): + environ = Path(f"/proc/{pid}/environ").read_bytes() + assert b"LIBGL_ALWAYS_SOFTWARE" not in environ + assert b"__GLX_VENDOR_LIBRARY_NAME" not in environ + finally: + browser.close() + assert not wait_until_gone({server}), "Xorg outlived the browser" + + +def test_camoufox_on_the_gpu_leaves_no_server_behind(binary: Path, gpu): + before = xorg_servers() + with Camoufox(headless="virtual-gpu", os="linux", executable_path=str(binary)) as browser: + started = xorg_servers() - before + assert len(started) == 1 + browser.new_page().goto("about:blank") + assert not wait_until_gone(started), "Xorg outlived the browser" + + +def test_the_server_serves_a_browser_on_the_gpu(binary: Path, gpu): + before = xorg_servers() + started: Set[int] = set() + serve = subprocess.Popen( + [ + sys.executable, + "-c", + "import sys; from camoufox.server import launch_server; " + "launch_server(headless='virtual-gpu', os='linux', executable_path=sys.argv[1])", + str(binary), + ], + stdout=subprocess.PIPE, + text=True, + ) + try: + assert serve.stdout is not None + endpoint = None + for line in serve.stdout: + if "ws://" in line: + endpoint = line[line.index("ws://") :].split()[0] + break + assert endpoint, f"launch_server exited {serve.wait()} without an endpoint" + started = xorg_servers() - before + assert len(started) == 1 + with sync_playwright() as playwright: + browser = playwright.firefox.connect(endpoint) + try: + vendor, renderer = browser.new_page().evaluate(READ_GPU) + assert gpu.vendor.lower() in f"{vendor} {renderer}".lower(), (vendor, renderer) + finally: + browser.close() + finally: + serve.send_signal(signal.SIGINT) + serve.wait(timeout=60) + assert not wait_until_gone(started), "Xorg outlived the server" diff --git a/browser/tests/native/test_tribal_rules.py b/browser/tests/native/test_tribal_rules.py index a7ceec19..108aa0a0 100644 --- a/browser/tests/native/test_tribal_rules.py +++ b/browser/tests/native/test_tribal_rules.py @@ -272,6 +272,90 @@ def test_kill_sigkills_reaps_and_unlinks(): ) +def _gpu_display(monkeypatch, tmp_path): + """A GPU display whose config is installed, run as an unprivileged user.""" + from camoufox import gpudisplay + + gpu = gpudisplay.GpuDevice("0000:01:00.0", "/dev/dri/renderD129", None, "0x10de", "0x2c02", "nvidia") + monkeypatch.setattr(gpudisplay, "which", lambda name: f"/usr/bin/{name}") + monkeypatch.setattr(gpudisplay, "SYSTEM_CONFIG_DIR", tmp_path) + monkeypatch.setattr(gpudisplay.os, "geteuid", lambda: 1000) + monkeypatch.setattr(gpudisplay, "ACTIVE_VT", tmp_path / "no-vt") + (tmp_path / gpudisplay.config_name(gpu)).write_text(gpudisplay.xorg_config(gpu)) + return gpudisplay.GpuDisplay(gpu) + + +def test_the_gpu_display_claims_its_display_with_displayfd(monkeypatch, tmp_path): + from camoufox import virtdisplay + + captured = {} + + class FakePopen: + def __init__(self, cmd, **kwargs): + captured["cmd"] = list(cmd) + self.pid = 424242 + + def poll(self): + return None + + display = _gpu_display(monkeypatch, tmp_path) + monkeypatch.setattr(virtdisplay.subprocess, "Popen", FakePopen) + # The fake never reports a display; the bounded read makes that safe. + monkeypatch.setattr(virtdisplay, "DISPLAYFD_READ_TIMEOUT_S", 0.2) + with pytest.raises(Exception): + display.get() + + assert "-displayfd" in captured.get("cmd", []), ( + f"the GPU display's Xorg is no longer launched with -displayfd: {captured.get('cmd')}" + + explain("displayfd-not-lockfile-scan") + ) + + +def test_the_gpu_display_shares_the_vt(monkeypatch, tmp_path): + argv = _gpu_display(monkeypatch, tmp_path)._command() + for flag in ("-sharevts", "-novtswitch"): + assert flag in argv, ( + f"the GPU display's Xorg runs without {flag}, so it can switch the console " + "away from the user's desktop." + explain("gpu-display-shares-the-vt") + ) + + +def test_the_gpu_display_terminates_with_its_last_client(monkeypatch, tmp_path): + from camoufox import gpudisplay + + argv = _gpu_display(monkeypatch, tmp_path)._command() + assert "-terminate" in argv and "-noreset" not in argv, ( + f"the GPU display's Xorg no longer exits on its own: {argv}" + + explain("gpu-display-terminates-with-its-last-client") + ) + assert "X11_SETUP" in inspect.getsource(gpudisplay.GpuDisplay._ready), ( + "the launcher no longer holds a client on the GPU display, so a server no " + "client reached never terminates." + explain("gpu-display-terminates-with-its-last-client") + ) + + +def test_the_gpu_is_bound_by_pci_address(): + from camoufox import gpudisplay + + gpu = gpudisplay.GpuDevice("0000:6f:00.0", "/dev/dri/renderD128", None, "0x1002", "0x744c", "amdgpu") + config = gpudisplay.xorg_config(gpu) + assert 'BusID "PCI:111:0:0"' in config and "renderD" not in config, ( + "the GPU display's config no longer binds the card by PCI address." + + explain("gpu-selected-by-pci-address") + ) + assert "0000_6f_00_0" in gpudisplay.config_name(gpu), explain("gpu-selected-by-pci-address") + + +def test_an_open_render_node_is_not_gpu_use(): + from camoufox import gpudisplay + + assert not gpudisplay.drew_on_gpu("drm-driver:\tamdgpu\ndrm-engine-gfx:\t0 ns\ndrm-engine-capacity-gfx:\t1\n"), ( + "an idle render node now counts as rendering, and Firefox holds one in software too." + + explain("gpu-use-is-read-from-the-kernel") + ) + assert gpudisplay.drew_on_gpu("drm-engine-gfx:\t39907610 ns\n"), explain("gpu-use-is-read-from-the-kernel") + + # --------------------------------------------------------------------------- # dependencies # --------------------------------------------------------------------------- diff --git a/browser/tests/playwright/patches/context-lists-across-processes.py b/browser/tests/playwright/patches/context-lists-across-processes.py index 040c62d3..5dbee923 100644 --- a/browser/tests/playwright/patches/context-lists-across-processes.py +++ b/browser/tests/playwright/patches/context-lists-across-processes.py @@ -7,15 +7,18 @@ setter marks it used for the whole context, in storage every process shares, so later documents in the context never call it again. The lists themselves were kept in a per-process static map, so a document of the same context that landed in another content process found no list and showed the launch-level -fonts and voices instead. +fonts and voices instead. An OffscreenCanvas in a worker has no document, so +its text was measured with the launch-level fonts, and once a worker had +measured, so was the text on its page's main thread. The probe gives one context its own short lists through an init script, then opens it on several loopback addresses. Each address is its own site, so the pages spread across content processes, and each reports which of the -launch-level fonts and voices it can see. +launch-level fonts and voices it can see, measuring fonts on an OffscreenCanvas +in a worker first and then on one on its main thread. -What PASS means: every page of the context sees the same fonts and voices as -the first, and fewer than the launch level does. +What PASS means: every page of the context, and a worker on each, sees the +same fonts and voices as the first, and fewer than the launch level does. python browser/tests/playwright/patches/context-lists-across-processes.py """ @@ -39,17 +42,24 @@ PROBE = """async (fonts) => { // document.fonts.check() is true for any font that needs no download, // installed or not, so measure: a font is there if it changes the width of // the text against both fallbacks. - const ctx = document.createElement('canvas').getContext('2d'); - const width = font => { ctx.font = font; return ctx.measureText('mmmmmmmmmmlli10OQ@#').width; }; - const base = ['monospace', 'serif'].map(g => [g, width(`72px ${g}`)]); - const visible = fonts.filter(f => base.some(([g, w]) => width(`72px "${f}", ${g}`) !== w)); + const visible = fonts => { + const ctx = new OffscreenCanvas(1, 1).getContext('2d'); + const width = font => { ctx.font = font; return ctx.measureText('mmmmmmmmmmlli10OQ@#').width; }; + const base = ['monospace', 'serif'].map(g => [g, width(`72px ${g}`)]); + return fonts.filter(f => base.some(([g, w]) => width(`72px "${f}", ${g}`) !== w)); + }; + const code = 'onmessage = e => postMessage((' + visible.toString() + ')(e.data))'; + const w = new Worker(URL.createObjectURL(new Blob([code]))); + w.postMessage(fonts); + // The worker measures first: its lookups are what leaked into the main thread's. + const workerFonts = await new Promise(r => { w.onmessage = e => r(e.data); }); let voices = speechSynthesis.getVoices(); if (!voices.length) voices = await new Promise(r => { speechSynthesis.onvoiceschanged = () => r(speechSynthesis.getVoices()); setTimeout(() => r(speechSynthesis.getVoices()), 2000); }); - return {fonts: visible, voices: voices.map(v => v.name).sort()}; + return {fonts: visible(fonts), workerFonts, voices: voices.map(v => v.name).sort()}; }""" @@ -109,9 +119,15 @@ async def main() -> int: extra = sorted(set(seen[host][kind]) - set(first[kind])) print(f" FAIL {kind} on {host}: {len(seen[host][kind])} visible, " f"{len(first[kind])} on {HOSTS[0]}; extra: {extra[:5]}") + for host in HOSTS: + if seen[host]["workerFonts"] != seen[host]["fonts"]: + passed = False + extra = sorted(set(seen[host]["workerFonts"]) - set(seen[host]["fonts"])) + print(f" FAIL fonts in a worker on {host}: {len(seen[host]['workerFonts'])} visible, " + f"{len(seen[host]['fonts'])} on its main thread; extra: {extra[:5]}") if passed: - print(f" PASS: {len(HOSTS)} sites all see the context's {len(first['fonts'])} fonts " - f"and {len(first['voices'])} voice, of {len(launch['fonts'])} and " + print(f" PASS: {len(HOSTS)} sites, and a worker on each, all see the context's " + f"{len(first['fonts'])} fonts and {len(first['voices'])} voice, of {len(launch['fonts'])} and " f"{len(launch['voices'])}") return 0 if passed else 1 diff --git a/browser/upstream.sh b/browser/upstream.sh index 919672aa..7113f5db 100644 --- a/browser/upstream.sh +++ b/browser/upstream.sh @@ -1,2 +1,2 @@ -version=156.0.1 -release=beta.32 +version=158.0 +release=beta.33 diff --git a/ci/README.md b/ci/README.md index 35397791..c58269ab 100644 --- a/ci/README.md +++ b/ci/README.md @@ -142,6 +142,7 @@ authority on what fails; a local run is a hypothesis. | Crashes | Killing the browser, the X server, a content process or the driver mid-run leaves nothing behind, and the next launch works (`test_crash_recovery.py`) | | Memory growth | One mechanism (iframes, canvas readback, WebGL contexts, workers, script compilation, font measurement) driven N and 4N times grows by a bounded amount (`test_memory_growth.py`, the `growth` job) | | Settled decisions | Every mechanically checkable rule in [`ci/tribal-rules.yml`](tribal-rules.yml) (`test_tribal_rules.py`) | +| GPU display | `headless="virtual-gpu"` renders on the card `CAMOUFOX_GPU` names, the identity claims that card, and the Xorg server exits with the browser (`test_gpu_display.py`). No runner has a GPU, so the `gpu` subset is run by hand and is not part of `all` | ## Stealth grade @@ -287,6 +288,7 @@ Releases cut before manifests existed (up to `v156.0.1-beta.32`) pair by the tag | `python3 -m ci.run_native --subset rules` | | Settled decisions | | `python3 -m ci.run_native --subset browser --binary ` | yes | Leaks, contexts, crashes | | `python3 -m ci.run_native --subset growth --binary ` | yes | Memory growth; `--shard 3/7` for one test | +| `CAMOUFOX_GPU= python3 -m ci.run_native --subset gpu --binary ` | yes | `headless="virtual-gpu"` on a real GPU | | `python3 -m ci.run_sundial --binary ` | yes | The stealth grade (needs the credential) | | `python3 -m ci.summarize --results-dir .ci-work/results` | | The summary table | | `GITHUB_EVENT_NAME=schedule python3 -m ci.release target` | | What the train would promote | diff --git a/ci/results.py b/ci/results.py index 5f3f5b93..a9f3d953 100644 --- a/ci/results.py +++ b/ci/results.py @@ -49,6 +49,14 @@ def run_id() -> str: ) +def run_attempt() -> int: + """GitHub's attempt number for this run (1 unless a job was re-run).""" + try: + return max(1, int(os.environ.get("GITHUB_RUN_ATTEMPT", "1"))) + except ValueError: + return 1 + + def _now() -> str: return datetime.now(timezone.utc).isoformat(timespec="seconds") @@ -72,6 +80,7 @@ class GateResult: notes: List[str] = field(default_factory=list) artifacts: List[str] = field(default_factory=list) run_id: str = field(default_factory=run_id) + attempt: int = field(default_factory=run_attempt) schema: int = SCHEMA host: str = field(default_factory=lambda: f"{platform.system()}-{platform.machine()}") @@ -104,18 +113,18 @@ class GateResult: def save(self, directory: Optional[Path] = None) -> Path: directory = directory or EVIDENCE_DIR directory.mkdir(parents=True, exist_ok=True) - path = directory / f"{self.gate}.json" + # Every attempt's results-* artifacts stay in the run and the summary + # merges them into one directory, so a re-run job writes beside the + # first attempt's file rather than over it; load_all keeps the latest. + name = self.gate if self.attempt == 1 else f"{self.gate}.attempt{self.attempt}" + path = directory / f"{name}.json" write_json(path, asdict(self)) log(f"[{self.gate}] evidence -> {path} ({self.status}, {len(self.tests)} tests)") return path def load(gate: str, directory: Optional[Path] = None) -> Optional[Dict[str, Any]]: - directory = directory or EVIDENCE_DIR - path = directory / f"{gate}.json" - if not path.exists(): - return None - return read_json(path) + return load_all(directory).get(gate) def load_all(directory: Optional[Path] = None) -> Dict[str, Dict[str, Any]]: @@ -127,6 +136,9 @@ def load_all(directory: Optional[Path] = None) -> Dict[str, Dict[str, Any]]: if path.name.startswith("_"): continue data = read_json(path, default={}) - if isinstance(data, dict) and data.get("gate"): + if not (isinstance(data, dict) and data.get("gate")): + continue + prior = out.get(data["gate"]) + if prior is None or data.get("attempt", 1) >= prior.get("attempt", 1): out[data["gate"]] = data return out diff --git a/ci/run_native.py b/ci/run_native.py index ea7e87c7..bbaf6f19 100644 --- a/ci/run_native.py +++ b/ci/run_native.py @@ -13,9 +13,14 @@ half gives fast feedback: proves nothing was left behind; checks that a context and a browser mean what the project says they mean. + --subset gpu needs a binary and a GPU (CAMOUFOX_GPU names it), so it is + not part of "all": headless="virtual-gpu" renders on the + card and cleans up after itself. + Run: python3 -m ci.run_native --subset rules python3 -m ci.run_native --subset browser --binary path/to/camoufox-bin + CAMOUFOX_GPU=01:00.0 python3 -m ci.run_native --subset gpu --binary path/to/camoufox-bin """ from __future__ import annotations @@ -45,6 +50,9 @@ FILES = { # process. Kept out of "browser" and run with --shard, one test per # runner, so a pull request waits minutes for it rather than most of an hour. "growth": ["test_memory_growth.py"], + # Needs a GPU, which no CI runner has, so "all" leaves it out; run it on a + # machine with one, with CAMOUFOX_GPU naming the card. + "gpu": ["test_gpu_display.py"], } @@ -60,7 +68,7 @@ def collect(files: List[str], env: Dict[str, str]) -> List[str]: def main(argv: Optional[List[str]] = None) -> int: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( - "--subset", choices=["rules", "browser", "growth", "all"], default="all" + "--subset", choices=["rules", "browser", "growth", "gpu", "all"], default="all" ) parser.add_argument("--binary", type=Path) parser.add_argument("--results-dir", type=Path, default=RESULTS_DIR) @@ -78,8 +86,14 @@ def main(argv: Optional[List[str]] = None) -> int: result = results.GateResult(gate=name) result.metrics["subset"] = args.subset + if args.subset == "gpu" and not os.environ.get("CAMOUFOX_GPU", "").strip(): + # test_gpu_display.py skips itself without a card, which would pass. + result.note("no CAMOUFOX_GPU; the gpu subset needs the card under test named") + result.finish(results.ERROR).save(args.results_dir) + return 1 + files = ( - [f for group in FILES.values() for f in group] + [f for name, group in FILES.items() if name != "gpu" for f in group] if args.subset == "all" else FILES[args.subset] ) diff --git a/ci/run_patch_guards.py b/ci/run_patch_guards.py index 9ecf71fe..4d70723f 100644 --- a/ci/run_patch_guards.py +++ b/ci/run_patch_guards.py @@ -103,6 +103,30 @@ def guards() -> List[Path]: return sorted(p for p in GUARD_DIR.glob("*.py") if p.name != "helpers.py") +def leftover_browsers(binary: Path) -> List[str]: + """Processes of the browser still running after a guard, with CPU seconds. + + Guards share one runner. A browser a guard failed to close keeps its + content processes -- and any spinning workers -- alive into every later + guard, which then sees a slower machine than it was written for. On Linux + those content processes run plugin-container, which sits beside the binary. + """ + binary = binary.resolve() + exes = {str(binary), str(binary.parent / "plugin-container")} + ticks = os.sysconf("SC_CLK_TCK") + found = [] + for proc in Path("/proc").glob("[0-9]*"): + try: + if os.readlink(proc / "exe") not in exes: + continue + fields = (proc / "stat").read_text().rsplit(")", 1)[1].split() + except OSError: + continue + cpu = (int(fields[11]) + int(fields[12])) / ticks + found.append(f"pid {proc.name} cpu {cpu:.1f}s") + return found + + def main(argv: Optional[List[str]] = None) -> int: parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("--binary", type=Path) @@ -149,8 +173,14 @@ def main(argv: Optional[List[str]] = None) -> int: failed.append(guard.name) tail = proc.combined().strip().splitlines()[-6:] result.note(f"{guard.name} failed ({proc.code}): " + " | ".join(t.strip() for t in tail)) + # The note keeps six lines; the job log gets all of it. + log(f" ✗ {guard.name} output:\n{proc.combined().strip()}") else: log(f" ✓ {guard.name}") + leftovers = leftover_browsers(binary) + if leftovers: + log(f" {guard.name} left {len(leftovers)} browser processes running: {', '.join(leftovers)}", + level="WARN") passed = len(selected) - len(failed) result.note(f"{passed}/{len(selected)} guards passed") diff --git a/ci/tests/test_ci.py b/ci/tests/test_ci.py index d1ba0c6d..64ce482b 100644 --- a/ci/tests/test_ci.py +++ b/ci/tests/test_ci.py @@ -241,6 +241,37 @@ def test_gate_result_keeps_the_best_outcome_across_retries(): assert result.tests["t"] == "pass" +def test_a_rerun_job_result_replaces_the_first_attempts(tmp_path, monkeypatch): + """"Rerun failed jobs" must be able to turn the summary green. + + Every attempt's `results-*` artifacts stay in the run, and the summary + merges them all into one directory. When both attempts wrote + native_browser.json, one overwrote the other in no particular order: run + 36266928260's rerun passed, and the summary still reported attempt 1's + failure. A rerun's result must land beside the first and win. + """ + monkeypatch.setenv("GITHUB_RUN_ATTEMPT", "1") + results.GateResult(gate="native_browser").finish(results.FAIL).save(tmp_path) + monkeypatch.setenv("GITHUB_RUN_ATTEMPT", "2") + results.GateResult(gate="native_browser").finish(results.PASS).save(tmp_path) + monkeypatch.setenv("GITHUB_RUN_ATTEMPT", "1") + results.GateResult(gate="patch_guards").finish(results.PASS).save(tmp_path) + + assert len(list(tmp_path.glob("native_browser*.json"))) == 2 + merged = results.load_all(tmp_path) + assert merged["native_browser"]["status"] == results.PASS + assert merged["patch_guards"]["status"] == results.PASS + assert results.load("native_browser", tmp_path)["status"] == results.PASS + + +def test_a_later_attempt_wins_whatever_order_the_files_sort_in(tmp_path, monkeypatch): + monkeypatch.setenv("GITHUB_RUN_ATTEMPT", "10") + results.GateResult(gate="g").finish(results.PASS).save(tmp_path) + monkeypatch.setenv("GITHUB_RUN_ATTEMPT", "9") + results.GateResult(gate="g").finish(results.FAIL).save(tmp_path) + assert results.load_all(tmp_path)["g"]["status"] == results.PASS + + # --------------------------------------------------------------------------- @@ -486,6 +517,28 @@ def test_every_native_test_file_is_actually_run(): assert not wired - on_disk, f"runner lists files that do not exist: {sorted(wired - on_disk)}" +def test_the_gpu_subset_is_never_part_of_all(): + """No runner has a GPU, and the CI browser job runs `--subset browser`.""" + + from ci.run_native import FILES + + assert "test_gpu_display.py" in FILES["gpu"] + assert not any("test_gpu_display.py" in group for name, group in FILES.items() if name != "gpu") + + +def test_the_gpu_subset_without_a_card_is_an_error(monkeypatch, tmp_path): + """test_gpu_display.py skips itself without CAMOUFOX_GPU; asked for by name, + an all-skipped run would read as a pass.""" + + from ci import run_native + + monkeypatch.delenv("CAMOUFOX_GPU", raising=False) + monkeypatch.setattr(run_native, "run_pytest", lambda **kw: pytest.fail("ran pytest")) + assert run_native.main(["--subset", "gpu", "--results-dir", str(tmp_path)]) == 1 + (record,) = tmp_path.glob("*.json") + assert json.loads(record.read_text())["status"] == "error" + + # --------------------------------------------------------------------------- # sundial's score-only payload, with cross-OS split out # --------------------------------------------------------------------------- @@ -2748,6 +2801,71 @@ def test_build_tester_accepts_every_core_count_pythonlib_presents(): ) +# --------------------------------------------------------------------------- +# packaging +# --------------------------------------------------------------------------- + + +def _package_module(): + """browser/scripts/package.py, imported the way it runs (its directory on sys.path).""" + import importlib.util + import sys + + scripts = CI_ROOT.parent / "browser" / "scripts" + sys.path.insert(0, str(scripts)) + try: + spec = importlib.util.spec_from_file_location("camoufox_package", scripts / "package.py") + module = importlib.util.module_from_spec(spec) + spec.loader.exec_module(module) + return module + finally: + sys.path.remove(str(scripts)) + + +def test_packaged_font_names_are_ascii(tmp_path, monkeypatch): + """A plain `unzip` must extract the release zip in any locale. + + The font bundle carries macOS faces named in Japanese (Hiragino). The zip + stores those names correctly as UTF-8, but unzip 6.0 under a C/POSIX locale + -- a Docker build, a bare SSH shell -- reports every one as a mismatching + local filename and exits 1, which stops a consumer's `set -e` install. + """ + import shlex + + package = _package_module() + monkeypatch.chdir(tmp_path) + group = tmp_path / "bundle" / "fonts" / "M" + group.mkdir(parents=True) + (group.parent / "groups.json").write_text('{"readBy": {"mac": ["M"]}}') + (group / "18__ヒラギノ角ゴシック W9.ttc").write_bytes(b"w9") + (group / "21__ヒラギノ角ゴシック W1.ttc").write_bytes(b"w1") + (group / "07__Helvetica.ttc").write_bytes(b"h") + + # Stand in for 7z: the extracted package is empty, and what would be + # zipped is read back from the staging directory. + packaged = [] + + def fake_run(cmd, exit_on_fail=True): + args = shlex.split(cmd) + if args[:2] == ["7z", "u"]: + fonts = pathlib.Path(args[3].removesuffix("/*"), "fonts") + packaged.append({p.name: p.read_bytes() for p in fonts.iterdir()}) + + monkeypatch.setattr(package, "run", fake_run) + monkeypatch.setattr(package, "inject_locales", lambda *args: None) + for _ in range(2): + (tmp_path / "in.zip").write_bytes(b"") + package.add_includes_to_package("in.zip", [], ["macos"], "out.zip", "windows", "158.0", "") + + names = sorted(packaged[0]) + assert all(name.isascii() for name in names), names + assert packaged[0].pop("07__Helvetica.ttc") == b"h" + assert all(n.startswith(("18__", "21__")) and n.endswith(".ttc") for n in packaged[0]), names + assert sorted(packaged[0].values()) == [b"w1", b"w9"] + # Deterministic: the same bundle packages to the same names. + assert sorted(packaged[1]) == names + + # --------------------------------------------------------------------------- # build-or-fetch: the published release is used only when it matches the tree # --------------------------------------------------------------------------- @@ -2925,6 +3043,26 @@ def test_the_patch_guard_matrix_runs_every_group(): assert legs == set(GROUPS) | {"skiplist"} +def test_leftover_browsers_sees_content_processes(tmp_path): + """Firefox's Linux content processes run plugin-container, beside the binary.""" + import shutil + import subprocess + + from ci.run_patch_guards import leftover_browsers + + # A shell blocked on its builtin read: coreutils may be one binary that + # picks its command from argv[0], which a copy named plugin-container loses. + child = tmp_path / "plugin-container" + shutil.copy2(shutil.which("sh"), child) + proc = subprocess.Popen([child, "-c", "read line"], stdin=subprocess.PIPE) + try: + found = leftover_browsers(tmp_path / "camoufox-bin") + finally: + proc.kill() + proc.wait() + assert [f.split()[1] for f in found] == [str(proc.pid)] + + # --------------------------------------------------------------------------- # memory growth: sharded onto pull requests, and gated # --------------------------------------------------------------------------- diff --git a/ci/tribal-rules.yml b/ci/tribal-rules.yml index 4d56956b..5efd5318 100644 --- a/ci/tribal-rules.yml +++ b/ci/tribal-rules.yml @@ -76,16 +76,19 @@ rules: equals: CAMOUFOX_VIRTUAL_DISPLAY_COMPOSITE - id: displayfd-not-lockfile-scan - title: Displays are claimed atomically with Xvfb -displayfd + title: Displays are claimed atomically with -displayfd, by Xvfb and by Xorg check: automated evidence: - "issue #597 / commit 8f9ff07" + - "2026-10-12, Ubuntu's setuid Xorg.wrap: `Xorg -displayfd N -config ...` run unprivileged wrote its display number (:6, past live and stale sockets) down the pipe once the server was up" rationale: >- The old userspace lock-file scan plus random-jitter retry raced: many camoufox processes starting at once all saw the same free display numbers - before any of them bound. -displayfd lets Xvfb scan up from :0 and bind - the first free socket itself -- kernel-mediated, no userspace race -- then - writes the number back down an inherited pipe. + before any of them bound. -displayfd lets the server scan up from :0 and + bind the first free socket itself -- kernel-mediated, no userspace race -- + then writes the number back down an inherited pipe. The GPU display's + Xorg takes it through the setuid wrapper too, so it does not use the + random display number and lock-file wait it was ported from. expect: module: camoufox.virtdisplay xvfb_args_contain: "-displayfd" @@ -97,7 +100,9 @@ rules: - "commit 8f9ff07: 'so a hung Xvfb fails fast instead of blocking forever'" rationale: >- A hung Xvfb with no timeout blocks the launch forever, at 0% CPU, with no - diagnostic. Ten seconds is the agreed bound. + diagnostic. Thirty seconds is the bound: a cold first Xvfb on a fresh + host took up to 8.4 s to report, so ten failed launches that would have + succeeded. expect: module: camoufox.virtdisplay attribute: DISPLAYFD_READ_TIMEOUT_S @@ -148,6 +153,85 @@ rules: than prctl in a preexec_fn: it is the same in both packages, and preexec_fn is unsafe in a threaded parent. The signal fires when the thread that spawned Xvfb exits, which is the thread that owns the browser. + - id: gpu-display-shares-the-vt + title: The GPU display's Xorg always runs with -sharevts and -novtswitch + check: automated + evidence: + - "Holo's headless='virtual-gpu' (the port's source): without -sharevts Xorg took a new VT and moved the monitor to the offscreen server, blanking the live desktop" + - "2026-10-12: with both flags, Xorg on the RTX 5080 and on the RX 7900 XTX left the active VT on tty2 throughout" + rationale: >- + A headless Xorg that allocates its own VT switches the console to it, and + the user's desktop goes black. -sharevts shares the current VT instead, + and -novtswitch blocks the switch at start and exit; the config adds + DontVTSwitch, and UseDisplayDevice "None" on NVIDIA. The launcher also + watches /sys/class/tty/tty0/active while the server starts and, if it + moves, switches back, kills the server and raises GpuVtTakeover. That + guard is insurance, not a reason to drop either flag. + expect: + module: camoufox.gpudisplay + attribute: SERVER_FLAGS + contains: ["-sharevts", "-novtswitch"] + + - id: gpu-display-terminates-with-its-last-client + title: The GPU display's Xorg runs with -terminate, never -noreset, and the launcher holds one client + check: automated + evidence: + - "Holo: with -noreset, root-owned servers outlived their launchers and used up VRAM; a server no client ever reached never terminates, and 20 such servers once held ~1 GB of RSS on one machine" + - "2026-10-12: an Xorg started through Xorg.wrap exited on its own about 2s after a raw X11 client connected and disconnected" + rationale: >- + Through the setuid wrapper Xorg runs as root, and a launcher killed with + SIGKILL runs no teardown at all, so the server must end itself. + -terminate exits it after its last client disconnects; -noreset keeps it + forever. A server no client reached has no last client, so the launcher + connects one raw X11 client as soon as the display is up and holds it + for the display's lifetime: closed by kill(), or by the kernel when the + launcher dies. + expect: + module: camoufox.gpudisplay + attribute: SERVER_FLAGS + contains: ["-terminate"] + excludes: ["-noreset"] + + - id: gpu-display-sigterm-before-sigkill + title: The GPU display's Xorg is asked to exit before it is killed + check: manual # browser/tests/native/test_gpu_display.py + evidence: + - "2026-10-12: a SIGKILLed Xorg left a root-owned /tmp/.X11-unix/X6 that the unprivileged launcher could not remove" + rationale: >- + Unlike Xvfb (xvfb-sigkill-and-socket-cleanup), the GPU display's server + is root's, so its socket is too, and only the server can remove it. + kill() drops the held client, sweeps the processes on the display, sends + SIGTERM and waits; SIGKILL is the last resort for a server that did not + exit. + + - id: gpu-selected-by-pci-address + title: The GPU is named by the caller and bound by PCI address, never by render node number + check: automated + evidence: + - "2026-10-12, this machine: renderD128 is the RX 7900 XTX, though a config generated earlier on it recorded renderD128 as the RTX 5080" + - "Holo: NVIDIA and AMD renders of the same scenes differed on 31 of 42 and on MAX_VERTEX_UNIFORM_VECTORS" + rationale: >- + Render nodes are numbered in the order the drivers loaded, which changes + between boots. The PCI address does not, so the GPUs are listed in PCI + address order, the config binds the card with its BusID and is named + after its address, and the selector accepts an address. Several GPUs + with no selector is an error, not a guess: the identity claims the GPU + that renders, so the card must be the one the caller meant. + + - id: gpu-use-is-read-from-the-kernel + title: The GPU display proves rendering by the GPU the kernel accounts, not the renderer string or an open render node + check: automated + evidence: + - "2026-10-12, v156.0.1-beta.32: forced onto Mesa's software path on the RTX 5080, Firefox still held /dev/dri/renderD129 (for DMABuf) and not /dev/nvidia0; on hardware it held /dev/nvidia0" + - "2026-10-12: on the RX 7900 XTX, Firefox's render node showed drm-engine-gfx growing on hardware and was not opened in software" + rationale: >- + The renderer string is what the identity claims, so it proves nothing. + An open render node proves nothing either: Firefox opens the card's DRM + nodes for DMABuf whatever renders. The check is the NVIDIA driver's + /dev/nvidia held open, or time on a GPU engine in the render + node's fdinfo (the kernel's DRM usage stats), while a probe page draws. + A browser that fails it is closed and the launch raises + GpuSoftwareFallback; there is no fallback to Xvfb. # ------------------------------------------------------------------------- # Dependencies diff --git a/docs/patch-upgrading-guide.md b/docs/patch-upgrading-guide.md index 053c1388..e24a0f35 100644 --- a/docs/patch-upgrading-guide.md +++ b/docs/patch-upgrading-guide.md @@ -416,7 +416,10 @@ The launchers build WebGL from fpgen's recordings, which an older Firefox made. Some values are the browser's rather than the GPU's, and an upgrade can change them on every device: Firefox 156 added `EXT_depth_clamp` on Windows and fixed WebGL1's `ALIASED_LINE_WIDTH_RANGE` at `[1, 1]` on Linux -([`webgl-browser-owned-values-follow-firefox`](../ci/tribal-rules.yml)). The +([`webgl-browser-owned-values-follow-firefox`](../ci/tribal-rules.yml)). +Firefox 158 added `EXT_polygon_offset_clamp` on Windows devices with WebGL2 +(ANGLE's D3D11 backend at feature level 10_0 and above) and on Linux desktop GL, +but not on macOS, where release builds use CGL's GL 4.1. The `stock-gpu-parity` guard finds them. It runs stock Firefox of the new version, stock Firefox of the release fpgen's model recorded, and Camoufox claiming the machine's GPU, and fails where the two stock releases differ and Camoufox does diff --git a/docs/per-context-patches.md b/docs/per-context-patches.md index b2cb6b8f..b4edd0f5 100644 --- a/docs/per-context-patches.md +++ b/docs/per-context-patches.md @@ -161,7 +161,7 @@ real value. | `navigator-spoofing.patch` | `Navigator::GetPlatform`, `GetOscpu`, `HardwareConcurrency`, `GetUserAgent`, `GetAppVersion` (global only); the `WorkerNavigator` versions of platform, cores and UA | Falls back to `navigator.*` in `CAMOU_CONFIG`. | | `webrtc-ip-spoofing.patch` | `SanitizeSDPForIPLeak`, `CandidateReady`, candidate `.address`/`.relatedAddress`, `getStats()`, `UpdateDefaultCandidate`, `NrSocketBase::CreateSocket` | Forces `default_address_only` while spoofing; loopback, link-local and private addresses are left alone. UDP candidate ports come from the ephemeral range of the identity's OS (`MaskConfig::SpoofedEphemeralPorts()`), so a Windows identity on Linux never shows a Linux port. | | `webgl-spoofing.patch` | `ClientWebGLContext::GetParameter` | Per context: vendor and renderer. Global only (`CAMOU_CONFIG`): parameters, extensions, shader precision. Works from `OffscreenCanvas` in workers. | -| `font-list-spoofing.patch` | `gfxPlatformFontList::FindAndAddFamiliesLocked` | A thread-local context id, set by an RAII guard in `FontFaceSet::Check/Load` and `gfxFontGroup::EnsureFontList`, avoids changing ~50 signatures. The list is in the shared store, so it holds in every content process. Workers are not filtered. | +| `font-list-spoofing.patch` | `gfxPlatformFontList::FindAndAddFamiliesLocked` | A thread-local context id, set by an RAII guard in `FontFaceSet::Check/Load` and `gfxFontGroup::EnsureFontList`, avoids changing ~50 signatures. The list is in the shared store, so it holds in every content process. An `OffscreenCanvas` in a worker takes the worker's context (`anti-font-fingerprinting.patch`); other worker lookups are not filtered. | | `speech-voices-spoofing.patch` | `SpeechSynthesis::GetVoices` | Filters the real list by name; a listed voice that is not installed is left out. | Global-only patches (no setter) read `CAMOU_CONFIG` at startup: diff --git a/python/README.md b/python/README.md index ec22fb2f..6993e0e0 100644 --- a/python/README.md +++ b/python/README.md @@ -167,7 +167,59 @@ host's only when the identity claims the host's GPU. Otherwise |---|---|---| | `False` (default) | A normal window | Needs a display. | | `True` | Firefox headless | Camoufox patches the headless tells it knows about. | -| `"virtual"` | A headed browser on a private Xvfb display | Linux only, needs `Xvfb` and `setpriv` (util-linux). Handled by `Camoufox`, `AsyncCamoufox`, `NewBrowser` and `launch_server`. The display is 1x1 unless `CAMOUFOX_VIRTUAL_DISPLAY_SIZE` (e.g. `1920x1080x24`) says otherwise. | +| `"virtual"` | A headed browser on a private Xvfb display | Linux only, needs `Xvfb` and `setpriv` (util-linux). Handled by `Camoufox`, `AsyncCamoufox`, `NewBrowser` and `launch_server`. The display is 1x1 unless `CAMOUFOX_VIRTUAL_DISPLAY_SIZE` (e.g. `1920x1080x24`) says otherwise. Xvfb has no GPU: canvas and WebGL render in software. | +| `"virtual-gpu"` | A headed browser on a private, headless Xorg server bound to one GPU | Linux only, needs Xorg and the card's driver. Canvas and WebGL render on the card. Handled like `"virtual"`. See [The GPU display](#the-gpu-display). | + +#### The GPU display + +```python +from camoufox.sync_api import Camoufox + +with Camoufox(headless="virtual-gpu", gpu="0000:01:00.0", os="linux") as browser: + page = browser.new_page() +``` + +- **The card is named, never guessed.** `gpu=` (or `CAMOUFOX_GPU`) takes a PCI + address, which is the stable choice, or an index in PCI address order, a + render or card node (`renderD128`, `/dev/dri/card1`), `vendor:device` ids + (`10de:2c02`) or a vendor name (`nvidia`). With several GPUs and no selector + the launch raises `AmbiguousGpuSelection`; `GpuNotFound` and `NoGpuFound` + mean what they say. `python -m camoufox gpu-xorg-config` lists the GPUs when + the choice is ambiguous. +- **Without root, set the machine up once per card.** Xorg then runs through + the setuid `Xorg.wrap`, which takes a config only from `/etc/X11` and needs + `allowed_users=anybody` and `needs_root_rights=yes` in + `/etc/X11/Xwrapper.config`. Stock Debian and Ubuntu ship + `allowed_users=console`, which refuses a launch from ssh, systemd or a + container. One command installs Xorg and the wrapper (with `apt-get`; + elsewhere it says what to install), sets those two lines and installs the + card's config. It is safe to run again: + ```bash + python -m camoufox gpu-setup 0000:01:00.0 | sudo sh + ``` + A launch that fails for want of any of this ends its error with that + command. The settings let any local user start a root X server. + `gpu-xorg-config` prints just the card's config. As root, nothing is + installed: a temporary config is used instead. +- **It leaves your desktop alone.** The server drives no monitor, shares the + current VT and exits when the browser closes. If the active VT changes while + it starts, the launch switches back, stops the server and raises + `GpuVtTakeover`. +- **The launch checks the browser renders on the card.** A page draws WebGL + and the launch waits up to 30 s (`CAMOUFOX_GPU_WAIT_S`) for the kernel to + account GPU work to the browser. If it never does, the browser is closed and + `GpuSoftwareFallback` is raised; `require_gpu=False` warns instead. There is + no fallback to Xvfb. +- **The identity claims that card.** On the host's OS the identity claims the + GPU Firefox reports, read on this display, so it is the card's and not the + desktop's (see [The canvas on another OS](#the-canvas-on-another-os)). +- The browser gets `DISPLAY` and the X11 backend, and nothing that chooses a + GL driver. These prefs default on, and `firefox_user_prefs` wins: + `gfx.webrender.all`, `layers.acceleration.force-enabled`, + `gfx.x11-egl.enabled`, `gfx.canvas.accelerated` and + `gfx.canvas.accelerated.force-enabled`. + +Every error here is a `VirtualDisplayError`. ### Remote server @@ -213,7 +265,9 @@ passed to Playwright's `firefox.launch()` (or `launch_persistent_context()`). | Option | Type | Default | Effect | |---|---|---|---| | `os` | `str` or `list[str]` | fpgen's real-world mix | `"windows"`, `"macos"`, `"linux"`, or a list to pick from. | -| `headless` | `bool` or `"virtual"` | `False` | See [Headless modes](#headless-modes). | +| `headless` | `bool`, `"virtual"` or `"virtual-gpu"` | `False` | See [Headless modes](#headless-modes). | +| `gpu` | `str` or `int` | `CAMOUFOX_GPU`, or the only GPU | The card for `headless="virtual-gpu"`. See [The GPU display](#the-gpu-display). Not taken by `launch_options`. | +| `require_gpu` | `bool` | `True` | With `headless="virtual-gpu"`, fail the launch when the browser does not render on the card; `False` warns. Not taken by `launch_options`. | | `proxy` | `dict` | none | Playwright proxy: `server`, `username`, `password`, `bypass`. | | `geoip` | `bool` or `str` | none | `True` finds the public IP (through `proxy` if set); a string uses that IP. Sets timezone, locale, geolocation and the WebRTC IP. Without a proxy, also decides whether IPv6 stays on. Needs the `geoip` extra. | | `geoip_db` | `str` | the `camoufox set --geoip` choice | GeoIP database name, e.g. `"GeoIP AIO by daijro"`. | @@ -267,6 +321,8 @@ passed to Playwright's `firefox.launch()` (or `launch_persistent_context()`). | `path` | | Print the data directory (`~/.cache/camoufox` on Linux). | | `test [URL]` | `--executable-path PATH` | Open a headed browser with the Playwright inspector. | | `server` | | Start a Playwright server with default options and print its websocket endpoint. | +| `gpu-setup [GPU]` | | Print the root script that sets this machine up for `headless="virtual-gpu"` on the card `GPU` names (or `CAMOUFOX_GPU`). Run it with `\| sudo sh`. | +| `gpu-xorg-config [GPU]` | | Print the Xorg config `headless="virtual-gpu"` needs for the card `GPU` names (or `CAMOUFOX_GPU`). | `set` and `fetch` read builds from these repositories (`repos.yml`): diff --git a/python/src/camoufox/__main__.py b/python/src/camoufox/__main__.py index ce226eba..4ee67188 100644 --- a/python/src/camoufox/__main__.py +++ b/python/src/camoufox/__main__.py @@ -880,6 +880,36 @@ def server(): launch_server() +@cli.command(name="gpu-xorg-config") +@click.argument("gpu", required=False) +def gpu_xorg_config(gpu: Optional[str] = None) -> None: + """ + Print the Xorg config headless="virtual-gpu" needs for GPU + """ + from .exceptions import GpuDisplayError + from .gpudisplay import select_gpu, xorg_config + + try: + click.echo(xorg_config(select_gpu(gpu)), nl=False) + except GpuDisplayError as e: + raise click.ClickException(str(e)) from e + + +@cli.command(name="gpu-setup") +@click.argument("gpu", required=False) +def gpu_setup(gpu: Optional[str] = None) -> None: + """ + Print a root script that sets this machine up for headless="virtual-gpu" on GPU + """ + from .exceptions import GpuDisplayError + from .gpudisplay import select_gpu, setup_script + + try: + click.echo(setup_script(select_gpu(gpu)), nl=False) + except GpuDisplayError as e: + raise click.ClickException(str(e)) from e + + class VersionInfo: def __init__(self): from rich.table import Table diff --git a/python/src/camoufox/addons.py b/python/src/camoufox/addons.py index 32f36bbe..7ee83c20 100644 --- a/python/src/camoufox/addons.py +++ b/python/src/camoufox/addons.py @@ -1,7 +1,8 @@ import os import shutil +import tempfile from enum import Enum -from multiprocessing import Lock +from threading import Lock from typing import List, Optional from .exceptions import InvalidAddonPath @@ -10,6 +11,11 @@ from .pkgman import INSTALL_DIR, unzip, webdl # Addons are stored in a shared folder, not per-browser version ADDONS_DIR = INSTALL_DIR / "addons" +# One lock for the module: `with Lock():` on a fresh multiprocessing.Lock per call +# guarded nothing, so concurrent launches in one process raced the same +# check-then-extract. +_EXTRACT_LOCK = Lock() + class DefaultAddons(Enum): """ @@ -44,17 +50,35 @@ def add_default_addons( addons = [addon for addon in DefaultAddons if addon not in exclude_list] - with Lock(): + with _EXTRACT_LOCK: maybe_download_addons(addons, addons_list) def download_and_extract(url: str, extract_path: str, name: str) -> None: """ - Downloads and extracts an addon from a given URL to a specified path + Downloads and extracts an addon from a given URL to a specified path. + + Extracts into a sibling temp dir and renames it into place last, so a + concurrent launch (another process, which the lock cannot see) never finds + a manifest.json in a directory whose other files are still being written. """ - # Create a temporary file to store the downloaded zip buffer = webdl(url, desc=f"Downloading addon ({name})", bar=False) - unzip(buffer, extract_path, f"Extracting addon ({name})", bar=False) + parent = os.path.dirname(extract_path) + tmp_dir = tempfile.mkdtemp(prefix=f".{name}.tmp-", dir=parent) + try: + unzip(buffer, tmp_dir, f"Extracting addon ({name})", bar=False) + try: + os.replace(tmp_dir, extract_path) + except OSError: + # The target is not empty (or exists at all, on Windows). A complete + # copy came from another process and may be loading in its browser, + # so keep it; only an incomplete one is replaced. + if os.path.exists(os.path.join(extract_path, 'manifest.json')): + return + shutil.rmtree(extract_path) + os.replace(tmp_dir, extract_path) + finally: + shutil.rmtree(tmp_dir, ignore_errors=True) def get_addon_path(addon_name: str) -> str: @@ -92,6 +116,8 @@ def maybe_download_addons( if addons_list is not None: addons_list.append(addon_path) except Exception as e: - # Drop the partial directory so the next run re-downloads. - shutil.rmtree(addon_path, ignore_errors=True) + # Drop the partial directory so the next run re-downloads. A complete + # one came from another process and may be loading in its browser. + if not os.path.exists(os.path.join(addon_path, 'manifest.json')): + shutil.rmtree(addon_path, ignore_errors=True) print(f"Failed to download and extract {addon.name}: {e}") diff --git a/python/src/camoufox/async_api.py b/python/src/camoufox/async_api.py index 2c9ecacb..acf638d7 100644 --- a/python/src/camoufox/async_api.py +++ b/python/src/camoufox/async_api.py @@ -23,6 +23,7 @@ from .utils import ( new_context_options, persistent_context_options, spoofs_window_dimensions, + start_virtual_display, ) @@ -82,7 +83,7 @@ async def AsyncNewBrowser( async def AsyncNewBrowser( playwright: Playwright, *, - headless: Optional[Union[bool, Literal['virtual']]] = None, + headless: Optional[Union[bool, Literal['virtual', 'virtual-gpu']]] = None, from_options: Optional[Dict[str, Any]] = None, persistent_context: bool = False, debug: Optional[bool] = None, @@ -92,6 +93,11 @@ async def AsyncNewBrowser( Launches a new browser instance for Camoufox given a set of launch options. Parameters: + headless (Optional[Union[bool, Literal['virtual', 'virtual-gpu']]]): + True for Firefox headless. On Linux, 'virtual' runs a headed browser on + an Xvfb display, and 'virtual-gpu' on a headless Xorg server bound to + the GPU `gpu` (or CAMOUFOX_GPU) names; `require_gpu=False` warns instead + of failing when the browser does not render on it. from_options (Dict[str, Any]): A set of launch options generated by `launch_options()` to use persistent_context (bool): @@ -99,13 +105,32 @@ async def AsyncNewBrowser( **kwargs: All other keyword arguments passed to `launch_options()`. """ - if headless == 'virtual': - virtual_display = VirtualDisplay(debug=debug) - kwargs['virtual_display'] = virtual_display.get() - headless = False - else: - virtual_display = None + virtual_display, headless = await asyncio.get_running_loop().run_in_executor( + None, start_virtual_display, headless, debug, kwargs + ) + # Everything after the display exists can fail (bad proxy, missing binary, + # unsatisfiable constraints) before sync/async_attach_vd wires kill() into + # close, which used to strand one Xvfb and its /tmp/.X lock per failed + # launch. + try: + return await _new_browser( + playwright, virtual_display, headless, from_options, persistent_context, debug, kwargs + ) + except BaseException: + if virtual_display: + virtual_display.kill() + raise + +async def _new_browser( + playwright: Playwright, + virtual_display: Optional[VirtualDisplay], + headless: Any, + from_options: Optional[Dict[str, Any]], + persistent_context: bool, + debug: Optional[bool], + kwargs: Dict[str, Any], +) -> Union[Browser, BrowserContext]: # Options the caller built leave its contexts to the caller (host_identity). canvas_noise: Optional[bool] = False if not from_options: diff --git a/python/src/camoufox/exceptions.py b/python/src/camoufox/exceptions.py index 9be0e780..c8ca8a8e 100644 --- a/python/src/camoufox/exceptions.py +++ b/python/src/camoufox/exceptions.py @@ -172,6 +172,70 @@ class VirtualDisplayNotSupported(VirtualDisplayError): ... +class GpuDisplayError(VirtualDisplayError): + """ + Raised when the headless='virtual-gpu' display cannot be used. + """ + + ... + + +class NoGpuFound(GpuDisplayError): + """ + Raised when no GPU render node with a PCI address is found. + """ + + ... + + +class AmbiguousGpuSelection(GpuDisplayError): + """ + Raised when several GPUs match, or several exist and none was named. + """ + + ... + + +class GpuNotFound(GpuDisplayError): + """ + Raised when the GPU selector matches no GPU. + """ + + ... + + +class CannotFindXorg(GpuDisplayError): + """ + Raised when Xorg cannot be found. + """ + + ... + + +class CannotExecuteXorg(GpuDisplayError): + """ + Raised when Xorg cannot be started, or exits right after starting. + """ + + ... + + +class GpuVtTakeover(GpuDisplayError): + """ + Raised when the Xorg server switched the active console VT. + """ + + ... + + +class GpuSoftwareFallback(GpuDisplayError): + """ + Raised when the browser on a GPU display never rendered on the GPU. + """ + + ... + + class CamoufoxNotInstalled(FileNotFoundError): """ Raised when camoufox is not installed. diff --git a/python/src/camoufox/gpudisplay.py b/python/src/camoufox/gpudisplay.py new file mode 100644 index 00000000..dd68ea45 --- /dev/null +++ b/python/src/camoufox/gpudisplay.py @@ -0,0 +1,632 @@ +"""headless='virtual-gpu': a headless Xorg server pinned to one GPU. + +Xvfb has no GPU path, so a browser on it renders WebGL and canvas with Mesa's +software rasterizer. This display is a real Xorg server bound to one card by +its PCI address, drawing a virtual screen with no monitor attached, so the +browser renders on that card. The card is always named, never guessed: the +identity claims the GPU that renders, and two cards render differently. +""" + +import os +import re +import signal +import socket +import subprocess # nosec +import tempfile +import time +from dataclasses import dataclass +from pathlib import Path +from shutil import which +from typing import Any, Dict, List, Optional, Union + +from ._warnings import LeakWarning +from .exceptions import ( + AmbiguousGpuSelection, + CannotExecuteXorg, + CannotFindXorg, + GpuNotFound, + GpuSoftwareFallback, + GpuVtTakeover, + NoGpuFound, +) +from .virtdisplay import VirtualDisplay + +# Names the card when the `gpu` launch option is not given. +GPU_ENV_VAR = 'CAMOUFOX_GPU' + +# How long the browser has to render on the GPU after the probe page starts +# drawing. A card busy with other work took 5-10s in Holo's measurements. +GPU_WAIT_S = 30.0 +GPU_WAIT_ENV_VAR = 'CAMOUFOX_GPU_WAIT_S' + +# The root window is not observable (screen.* is spoofed per context), but the +# GPU compositor needs a real surface, so it is not 1x1 like Xvfb's. +GPU_SCREEN = '1920x1080x24' + +# Where Xorg looks up a relative -config when the setuid wrapper elevates it. +SYSTEM_CONFIG_DIR = Path('/etc/X11') + +# Without root, Xorg.wrap must let any user start Xorg (a launch from ssh, +# systemd or a container is not a console login) and keep it root, which a +# server with no VT of its own needs to open the card. Stock Debian and Ubuntu +# ship allowed_users=console and needs_root_rights=auto. +XWRAPPER_CONFIG = Path('/etc/X11/Xwrapper.config') +XWRAPPER_SETTINGS = {'allowed_users': 'anybody', 'needs_root_rights': 'yes'} +XORG_WRAPPERS = (Path('/usr/lib/xorg/Xorg.wrap'), Path('/usr/libexec/Xorg.wrap')) + +# -terminate: the server exits this many seconds after its last client leaves. +# -sharevts: never take a VT of its own, which blanks a live desktop. +SERVER_FLAGS = ('-terminate', '2', '-nolisten', 'tcp', '-sharevts', '-novtswitch') + +# Firefox's GPU paths, on by default for this display only; the caller's prefs +# win. webgl.force-enabled is set by every launch already. Forcing the +# accelerated canvas made 2D canvas match Windows Firefox on the same card. +GPU_PREFS: Dict[str, Any] = { + 'gfx.webrender.all': True, + 'layers.acceleration.force-enabled': True, + 'gfx.x11-egl.enabled': True, + 'gfx.canvas.accelerated': True, + 'gfx.canvas.accelerated.force-enabled': True, +} + +# Draws one WebGL frame per animation frame: Firefox opens the GPU only when +# something renders. +PROBE_PAGE = ( + "data:text/html," +) + +ACTIVE_VT = Path('/sys/class/tty/tty0/active') +# A crash right after startup (a driver fault under VRAM pressure) and a VT +# switch both land just after the display is reported. +SETTLE_S = 1.0 + +# An X11 connection setup request: little-endian, protocol 11.0, no auth. +X11_SETUP = bytes([0x6C, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0]) + +VENDORS = {'0x10de': 'NVIDIA', '0x1002': 'AMD', '0x8086': 'Intel'} + +_PCI_ADDRESS = re.compile(r'^[0-9a-f]{4}:[0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]$') + + +@dataclass(frozen=True) +class GpuDevice: + """A GPU with a DRM render node, as sysfs describes it.""" + + pci_address: str + render_node: str + card_node: Optional[str] + vendor_id: str + device_id: str + kernel_driver: str + # /dev/nvidia for the NVIDIA driver, which renders through it. + nvidia_node: Optional[str] = None + + @property + def drm_nodes(self) -> List[str]: + """The card's render node and its primary node. Firefox's GPU work is + accounted to whichever it was handed: a second launch from one process + on an RX 7900 XTX drew through /dev/dri/card0, not renderD128.""" + return [node for node in (self.render_node, self.card_node) if node] + + @property + def vendor(self) -> str: + return VENDORS.get(self.vendor_id, self.vendor_id) + + @property + def bus_id(self) -> str: + """Xorg's BusID: decimal bus:device:function, without the domain.""" + _, bus, dev_fn = self.pci_address.split(':') + dev, fn = dev_fn.split('.') + return f'PCI:{int(bus, 16)}:{int(dev, 16)}:{int(fn, 16)}' + + @property + def xorg_driver(self) -> str: + # modesetting drives any KMS device with glamor; NVIDIA needs its own. + return 'nvidia' if self.kernel_driver == 'nvidia' else 'modesetting' + + def __str__(self) -> str: + return ( + f'{self.pci_address} {self.vendor} [{self.vendor_id}:{self.device_id}] ' + f'driver={self.kernel_driver} {self.render_node}' + ) + + +def drew_on_gpu(fdinfo: str) -> bool: + """Whether a DRM file's usage stats (its fdinfo) show work on a GPU engine. + + Drivers report busy time (drm-engine-: ns; amdgpu, i915) or busy + cycles (drm-cycles-: ; xe reports only these). drm-total-cycles + counts the GPU's clock whether this client used it or not, so it is not work. + """ + busy = re.findall(r'^drm-(?:engine-[\w-]+:\s*(\d+) ns|cycles-[\w-]+:\s*(\d+))$', fdinfo, re.M) + return any(int(ns or cycles) > 0 for ns, cycles in busy) + + +def _read(path: Path) -> str: + try: + return path.read_text().strip() + except OSError: + return '' + + +def _uevent(path: Path) -> Dict[str, str]: + return dict(line.split('=', 1) for line in _read(path).splitlines() if '=' in line) + + +def _nvidia_minor(root: Path, pci_address: str) -> Optional[str]: + info = _read(root / 'proc/driver/nvidia/gpus' / pci_address / 'information') + match = re.search(r'^Device Minor:\s*(\d+)', info, re.M) + return f'/dev/nvidia{match.group(1)}' if match else None + + +def enumerate_gpus(root: Union[str, Path] = '/') -> List[GpuDevice]: + """The GPUs with a render node and a PCI address, in PCI address order. + + Ordered by PCI address, not render node number: render nodes are numbered + in the order the drivers loaded, which can change from one boot to the next. + """ + root = Path(root) + drm = root / 'sys/class/drm' + cards = {} + for card in drm.glob('card*'): + if re.fullmatch(r'card\d+', card.name): + try: + cards[(card / 'device').resolve(strict=True)] = f'/dev/dri/{card.name}' + except OSError: + continue + + gpus = [] + for node in (root / 'dev/dri').glob('renderD*'): + device = drm / node.name / 'device' + try: + real = device.resolve(strict=True) + except OSError: + continue + if not _PCI_ADDRESS.match(real.name): + continue + driver = _uevent(device / 'uevent').get('DRIVER', '') + gpus.append( + GpuDevice( + pci_address=real.name, + render_node=f'/dev/dri/{node.name}', + card_node=cards.get(real), + vendor_id=_read(device / 'vendor').lower(), + device_id=_read(device / 'device').lower(), + kernel_driver=driver, + nvidia_node=_nvidia_minor(root, real.name) if driver == 'nvidia' else None, + ) + ) + return sorted(gpus, key=lambda gpu: gpu.pci_address) + + +def _matches(index: int, gpu: GpuDevice, selector: str) -> bool: + if selector.isdigit(): + return int(selector) == index + ids = f"{gpu.vendor_id}:{gpu.device_id}".replace('0x', '') + names = {gpu.render_node, os.path.basename(gpu.render_node), gpu.vendor.lower(), ids} + if gpu.card_node: + names |= {gpu.card_node, os.path.basename(gpu.card_node)} + return selector.replace('0x', '') in {name.lower() for name in names} or selector in gpu.pci_address + + +def _listing(gpus: List[GpuDevice], shown: Optional[List[GpuDevice]] = None) -> str: + return '\n'.join(f' [{i}] {gpu}' for i, gpu in enumerate(gpus) if shown is None or gpu in shown) + + +def select_gpu(selector: Optional[Union[str, int]] = None, gpus: Optional[List[GpuDevice]] = None) -> GpuDevice: + """The one GPU `selector` (or CAMOUFOX_GPU) names. + + A selector is an index into enumerate_gpus(), a render or card node (name or + /dev/dri path), a PCI address or part of one, vendor:device ids, or a vendor + name. Without one, the host must have exactly one GPU. + """ + if gpus is None: + gpus = enumerate_gpus() + if not gpus: + raise NoGpuFound( + 'virtual-gpu: no GPU render node with a PCI address. Is a GPU present, is its driver ' + 'loaded, and are /dev/dri and /sys visible (--device /dev/dri in a container)?' + ) + if selector is None: + selector = os.environ.get(GPU_ENV_VAR, '') + selector = str(selector).strip().lower() + if not selector: + if len(gpus) == 1: + return gpus[0] + raise AmbiguousGpuSelection( + f'virtual-gpu: {len(gpus)} GPUs found. Name one with gpu= or {GPU_ENV_VAR}, ' + f'preferably by PCI address:\n{_listing(gpus)}' + ) + matched = [gpu for i, gpu in enumerate(gpus) if _matches(i, gpu, selector)] + if not matched: + raise GpuNotFound(f'virtual-gpu: no GPU matches {selector!r}. Available:\n{_listing(gpus)}') + if len(matched) > 1: + raise AmbiguousGpuSelection( + f'virtual-gpu: {selector!r} matches {len(matched)} GPUs:\n{_listing(gpus, matched)}' + ) + return matched[0] + + +def xorg_config(gpu: GpuDevice, screen: str = GPU_SCREEN) -> str: + """An xorg.conf that drives `gpu` with a virtual screen and no outputs. + + `UseDisplayDevice "None"` keeps the NVIDIA driver off every connector, so it + needs no DRM master and coexists with a desktop on the same card. + """ + width, height, depth = screen.split('x') + offscreen = '\tOption "UseDisplayDevice" "None"\n' if gpu.xorg_driver == 'nvidia' else '' + return f'''# Generated by camoufox for headless="virtual-gpu". +# GPU: {gpu.pci_address} {gpu.vendor} [{gpu.vendor_id}:{gpu.device_id}] driver={gpu.kernel_driver} +Section "ServerFlags" +\tOption "AutoAddDevices" "false" +\tOption "AutoAddGPU" "false" +\tOption "DontVTSwitch" "true" +\tOption "AllowMouseOpenFail" "true" +EndSection + +Section "Device" +\tIdentifier "camoufox-gpu" +\tDriver "{gpu.xorg_driver}" +\tBusID "{gpu.bus_id}" +{offscreen}\tOption "AllowEmptyInitialConfiguration" "true" +EndSection + +Section "Monitor" +\tIdentifier "camoufox-monitor" +\tHorizSync 5.0 - 1000.0 +\tVertRefresh 5.0 - 200.0 +EndSection + +Section "Screen" +\tIdentifier "camoufox-screen" +\tDevice "camoufox-gpu" +\tMonitor "camoufox-monitor" +\tDefaultDepth {depth} +\tSubSection "Display" +\t\tDepth {depth} +\t\tVirtual {width} {height} +\tEndSubSection +EndSection + +Section "ServerLayout" +\tIdentifier "camoufox-layout" +\tScreen "camoufox-screen" +EndSection +''' + + +def config_name(gpu: GpuDevice) -> str: + """The config's file name in /etc/X11, keyed by PCI address.""" + return f"camoufox-gpu-{re.sub(r'[:.]', '_', gpu.pci_address)}.conf" + + +def setup_command(gpu: GpuDevice) -> str: + """The one command that sets this machine up for `gpu`.""" + sudo = '' if os.geteuid() == 0 else 'sudo ' + return f'python -m camoufox gpu-setup {gpu.pci_address} | {sudo}sh' + + +def setup_script(gpu: GpuDevice) -> str: + """A root shell script that sets this machine up for headless="virtual-gpu" + on `gpu`: Xorg and its setuid wrapper, the wrapper's settings, and the + card's config. Safe to run again.""" + config = SYSTEM_CONFIG_DIR / config_name(gpu) + xwrapper = XWRAPPER_CONFIG + settings = ''.join(f'{key}={value}\\n' for key, value in XWRAPPER_SETTINGS.items()) + deletes = ' '.join( + f"-e '/^[[:space:]]*{key}[[:space:]]*=/d'" for key in XWRAPPER_SETTINGS + ) + nvidia = ( + '\n' + 'if ! find /usr/lib /usr/lib64 -name nvidia_drv.so 2>/dev/null | grep -q .; then\n' + "\techo 'camoufox gpu-setup: no nvidia_drv.so found. Install the NVIDIA driver'\\''s Xorg " + "module, matching the kernel driver (on Ubuntu, xserver-xorg-video-nvidia-).' >&2\n" + 'fi\n' + if gpu.xorg_driver == 'nvidia' + else '' + ) + return f'''#!/bin/sh +# Generated by camoufox gpu-setup for headless="virtual-gpu". +# GPU: {gpu} +# Run once as root: {setup_command(gpu)} +set -e +if [ "$(id -u)" -ne 0 ]; then +\techo 'camoufox gpu-setup: run this as root (pipe it to sudo sh).' >&2 +\texit 1 +fi + +# 1. The Xorg server and its setuid wrapper, Xorg.wrap. +if command -v apt-get >/dev/null 2>&1; then +\tdpkg -s xserver-xorg-core xserver-xorg-legacy >/dev/null 2>&1 \\ +\t\t|| DEBIAN_FRONTEND=noninteractive apt-get install -y xserver-xorg-core xserver-xorg-legacy +elif ! command -v Xorg >/dev/null 2>&1; then +\techo 'camoufox gpu-setup: install the Xorg server and its setuid wrapper (Xorg.wrap), then run this again.' >&2 +\texit 1 +fi +{nvidia} +# 2. Let Xorg.wrap start Xorg as root for any user. A launch from ssh, systemd +# or a container is not a console login. Any local user can then start a +# root X server. +touch {xwrapper} +sed -i {deletes} {xwrapper} +printf '{settings}' >> {xwrapper} + +# 3. The card's config, bound by PCI address. +cat > {config} <<'CAMOUFOX_XORG_CONF' +{xorg_config(gpu)}CAMOUFOX_XORG_CONF + +echo 'headless="virtual-gpu" is set up for {gpu.pci_address}.' +''' + + +def setup_problems() -> List[str]: + """What keeps Xorg.wrap from starting Xorg for this user, if anything.""" + problems = [] + if not any(path.exists() for path in XORG_WRAPPERS): + problems.append(f"no setuid Xorg.wrap ({' or '.join(map(str, XORG_WRAPPERS))})") + settings = {} + for line in _read(XWRAPPER_CONFIG).splitlines(): + key, _, value = line.partition('=') + settings[key.strip()] = value.strip() + for key, wanted in XWRAPPER_SETTINGS.items(): + have = settings.get(key) or 'unset' + if have != wanted: + problems.append(f'{XWRAPPER_CONFIG} has {key}={have}, needs {key}={wanted}') + return problems + + +def _session_on_vt(vt: str) -> Optional[str]: + """The logind session on VT `vt`, which its user may activate without root.""" + try: + sessions = subprocess.run( # nosec + ['loginctl', 'list-sessions', '--no-legend'], capture_output=True, text=True, check=True + ).stdout + except (OSError, subprocess.CalledProcessError): + return None + for line in sessions.splitlines(): + session = line.split()[0] + number = subprocess.run( # nosec + ['loginctl', 'show-session', session, '-p', 'VTNr', '--value'], + capture_output=True, + text=True, + ).stdout.strip() + if number == vt: + return session + return None + + +class GpuDisplay(VirtualDisplay): + """A headless Xorg server on one GPU, for headless='virtual-gpu'. + + As root, Xorg takes a temporary config and log. Otherwise it runs through + the setuid Xorg.wrap, which accepts only a config name relative to + /etc/X11 and no -logfile, so the config is installed there once. + """ + + _name = 'Xorg' + + def _error(self, message: str) -> CannotExecuteXorg: # type: ignore[override] + """A failed start, with what the machine is missing when that is why.""" + if os.geteuid() != 0: + problems = setup_problems() + if problems: + message += ( + '\nheadless="virtual-gpu" without root needs Xorg.wrap to start Xorg as root:\n' + + ''.join(f' - {problem}\n' for problem in problems) + + f'Set this machine up with:\n {setup_command(self.gpu)}' + ) + return CannotExecuteXorg(message) + + def __init__(self, gpu: GpuDevice, debug: bool = False, require_gpu: bool = True) -> None: + super().__init__(debug=debug, screen=GPU_SCREEN) + self.gpu = gpu + self.require_gpu = require_gpu + self._client: Optional[socket.socket] = None + self._temp_files: List[str] = [] + self._vt: Optional[str] = None + + @property + def xorg_path(self) -> str: + path = which('Xorg') + if not path: + raise CannotFindXorg( + 'headless="virtual-gpu" needs the Xorg server. Set this machine up with:\n' + f' {setup_command(self.gpu)}' + ) + return path + + def _command(self) -> List[str]: + if os.geteuid() == 0: + fd, config = tempfile.mkstemp(prefix='camoufox-xorg-', suffix='.conf') + with os.fdopen(fd, 'w') as f: + f.write(xorg_config(self.gpu, self.screen)) + log = config[: -len('.conf')] + '.log' + self._temp_files = [config, log] + files = ['-config', config, '-logfile', log] + else: + name = config_name(self.gpu) + if not (SYSTEM_CONFIG_DIR / name).is_file(): + raise CannotExecuteXorg( + f'headless="virtual-gpu" without root needs {SYSTEM_CONFIG_DIR / name}. ' + f'Set this machine up with:\n {setup_command(self.gpu)}' + ) + files = ['-config', name] + return [self.xorg_path, *files, *SERVER_FLAGS] + + def _wrapper(self) -> List[str]: + # No parent-death signal: the setuid Xorg.wrap drops it on exec. The + # held client and -terminate end the server instead (_ready). + return [] + + def _server_env(self) -> Optional[Dict[str, str]]: + return None + + def _log(self) -> str: + return self._temp_files[1] if self._temp_files else f'/var/log/Xorg.{self._display}.log' + + def get(self) -> str: + self._vt = _read(ACTIVE_VT) or None + return super().get() + + def _starting(self) -> None: + if self._vt and _read(ACTIVE_VT) != self._vt: + self._vt_taken() + + def _ready(self) -> None: + deadline = time.monotonic() + SETTLE_S + while time.monotonic() < deadline: + self._starting() + if self.proc is not None and self.proc.poll() is not None: + error = self._error( + f'Xorg exited ({self.proc.returncode}) right after starting. See {self._log()}.' + ) + self.kill() + raise error + time.sleep(0.1) + # The server exits at its last client's disconnect (-terminate), and a + # server no client ever reached never does. Holding one client from here + # on means it always has a last client: this one, closed by kill() or by + # the kernel when this process dies. An unprivileged launcher may not be + # able to signal a root Xorg, so this is the teardown that always works. + self._client = socket.socket(socket.AF_UNIX) + try: + self._client.connect(f'/tmp/.X11-unix/X{self._display}') + self._client.sendall(X11_SETUP) + except OSError as e: + self.kill() + raise self._error(f'Could not connect to the Xorg display it reported: {e}') from e + + def _vt_taken(self) -> None: + vt = self._vt or '' + number = vt.removeprefix('tty') + session = _session_on_vt(number) + if session: + subprocess.run(['loginctl', 'activate', session], capture_output=True) # nosec + if _read(ACTIVE_VT) != vt: + subprocess.run(['chvt', number], capture_output=True) # nosec + restored = _read(ACTIVE_VT) == vt + self.kill() + raise GpuVtTakeover( + f'Xorg on {self.gpu} switched the active VT away from {vt}. ' + + ('It was switched back.' if restored else f'Switch back with `sudo chvt {number}`.') + ) + + def _display_processes(self) -> List[int]: + """Every process started with DISPLAY set to this display, except Xorg and us.""" + needle = f'\0DISPLAY=:{self._display}\0'.encode() + skip = {os.getpid(), self.proc.pid if self.proc else None} + pids = [] + for entry in Path('/proc').iterdir(): + if not entry.name.isdigit() or int(entry.name) in skip: + continue + try: + if needle in b'\0' + (entry / 'environ').read_bytes(): + pids.append(int(entry.name)) + except OSError: + continue + return pids + + def uses_gpu(self) -> bool: + """Whether a process on this display renders on the GPU. + + Firefox opens the card's DRM nodes for DMABuf even when it renders in + software, so an open render node proves nothing. Rendering is the NVIDIA + driver's /dev/nvidia held open, or work the kernel accounted to a + GPU engine on one of the card's DRM nodes. + """ + nodes = self.gpu.drm_nodes + for pid in self._display_processes(): + try: + fds = list(Path(f'/proc/{pid}/fd').iterdir()) + except OSError: + continue + for fd in fds: + try: + target = os.readlink(fd) + if target == self.gpu.nvidia_node or ( + target in nodes + and drew_on_gpu(Path(f'/proc/{pid}/fdinfo/{fd.name}').read_text()) + ): + return True + except OSError: + continue + return False + + def wait_for_gpu(self) -> bool: + deadline = time.monotonic() + float(os.environ.get(GPU_WAIT_ENV_VAR) or GPU_WAIT_S) + while time.monotonic() < deadline: + if self.uses_gpu(): + return True + time.sleep(0.25) + return False + + def check_gpu(self, active: bool) -> None: + """Raise, or warn with require_gpu=False, when the browser did not render on the GPU.""" + if active: + return + if not self.require_gpu: + LeakWarning.warn('gpu_software_rendering') + return + raise GpuSoftwareFallback( + f'The browser on :{self._display} never rendered on {self.gpu}, so it renders in software. ' + f'Firefox may have blocklisted the driver or failed to create a GPU context. ' + f'See {self._log()}.' + ) + + def kill(self) -> None: + if self._client: + self._client.close() + self._client = None + if self._display is not None: + # The browser's helpers (dbus, at-spi) are not in its process group. + for sig in (signal.SIGTERM, signal.SIGKILL): + for pid in self._display_processes(): + try: + os.kill(pid, sig) + except OSError: + pass + deadline = time.monotonic() + 1.5 + while self._display_processes() and time.monotonic() < deadline: + time.sleep(0.05) + # SIGTERM lets Xorg remove its root-owned socket, which this process + # cannot; base kill() SIGKILLs only a server still running after that. + if self.proc is not None and self.proc.poll() is None: + try: + self.proc.terminate() + self.proc.wait(timeout=10) + except (OSError, subprocess.TimeoutExpired): + pass + super().kill() + for path in self._temp_files: + try: + os.remove(path) + except OSError: + pass + self._temp_files = [] + self._display = None + + +def prove_gpu(target: Any, display: GpuDisplay) -> None: + """Draw in a page of `target` and check the browser rendered on the GPU.""" + page = target.new_page() + try: + page.goto(PROBE_PAGE) + active = display.wait_for_gpu() + finally: + page.close() + display.check_gpu(active) + + +async def async_prove_gpu(target: Any, display: GpuDisplay) -> None: + import asyncio + + page = await target.new_page() + try: + await page.goto(PROBE_PAGE) + active = await asyncio.get_running_loop().run_in_executor(None, display.wait_for_gpu) + finally: + await page.close() + display.check_gpu(active) diff --git a/python/src/camoufox/host_rendering.py b/python/src/camoufox/host_rendering.py index 372eacd6..7ef58b42 100644 --- a/python/src/camoufox/host_rendering.py +++ b/python/src/camoufox/host_rendering.py @@ -16,6 +16,7 @@ from functools import lru_cache from typing import Any, Dict, Mapping, Optional, Tuple from .fingerprints import is_software_renderer +from .gpudisplay import GPU_PREFS BASELINE_OVERRIDES_PREF = 'privacy.baselineFingerprintingProtection.overrides' @@ -76,22 +77,31 @@ def set_webgpu(prefs: Dict[str, Any], target_os: str, gpu: Gpu, host: Optional[G prefs.setdefault(WEBGPU_BLOCKLIST_PREF, FEATURE_STATUS_OK if own_adapter else FEATURE_BLOCKED_DEVICE) -def host_gpu(executable_path: str, headless: bool, env: Mapping[str, Any]) -> Optional[Gpu]: +def host_gpu( + executable_path: str, headless: bool, env: Mapping[str, Any], prefs: Mapping[str, Any] +) -> Optional[Gpu]: """The (vendor, renderer) this machine's Firefox reports, or None without WebGL. Read from the binary about to launch, with no identity applied, under the - same display: headless, Xvfb and a real display can each render on a - different device. The strings are the ones Firefox sanitizes itself. + same display and the same rendering prefs: headless, Xvfb, a GPU display + and a real display can each render on a different device. The strings are + the ones Firefox sanitizes itself. """ return _host_gpu( str(executable_path), bool(headless), tuple(sorted((k, str(v)) for k, v in env.items() if not k.startswith(_LAUNCHER_ENV))), + tuple(sorted((k, prefs[k]) for k in GPU_PREFS if k in prefs)), ) @lru_cache(maxsize=None) -def _host_gpu(executable_path: str, headless: bool, env: Tuple[Tuple[str, str], ...]) -> Optional[Gpu]: +def _host_gpu( + executable_path: str, + headless: bool, + env: Tuple[Tuple[str, str], ...], + prefs: Tuple[Tuple[str, Any], ...], +) -> Optional[Gpu]: def read() -> Optional[Gpu]: from playwright.sync_api import sync_playwright @@ -101,7 +111,7 @@ def _host_gpu(executable_path: str, headless: bool, env: Tuple[Tuple[str, str], headless=headless, env=dict(env), # The launch forces WebGL on, which can choose another device. - firefox_user_prefs={'webgl.force-enabled': True}, + firefox_user_prefs={**dict(prefs), 'webgl.force-enabled': True}, ) try: gpu = browser.new_page().evaluate(_READ_GPU) diff --git a/python/src/camoufox/ip.py b/python/src/camoufox/ip.py index 32b15f3c..7eb1b7ae 100644 --- a/python/src/camoufox/ip.py +++ b/python/src/camoufox/ip.py @@ -85,6 +85,13 @@ def validate_ip(ip: str) -> None: raise InvalidIP(f"Invalid IP address: {ip}") +# Probing the exit IP through a proxy adds a hop and a TLS handshake behind it; 5 s +# is not enough for a proxy that routes the long way round, and every URL timing out +# fails the whole launch. Direct probes keep 5 s. +DIRECT_IP_TIMEOUT = 5 +PROXIED_IP_TIMEOUT = 15 + + def proxy_exit_geo(proxy: str) -> Tuple[str, str]: """ The exit IP of `proxy` and that IP's timezone, looked up through the proxy. @@ -95,7 +102,7 @@ def proxy_exit_geo(proxy: str) -> Tuple[str, str]: resp = requests.get( "http://ip-api.com/json?fields=status,message,query,timezone", proxies=Proxy.as_requests_proxy(proxy), - timeout=10, + timeout=PROXIED_IP_TIMEOUT, ) resp.raise_for_status() data = resp.json() @@ -121,7 +128,7 @@ def public_ipv6() -> Optional[str]: """ for url in ("https://api6.ipify.org", "https://v6.ident.me"): try: - resp = requests.get(url, timeout=5, verify=True) + resp = requests.get(url, timeout=DIRECT_IP_TIMEOUT, verify=True) resp.raise_for_status() except requests.RequestException: continue @@ -153,7 +160,7 @@ def public_ip(proxy: Optional[str] = None) -> str: resp = requests.get( url, proxies=Proxy.as_requests_proxy(proxy) if proxy else None, - timeout=5, + timeout=PROXIED_IP_TIMEOUT if proxy else DIRECT_IP_TIMEOUT, verify=True, ) resp.raise_for_status() diff --git a/python/src/camoufox/server.py b/python/src/camoufox/server.py index 669a6762..66280a66 100644 --- a/python/src/camoufox/server.py +++ b/python/src/camoufox/server.py @@ -1,13 +1,19 @@ +import re +import shutil import subprocess +import sys +import threading +from concurrent.futures import ThreadPoolExecutor from pathlib import Path -from typing import Any, Dict, NoReturn, Tuple, Union +from typing import Any, Dict, NoReturn, Optional, Tuple, Union import base64 import orjson from playwright._impl._driver import compute_driver_executable from camoufox.pkgman import LOCAL_DATA -from camoufox.utils import launch_options +from camoufox.gpudisplay import GpuDisplay, prove_gpu +from camoufox.utils import launch_options, start_virtual_display from camoufox.virtdisplay import VirtualDisplay LAUNCH_SCRIPT: Path = LOCAL_DATA / "launchServer.js" @@ -61,21 +67,46 @@ def launch_server(**kwargs) -> NoReturn: ) kwargs.pop(unsupported, None) - virtual_display = None - if kwargs.get('headless') == 'virtual': - virtual_display = VirtualDisplay(debug=kwargs.get('debug')) - kwargs['virtual_display'] = virtual_display.get() - kwargs['headless'] = False + virtual_display, kwargs['headless'] = start_virtual_display( + kwargs.get('headless'), kwargs.get('debug'), kwargs + ) try: - _serve(launch_options(**kwargs)) + _serve(launch_options(**kwargs), virtual_display) finally: if virtual_display: virtual_display.kill() -def _serve(config: Dict[str, Any]) -> NoReturn: +def _prove_served_gpu(process: subprocess.Popen, display: GpuDisplay) -> None: + """Pass the server's output through, and once it prints its endpoint, check + that its browser renders on the GPU.""" + from playwright.sync_api import sync_playwright + + def prove(endpoint: str) -> None: + with sync_playwright() as playwright: + browser = playwright.firefox.connect(endpoint) + try: + prove_gpu(browser, display) + finally: + browser.close() + + assert process.stdout is not None + for line in process.stdout: + sys.stdout.write(line) + sys.stdout.flush() + endpoint = re.search(r'ws://\S+', line) + if endpoint: + # The sync API refuses to start inside a running asyncio loop. + with ThreadPoolExecutor(max_workers=1) as pool: + pool.submit(prove, endpoint.group(0)).result() + break + threading.Thread(target=shutil.copyfileobj, args=(process.stdout, sys.stdout), daemon=True).start() + + +def _serve(config: Dict[str, Any], virtual_display: Optional[VirtualDisplay] = None) -> NoReturn: """Run launchServer.js with `config` until the Node process exits.""" nodejs = get_nodejs() + gpu_display = virtual_display if isinstance(virtual_display, GpuDisplay) else None data = orjson.dumps(to_camel_case_dict(config)) @@ -90,6 +121,7 @@ def _serve(config: Dict[str, Any]) -> NoReturn: ], cwd=driver_package, stdin=subprocess.PIPE, + stdout=subprocess.PIPE if gpu_display else None, text=True, ) # Send one newline-delimited configuration frame, then keep the pipe open. @@ -126,6 +158,8 @@ def _serve(config: Dict[str, Any]) -> NoReturn: try: stdin.write(encoded_config) stdin.flush() + if gpu_display: + _prove_served_gpu(process, gpu_display) process.wait() except OSError as error: # If Node failed before reading the frame, preserve its exit status diff --git a/python/src/camoufox/sync_api.py b/python/src/camoufox/sync_api.py index af2ba46b..9a424794 100644 --- a/python/src/camoufox/sync_api.py +++ b/python/src/camoufox/sync_api.py @@ -20,6 +20,7 @@ from .utils import ( new_context_options, persistent_context_options, spoofs_window_dimensions, + start_virtual_display, sync_attach_vd, ) @@ -84,7 +85,7 @@ def NewBrowser( def NewBrowser( playwright: Playwright, *, - headless: Optional[Union[bool, Literal['virtual']]] = None, + headless: Optional[Union[bool, Literal['virtual', 'virtual-gpu']]] = None, from_options: Optional[Dict[str, Any]] = None, persistent_context: bool = False, debug: Optional[bool] = None, @@ -94,6 +95,11 @@ def NewBrowser( Launches a new browser instance for Camoufox given a set of launch options. Parameters: + headless (Optional[Union[bool, Literal['virtual', 'virtual-gpu']]]): + True for Firefox headless. On Linux, 'virtual' runs a headed browser on + an Xvfb display, and 'virtual-gpu' on a headless Xorg server bound to + the GPU `gpu` (or CAMOUFOX_GPU) names; `require_gpu=False` warns instead + of failing when the browser does not render on it. from_options (Dict[str, Any]): A set of launch options generated by `launch_options()` to use persistent_context (bool): @@ -101,13 +107,28 @@ def NewBrowser( **kwargs: All other keyword arguments passed to `launch_options()`. """ - if headless == 'virtual': - virtual_display = VirtualDisplay(debug=debug) - kwargs['virtual_display'] = virtual_display.get() - headless = False - else: - virtual_display = None + virtual_display, headless = start_virtual_display(headless, debug, kwargs) + # Everything after the display exists can fail (bad proxy, missing binary, + # unsatisfiable constraints) before sync/async_attach_vd wires kill() into + # close, which used to strand one Xvfb and its /tmp/.X lock per failed + # launch. + try: + return _launch(playwright, virtual_display, headless, from_options, persistent_context, debug, kwargs) + except BaseException: + if virtual_display: + virtual_display.kill() + raise + +def _launch( + playwright: Playwright, + virtual_display: Optional[VirtualDisplay], + headless: Any, + from_options: Optional[Dict[str, Any]], + persistent_context: bool, + debug: Optional[bool], + kwargs: Dict[str, Any], +) -> Union[Browser, BrowserContext]: # Options the caller built leave its contexts to the caller (host_identity). canvas_noise: Optional[bool] = False if not from_options: diff --git a/python/src/camoufox/utils.py b/python/src/camoufox/utils.py index 467aec49..748cef77 100644 --- a/python/src/camoufox/utils.py +++ b/python/src/camoufox/utils.py @@ -43,6 +43,7 @@ from .pkgman import ( selected_launch_path, warn_if_package_outdated, ) +from .gpudisplay import GPU_PREFS, GpuDisplay, async_prove_gpu, prove_gpu, select_gpu from .virtdisplay import VirtualDisplay from ._warnings import FallbackWarning, LeakWarning from .host_rendering import Gpu, add_canvas_placeholder, has_canvas_placeholder, host_gpu, renders_on_hardware, set_webgpu @@ -796,7 +797,7 @@ def host_identity(from_options: Dict[str, Any], canvas_noise: Optional[bool]) -> host_os = _host_os_key() covered, gpu = plan_rendering( host_os, None, False, bool(prefs.get('webgl.disabled')), - lambda: host_gpu(from_options['executable_path'], from_options['headless'], from_options['env']), + lambda: host_gpu(from_options['executable_path'], from_options['headless'], from_options['env'], prefs), ) return None if covered else (host_os, gpu) @@ -846,11 +847,37 @@ def new_context_options( return opts +def start_virtual_display( + headless: Any, debug: Optional[bool], kwargs: Dict[str, Any] +) -> Tuple[Optional[VirtualDisplay], Any]: + """Start the display headless='virtual' or 'virtual-gpu' asks for. + + Pops the display's own options from `kwargs` and points the launch at the + display. Returns the display, or None, and the headless value to launch with. + """ + gpu = kwargs.pop('gpu', None) + require_gpu = kwargs.pop('require_gpu', None) + if headless == 'virtual-gpu': + display: VirtualDisplay = GpuDisplay( + select_gpu(gpu), debug=bool(debug), require_gpu=require_gpu is not False + ) + kwargs['firefox_user_prefs'] = {**GPU_PREFS, **(kwargs.get('firefox_user_prefs') or {})} + elif gpu is not None or require_gpu is not None: + raise ValueError("gpu and require_gpu apply to headless='virtual-gpu' only") + elif headless == 'virtual': + display = VirtualDisplay(debug=debug) + else: + return None, headless + kwargs['virtual_display'] = display.get() + return display, False + + async def async_attach_vd( browser: Any, virtual_display: Optional[VirtualDisplay] = None ) -> Any: # type: ignore """ - Attaches the virtual display to the async browser cleanup + Attaches the virtual display to the async browser cleanup, and on a GPU + display checks the browser renders on the GPU. """ if not virtual_display: # Skip if no virtual display is provided return browser @@ -865,6 +892,13 @@ async def async_attach_vd( browser.close = new_close + if isinstance(virtual_display, GpuDisplay): + try: + await async_prove_gpu(browser, virtual_display) + except BaseException: + await browser.close() + raise + return browser @@ -872,7 +906,8 @@ def sync_attach_vd( browser: Any, virtual_display: Optional[VirtualDisplay] = None ) -> Any: # type: ignore """ - Attaches the virtual display to the sync browser cleanup + Attaches the virtual display to the sync browser cleanup, and on a GPU + display checks the browser renders on the GPU. """ if not virtual_display: # Skip if no virtual display is provided return browser @@ -887,6 +922,13 @@ def sync_attach_vd( browser.close = new_close + if isinstance(virtual_display, GpuDisplay): + try: + prove_gpu(browser, virtual_display) + except BaseException: + browser.close() + raise + return browser @@ -1002,7 +1044,8 @@ def launch_options( headless (Optional[bool]): Whether to run the browser in headless mode. Defaults to False. Note: If you are running linux, passing headless='virtual' to Camoufox, AsyncCamoufox - or launch_server will use Xvfb. + or launch_server will use Xvfb, and headless='virtual-gpu' a headless Xorg + server bound to one GPU. main_world_eval (Optional[bool]): Whether to enable running scripts in the main world. To use this, prepend "mw:" to the script: page.evaluate("mw:" + script). @@ -1576,7 +1619,7 @@ def launch_options( canvas_noise, bool(webgl_config or (config.get('webGl:vendor') and config.get('webGl:renderer'))), bool(block_webgl), - lambda: host_gpu(browser_binary, headless, env), + lambda: host_gpu(browser_binary, headless, env, firefox_user_prefs), ) if cover_canvas: add_canvas_placeholder(firefox_user_prefs) diff --git a/python/src/camoufox/virtdisplay.py b/python/src/camoufox/virtdisplay.py index 7aff1c28..ac3119d0 100644 --- a/python/src/camoufox/virtdisplay.py +++ b/python/src/camoufox/virtdisplay.py @@ -4,7 +4,7 @@ import select import subprocess # nosec import time from shutil import which -from typing import Optional +from typing import Dict, List, Optional from camoufox.exceptions import ( CannotExecuteXvfb, @@ -13,8 +13,10 @@ from camoufox.exceptions import ( ) from camoufox.pkgman import OS_NAME -# Safe timeout for Xvfb writing display num, prevents infinite hang. -DISPLAYFD_READ_TIMEOUT_S = 10.0 +# Safe timeout for Xvfb writing display num, prevents infinite hang. A cold first +# Xvfb on a fresh host took 0.6-8.4 s to report (lang315/camoufox#157), so 10 s +# failed launches that would have succeeded. +DISPLAYFD_READ_TIMEOUT_S = 30.0 # Xvfb screen geometry for headless="virtual". The root window size is not # observable (see virtual-display-default-1x1x24 in ci/tribal-rules.yml); @@ -94,24 +96,43 @@ class VirtualDisplay: raise CannotFindXvfb("Please install util-linux (for setpriv) to use headless mode.") return path + # What get() calls the server in its errors, and what it raises. + _name = "Xvfb" + _error = CannotExecuteXvfb + + def _wrapper(self) -> List[str]: + """What execs the server. setpriv's parent-death signal stops Xvfb when + this process dies without reaching kill(), even by SIGKILL; SIGTERM lets + Xvfb remove its own lock and socket. See xvfb-dies-with-its-launcher in + ci/tribal-rules.yml.""" + return [self.setpriv_path, "--pdeathsig", "TERM"] + + def _command(self) -> List[str]: + """The server's argv, less -displayfd, which get() adds.""" + return [self.xvfb_path, *self.xvfb_args] + + def _server_env(self) -> Optional[Dict[str, str]]: + # Force Mesa software GLX; we don't use the GPU anyway. + return {**os.environ, "__GLX_VENDOR_LIBRARY_NAME": "mesa", "LIBGL_ALWAYS_SOFTWARE": "1"} + + def _starting(self) -> None: + """Called about every 100ms while the server has not reported a display.""" + + def _ready(self) -> None: + """Called once the server has reported its display.""" + def get(self) -> str: self._assert_linux() if self.proc is None: - # Launch Xvfb with -displayfd so Xvfb itself picks a free display + # Launch the server with -displayfd so it picks a free display # number atomically and reports it back. Avoids userspace races. # subprocess.Popen's pass_fds keeps an fd at its parent number in # the child (unlike Node's `stdio: [..., 'pipe']` which renumbers - # to 3), so we tell Xvfb that exact number. + # to 3), so we tell the server that exact number. + program, *args = self._command() read_fd, write_fd = os.pipe() - # setpriv's parent-death signal stops Xvfb when this process dies - # without reaching kill(), even by SIGKILL; SIGTERM lets Xvfb remove - # its own lock and socket. See xvfb-dies-with-its-launcher in - # ci/tribal-rules.yml. - cmd = [ - self.setpriv_path, "--pdeathsig", "TERM", - self.xvfb_path, "-displayfd", str(write_fd), *self.xvfb_args, - ] + cmd = [*self._wrapper(), program, "-displayfd", str(write_fd), *args] if self.debug: print("Starting virtual display:", " ".join(cmd)) self.proc = subprocess.Popen( # nosec @@ -121,31 +142,29 @@ class VirtualDisplay: stderr=None if self.debug else subprocess.DEVNULL, start_new_session=True, pass_fds=(write_fd,), - env={ - **os.environ, - # Force Mesa software GLX; we don't use the GPU anyway. - "__GLX_VENDOR_LIBRARY_NAME": "mesa", - "LIBGL_ALWAYS_SOFTWARE": "1", - }, + env=self._server_env(), ) - os.close(write_fd) # so the read end EOFs when Xvfb closes its end + os.close(write_fd) # so the read end EOFs when the server closes its end buf = b"" deadline = time.monotonic() + DISPLAYFD_READ_TIMEOUT_S try: while b"\n" not in buf: remaining = deadline - time.monotonic() - if remaining <= 0 or not select.select([read_fd], [], [], remaining)[0]: + if remaining <= 0: self.kill() - raise CannotExecuteXvfb( - f"Xvfb did not report a display within " + raise self._error( + f"{self._name} did not report a display within " f"{int(DISPLAYFD_READ_TIMEOUT_S * 1000)}ms" ) + if not select.select([read_fd], [], [], min(remaining, 0.1))[0]: + self._starting() + continue chunk = os.read(read_fd, 64) if not chunk: self.kill() - raise CannotExecuteXvfb( - f"Xvfb did not report a display " + raise self._error( + f"{self._name} did not report a display " f"(got {buf!r}, exit={self.proc.poll()})" ) buf += chunk @@ -156,7 +175,8 @@ class VirtualDisplay: self._display = int(buf.strip()) except ValueError: self.kill() - raise CannotExecuteXvfb(f"Xvfb wrote non-integer display: {buf!r}") + raise self._error(f"{self._name} wrote non-integer display: {buf!r}") + self._ready() elif self.debug: print(f"Using virtual display: {self._display}") diff --git a/python/src/camoufox/warnings.yml b/python/src/camoufox/warnings.yml index 74d6159e..74abbdc6 100644 --- a/python/src/camoufox/warnings.yml +++ b/python/src/camoufox/warnings.yml @@ -63,6 +63,11 @@ canvas_noise: >- the identity claims another OS or GPU than this machine's, whose canvas would show the real one. Pass `canvas_noise=False` to keep stock canvas behaviour. +gpu_software_rendering: >- + The browser on the headless="virtual-gpu" display never rendered on the GPU, so it + renders canvas and WebGL in software, which a page can tell from the GPU the + identity claims. Pass `require_gpu=True` (the default) to fail the launch instead. + block_images: >- Blocking image requests has been reported to cause detection issues on major WAFs. diff --git a/python/src/camoufox/webgl.py b/python/src/camoufox/webgl.py index 876d9c90..09358a06 100644 --- a/python/src/camoufox/webgl.py +++ b/python/src/camoufox/webgl.py @@ -51,6 +51,13 @@ _HOST_DEPENDENT_EXTENSIONS = frozenset({'OVR_multiview2'}) # unconditionally on D3D11 (renderer11_utils.cpp); 146's ANGLE did not. _BACKEND_EXTENSIONS = {'win': ('EXT_depth_clamp',)} +# Firefox 158 (bug 1854003) exposes EXT_polygon_offset_clamp wherever the GL +# backend clamps polygon offsets: ANGLE's D3D11 backend from feature level 10_0, +# which WebGL2 needs, and Linux desktop GL drivers (ARB_polygon_offset_clamp, +# core in GL 4.6), whose recordings have EXT_depth_clamp. macOS release builds +# run WebGL on CGL's GL 4.1, which lacks it. +_POLYGON_OFFSET_CLAMP = 'EXT_polygon_offset_clamp' + _ALIASED_LINE_WIDTH_RANGE = '33902' # What Firefox reports under privacy.resistFingerprinting. A Camoufox identity @@ -111,10 +118,22 @@ def firefox_gpus(target_os: str) -> FrozenSet[Tuple[str, str]]: ) -def _context_config(prefix: str, webgl: Dict[str, Any], target_os: str) -> Dict[str, Any]: +def _backend_extensions(target_os: str, webgl: Dict[str, Any], webgl2: Any) -> Tuple[str, ...]: + """The extensions the shipped Firefox adds on this device's backend.""" + extensions = _BACKEND_EXTENSIONS.get(target_os, ()) + if (target_os == 'win' and webgl2) or ( + target_os == 'lin' and 'EXT_depth_clamp' in webgl['supportedExtensions'] + ): + extensions += (_POLYGON_OFFSET_CLAMP,) + return extensions + + +def _context_config( + prefix: str, webgl: Dict[str, Any], target_os: str, backend: Tuple[str, ...] +) -> Dict[str, Any]: blocked = _filtered_extensions(target_os) extensions = [extension for extension in webgl['supportedExtensions'] if extension not in blocked] - for extension in _BACKEND_EXTENSIONS.get(target_os, ()): + for extension in backend: if extension not in extensions: # Firefox lists them in WebGLExtensionID order: alphabetical, ignoring case. at = next((i for i, other in enumerate(extensions) if other.casefold() > extension.casefold()), None) @@ -134,14 +153,15 @@ def to_config(webgl: Dict[str, Any], webgl2: Any, target_os: str) -> Dict[str, A `webgl2` is `[]` for a device without WebGL2. """ + backend = _backend_extensions(target_os, webgl, webgl2) config = { 'webGl:vendor': webgl['vendor'], 'webGl:renderer': webgl['renderer'], - **_context_config('webGl', webgl, target_os), + **_context_config('webGl', webgl, target_os, backend), 'webGl2Enabled': bool(webgl2), } if webgl2: - config.update(_context_config('webGl2', webgl2, target_os)) + config.update(_context_config('webGl2', webgl2, target_os, backend)) # Firefox 156 creates WebGL1 on the same GL profile as WebGL2, so both # report one line width range. 146 forced WebGL1 onto a compatibility # profile, and fpgen recorded that profile's driver range. diff --git a/python/tests/test_addons.py b/python/tests/test_addons.py index d448e899..b5f6b484 100644 --- a/python/tests/test_addons.py +++ b/python/tests/test_addons.py @@ -12,11 +12,13 @@ Run with: """ import os +import threading +import time import pytest from camoufox import addons as addons_mod -from camoufox.addons import DefaultAddons, maybe_download_addons +from camoufox.addons import DefaultAddons, add_default_addons, maybe_download_addons UBO = DefaultAddons.UBO.name @@ -89,3 +91,89 @@ def test_failed_download_removes_partial_dir(addons_dir, monkeypatch): # trusting an addon that has no manifest.json. assert not path.exists() assert out == [] + + +def test_concurrent_launches_download_once(addons_dir, monkeypatch): + # Two launches in one process share the check-then-extract. A lock created + # per call guarded nothing, so both saw no manifest and both downloaded. + calls = [] + + def slow(url, extract_path, name): + calls.append(name) + time.sleep(0.2) + _write_manifest(url, extract_path, name) + + monkeypatch.setattr(addons_mod, "download_and_extract", slow) + + outs = [[], []] + threads = [threading.Thread(target=add_default_addons, args=(out,)) for out in outs] + for t in threads: + t.start() + for t in threads: + t.join() + + assert calls == [UBO] + assert outs == [[str(addons_dir / UBO)]] * 2 + + +def test_extraction_appears_complete_or_not_at_all(tmp_path, monkeypatch): + # Another process checks for manifest.json without the lock, so the addon + # directory must never hold a manifest while its other files are missing. + target = tmp_path / UBO + target.mkdir() + seen = [] + + def fake_unzip(buffer, extract_path, desc=None, bar=True): + seen.append((target / "manifest.json").exists()) + _write_manifest(None, extract_path, UBO) + with open(os.path.join(extract_path, "background.js"), "w") as f: + f.write("") + seen.append((target / "manifest.json").exists()) + + monkeypatch.setattr(addons_mod, "webdl", lambda *a, **k: b"") + monkeypatch.setattr(addons_mod, "unzip", fake_unzip) + + addons_mod.download_and_extract("url", str(target), UBO) + + assert seen == [False, False] + assert sorted(os.listdir(target)) == ["background.js", "manifest.json"] + assert os.listdir(tmp_path) == [UBO] + + +def test_complete_addon_installed_meanwhile_is_kept(tmp_path, monkeypatch): + # Another process can finish installing the addon while this one extracts. + # Its copy may already be loading in a browser, so it must not be deleted. + target = tmp_path / UBO + target.mkdir() + + def fake_unzip(buffer, extract_path, desc=None, bar=True): + _write_manifest(None, extract_path, UBO) + _write_manifest(None, str(target), UBO) + with open(target / "theirs.js", "w") as f: + f.write("") + + monkeypatch.setattr(addons_mod, "webdl", lambda *a, **k: b"") + monkeypatch.setattr(addons_mod, "unzip", fake_unzip) + + addons_mod.download_and_extract("url", str(target), UBO) + + assert sorted(os.listdir(target)) == ["manifest.json", "theirs.js"] + assert os.listdir(tmp_path) == [UBO] + + +def test_failed_download_keeps_complete_addon(addons_dir, monkeypatch): + # This launch's download fails after another process installed the addon. + # That copy may already be loading in a browser, so it must not be deleted. + path = addons_dir / UBO + + def fail(url, extract_path, name): + _write_manifest(url, str(path), name) + raise RuntimeError("network died mid-download") + + monkeypatch.setattr(addons_mod, "download_and_extract", fail) + + out = [] + maybe_download_addons([DefaultAddons.UBO], out) + + assert (path / "manifest.json").exists() + assert out == [] diff --git a/python/tests/test_gpudisplay.py b/python/tests/test_gpudisplay.py new file mode 100644 index 00000000..91f292a7 --- /dev/null +++ b/python/tests/test_gpudisplay.py @@ -0,0 +1,632 @@ +""" +Tests for camoufox.gpudisplay (headless='virtual-gpu') that need no GPU: +enumeration and selection on a fake sysfs tree, the generated xorg.conf, the +Xorg argv, the browser's environment and prefs, the identity's GPU probe, the +VT guard, the GPU-use check, and teardown. + +The real display is browser/tests/native/test_gpu_display.py. + +Mirrors typescript/tests/gpudisplay.test.ts. +""" + +import os +import subprocess +import sys +import time +import warnings +from pathlib import Path +from unittest import mock + +import pytest + +from camoufox import gpudisplay, host_rendering, sync_api, utils +from camoufox._warnings import LeakWarning +from camoufox.exceptions import ( + AmbiguousGpuSelection, + CannotExecuteXorg, + CannotFindXorg, + GpuNotFound, + GpuSoftwareFallback, + GpuVtTakeover, + NoGpuFound, + VirtualDisplayError, +) +from camoufox.gpudisplay import ( + GPU_PREFS, + GpuDevice, + GpuDisplay, + config_name, + enumerate_gpus, + select_gpu, + xorg_config, +) + +pytestmark = pytest.mark.skipif(sys.platform != "linux", reason="virtual-gpu is Linux-only") + +NVIDIA = GpuDevice( + pci_address='0000:01:00.0', + render_node='/dev/dri/renderD129', + card_node='/dev/dri/card1', + vendor_id='0x10de', + device_id='0x2c02', + kernel_driver='nvidia', + nvidia_node='/dev/nvidia0', +) +AMD = GpuDevice( + pci_address='0000:6f:00.0', + render_node='/dev/dri/renderD128', + card_node='/dev/dri/card0', + vendor_id='0x1002', + device_id='0x744c', + kernel_driver='amdgpu', +) +AMD_IGPU = GpuDevice( + pci_address='0000:70:00.0', + render_node='/dev/dri/renderD130', + card_node='/dev/dri/card3', + vendor_id='0x1002', + device_id='0x13c0', + kernel_driver='amdgpu', +) +HOST = [NVIDIA, AMD, AMD_IGPU] + + +def _device(root: Path, pci: str, vendor: str, device: str, driver: str) -> Path: + path = root / 'sys/devices/pci0000:00' / pci + path.mkdir(parents=True) + (path / 'vendor').write_text(vendor + '\n') + (path / 'device').write_text(device + '\n') + (path / 'uevent').write_text(f'DRIVER={driver}\nPCI_SLOT_NAME={pci}\n') + return path + + +def _node(root: Path, name: str, device: Path) -> None: + (root / 'dev/dri' / name).touch() + (root / 'sys/class/drm' / name).mkdir() + (root / 'sys/class/drm' / name / 'device').symlink_to(device) + + +@pytest.fixture +def host(tmp_path): + """This machine's layout: the render nodes are numbered in driver load order, + so the AMD card is renderD128 though the NVIDIA one has the lower address.""" + (tmp_path / 'dev/dri').mkdir(parents=True) + (tmp_path / 'sys/class/drm').mkdir(parents=True) + nvidia = _device(tmp_path, '0000:01:00.0', '0x10de', '0x2c02', 'nvidia') + amd = _device(tmp_path, '0000:6f:00.0', '0x1002', '0x744C', 'amdgpu') + igpu = _device(tmp_path, '0000:70:00.0', '0x1002', '0x13c0', 'amdgpu') + for name, device in ( + ('renderD128', amd), ('card0', amd), + ('renderD129', nvidia), ('card1', nvidia), + ('renderD130', igpu), ('card3', igpu), + ): + _node(tmp_path, name, device) + # A connector is a card*-named entry that is not a card. + (tmp_path / 'sys/class/drm/card1-DP-1').mkdir() + # A render node with no PCI device cannot be bound by BusID. + platform = tmp_path / 'sys/devices/platform/vgem' + platform.mkdir(parents=True) + _node(tmp_path, 'renderD131', platform) + info = tmp_path / 'proc/driver/nvidia/gpus/0000:01:00.0' + info.mkdir(parents=True) + (info / 'information').write_text('Model: \t NVIDIA GeForce RTX 5080\nDevice Minor: \t 0\n') + return tmp_path + + +class TestEnumeration: + def test_lists_pci_gpus_in_address_order_not_render_node_order(self, host): + assert enumerate_gpus(host) == HOST + + def test_no_dri_directory_is_no_gpus(self, tmp_path): + assert enumerate_gpus(tmp_path) == [] + + def test_bus_id_is_decimal_without_the_domain(self): + assert NVIDIA.bus_id == 'PCI:1:0:0' + assert AMD.bus_id == 'PCI:111:0:0' + + def test_nvidia_gets_its_own_driver_and_everything_else_modesetting(self): + assert NVIDIA.xorg_driver == 'nvidia' + assert AMD.xorg_driver == 'modesetting' + + def test_the_nvidia_driver_device_is_found_by_pci_address(self, host): + assert [gpu.nvidia_node for gpu in enumerate_gpus(host)] == ['/dev/nvidia0', None, None] + + +class TestSelection: + @pytest.mark.parametrize( + 'selector', + [0, '0', 'renderD129', '/dev/dri/renderD129', 'card1', '/dev/dri/card1', + '01:00.0', '0000:01:00.0', '10de:2c02', '0x10de:0x2c02', 'nvidia', 'NVIDIA'], + ) + def test_every_kind_of_selector_names_the_nvidia_card(self, selector): + assert select_gpu(selector, HOST) == NVIDIA + + def test_a_pci_address_names_the_amd_card(self): + assert select_gpu('6f:00.0', HOST) == AMD + + def test_the_environment_names_the_card_when_the_option_does_not(self, monkeypatch): + monkeypatch.setenv('CAMOUFOX_GPU', '6f:00.0') + assert select_gpu(None, HOST) == AMD + + def test_the_option_wins_over_the_environment(self, monkeypatch): + monkeypatch.setenv('CAMOUFOX_GPU', '6f:00.0') + assert select_gpu('01:00.0', HOST) == NVIDIA + + def test_a_lone_gpu_needs_no_selector(self, monkeypatch): + monkeypatch.delenv('CAMOUFOX_GPU', raising=False) + assert select_gpu(None, [AMD]) == AMD + + def test_several_gpus_and_no_selector_is_ambiguous(self, monkeypatch): + monkeypatch.delenv('CAMOUFOX_GPU', raising=False) + with pytest.raises(AmbiguousGpuSelection, match='3 GPUs'): + select_gpu(None, HOST) + + def test_a_selector_matching_two_gpus_is_ambiguous(self): + with pytest.raises(AmbiguousGpuSelection, match=r"(?s)\[1\].*\[2\]"): + select_gpu('amd', HOST) + + def test_a_selector_matching_nothing_fails(self): + with pytest.raises(GpuNotFound, match='intel'): + select_gpu('intel', HOST) + + def test_an_index_past_the_end_fails(self): + with pytest.raises(GpuNotFound): + select_gpu(3, HOST) + + def test_no_gpus_fails(self): + with pytest.raises(NoGpuFound): + select_gpu('0', []) + + def test_every_failure_is_a_virtual_display_error(self): + with pytest.raises(VirtualDisplayError): + select_gpu('intel', HOST) + + +class TestXorgConfig: + def test_nvidia(self): + config = xorg_config(NVIDIA) + for line in ( + 'Option "AutoAddDevices" "false"', + 'Option "AutoAddGPU" "false"', + 'Option "DontVTSwitch" "true"', + 'Option "AllowMouseOpenFail" "true"', + 'Driver "nvidia"', + 'BusID "PCI:1:0:0"', + 'Option "UseDisplayDevice" "None"', + 'Option "AllowEmptyInitialConfiguration" "true"', + 'HorizSync 5.0 - 1000.0', + 'VertRefresh 5.0 - 200.0', + 'DefaultDepth 24', + 'Virtual 1920 1080', + ): + assert line in config, line + + def test_other_cards_use_modesetting_without_the_nvidia_option(self): + config = xorg_config(AMD) + assert 'Driver "modesetting"' in config + assert 'BusID "PCI:111:0:0"' in config + assert 'UseDisplayDevice' not in config + + def test_names_no_render_node_which_can_change_between_boots(self): + assert 'renderD' not in xorg_config(NVIDIA) + + def test_the_file_is_named_by_pci_address(self): + assert config_name(NVIDIA) == 'camoufox-gpu-0000_01_00_0.conf' + + def test_the_cli_prints_it(self, monkeypatch, capsys): + from camoufox.__main__ import cli + + monkeypatch.setattr(gpudisplay, 'enumerate_gpus', lambda: HOST) + with pytest.raises(SystemExit) as exit: + cli(['gpu-xorg-config', '01:00.0']) + assert exit.value.code == 0 + assert capsys.readouterr().out == xorg_config(NVIDIA) + + +@pytest.fixture +def xwrapper(monkeypatch, tmp_path): + config = tmp_path / 'Xwrapper.config' + wrapper = tmp_path / 'Xorg.wrap' + wrapper.touch() + monkeypatch.setattr(gpudisplay, 'XWRAPPER_CONFIG', config) + monkeypatch.setattr(gpudisplay, 'XORG_WRAPPERS', (wrapper,)) + monkeypatch.setattr(os, 'geteuid', lambda: 1000) + return config + + +class TestSetup: + """One command sets a machine up, and every failure it would fix names it.""" + + def test_a_stock_wrapper_is_named_with_the_fix(self, xwrapper): + # What Debian and Ubuntu ship. + xwrapper.write_text('# Xwrapper.config\nallowed_users=console\n') + error = GpuDisplay(AMD)._error('Xorg exited (1) right after starting.') + assert isinstance(error, CannotExecuteXorg) + message = str(error) + assert f'{xwrapper} has allowed_users=console, needs allowed_users=anybody' in message + assert f'{xwrapper} has needs_root_rights=unset, needs needs_root_rights=yes' in message + assert message.endswith('python -m camoufox gpu-setup 0000:6f:00.0 | sudo sh') + + def test_a_missing_wrapper_is_named(self, xwrapper, monkeypatch, tmp_path): + xwrapper.write_text('allowed_users=anybody\nneeds_root_rights=yes\n') + monkeypatch.setattr(gpudisplay, 'XORG_WRAPPERS', (tmp_path / 'none',)) + assert gpudisplay.setup_problems() == [f'no setuid Xorg.wrap ({tmp_path / "none"})'] + + def test_a_set_up_machine_adds_nothing_to_the_error(self, xwrapper): + xwrapper.write_text('allowed_users = anybody\nneeds_root_rights = yes\n') + assert str(GpuDisplay(AMD)._error('Xorg exited (1).')) == 'Xorg exited (1).' + + def test_as_root_the_wrapper_is_not_involved(self, xwrapper, monkeypatch): + monkeypatch.setattr(os, 'geteuid', lambda: 0) + assert str(GpuDisplay(AMD)._error('Xorg exited (1).')) == 'Xorg exited (1).' + + @pytest.mark.parametrize('gpu', [NVIDIA, AMD], ids=['nvidia', 'amd']) + def test_the_script_is_valid_sh_and_installs_the_card_config(self, gpu): + script = gpudisplay.setup_script(gpu) + assert subprocess.run(['sh', '-n'], input=script, text=True).returncode == 0 + config = gpudisplay.SYSTEM_CONFIG_DIR / config_name(gpu) + assert f"cat > {config} <<'CAMOUFOX_XORG_CONF'\n{xorg_config(gpu)}CAMOUFOX_XORG_CONF\n" in script + assert "printf 'allowed_users=anybody\\nneeds_root_rights=yes\\n'" in script + assert ('nvidia_drv.so' in script) is (gpu.xorg_driver == 'nvidia') + + def test_the_cli_prints_it(self, monkeypatch, capsys): + from camoufox.__main__ import cli + + monkeypatch.setattr(gpudisplay, 'enumerate_gpus', lambda: HOST) + with pytest.raises(SystemExit) as exit: + cli(['gpu-setup', '01:00.0']) + assert exit.value.code == 0 + assert capsys.readouterr().out == gpudisplay.setup_script(NVIDIA) + + +@pytest.fixture +def xorg(monkeypatch): + monkeypatch.setattr(gpudisplay, 'which', lambda name: f'/usr/bin/{name}') + + +class TestCommand: + def test_without_root_the_installed_config_is_named(self, xorg, monkeypatch, tmp_path): + monkeypatch.setattr(os, 'geteuid', lambda: 1000) + monkeypatch.setattr(gpudisplay, 'SYSTEM_CONFIG_DIR', tmp_path) + (tmp_path / config_name(NVIDIA)).write_text(xorg_config(NVIDIA)) + + assert GpuDisplay(NVIDIA)._command() == [ + '/usr/bin/Xorg', '-config', 'camoufox-gpu-0000_01_00_0.conf', + '-terminate', '2', '-nolisten', 'tcp', '-sharevts', '-novtswitch', + ] + + def test_without_root_a_missing_config_says_how_to_install_it(self, xorg, monkeypatch, tmp_path): + monkeypatch.setattr(os, 'geteuid', lambda: 1000) + monkeypatch.setattr(gpudisplay, 'SYSTEM_CONFIG_DIR', tmp_path) + + with pytest.raises(CannotExecuteXorg) as error: + GpuDisplay(NVIDIA)._command() + assert str(error.value).endswith('python -m camoufox gpu-setup 0000:01:00.0 | sudo sh') + + def test_a_missing_xorg_says_how_to_set_the_machine_up(self, monkeypatch): + monkeypatch.setattr(gpudisplay, 'which', lambda name: None) + monkeypatch.setattr(os, 'geteuid', lambda: 0) + with pytest.raises(CannotFindXorg) as error: + GpuDisplay(AMD).xorg_path + # As root the script needs no sudo. + assert str(error.value).endswith('python -m camoufox gpu-setup 0000:6f:00.0 | sh') + + def test_as_root_a_temporary_config_and_log_are_used_and_removed(self, xorg, monkeypatch): + monkeypatch.setattr(os, 'geteuid', lambda: 0) + display = GpuDisplay(AMD) + command = display._command() + + config = command[command.index('-config') + 1] + log = command[command.index('-logfile') + 1] + assert os.path.isabs(config) + assert Path(config).read_text() == xorg_config(AMD) + assert command[-6:] == ['-terminate', '2', '-nolisten', 'tcp', '-sharevts', '-novtswitch'] + + Path(log).touch() + display.kill() + assert not os.path.exists(config) and not os.path.exists(log) + + def test_xorg_inherits_the_environment_untouched(self): + # Xvfb's server is forced onto Mesa's software GLX; this one must not be. + assert GpuDisplay(NVIDIA)._server_env() is None + + +class TestLaunch: + @pytest.fixture + def started(self, monkeypatch): + monkeypatch.setattr(utils, 'select_gpu', lambda selector: NVIDIA) + monkeypatch.setattr(GpuDisplay, 'get', lambda self: ':77') + + def test_points_the_launch_at_the_display_with_the_gpu_prefs(self, started): + kwargs = {'gpu': '01:00.0', 'firefox_user_prefs': {'gfx.webrender.all': False}} + display, headless = utils.start_virtual_display('virtual-gpu', False, kwargs) + + assert isinstance(display, GpuDisplay) and display.require_gpu + assert headless is False + assert kwargs == { + 'virtual_display': ':77', + # The caller's prefs win. + 'firefox_user_prefs': {**GPU_PREFS, 'gfx.webrender.all': False}, + } + + def test_require_gpu_false_only_warns(self, started): + display, _ = utils.start_virtual_display('virtual-gpu', False, {'require_gpu': False}) + assert not display.require_gpu + + @pytest.mark.parametrize('option', ['gpu', 'require_gpu']) + def test_gpu_options_without_virtual_gpu_are_refused(self, option): + with pytest.raises(ValueError, match="virtual-gpu"): + utils.start_virtual_display('virtual', False, {option: '0'}) + + def test_the_browser_gets_only_x11_settings_no_gpu_overrides(self, started): + kwargs = {'gpu': '0'} + utils.start_virtual_display('virtual-gpu', False, kwargs) + with mock.patch.object(utils, 'installed_verstr', lambda: '150.0.2'), mock.patch.object( + utils, 'launch_path', lambda **kw: '/nonexistent/camoufox' + ): + env = utils.launch_options(headless=False, i_know_what_im_doing=True, env={}, **kwargs)['env'] + + assert env['DISPLAY'] == ':77' + overrides = [ + key for key in env + if key.startswith(('MESA_', '__GLX_', 'LIBGL_', 'DRI_PRIME', '__NV_')) + ] + assert overrides == [] + + def test_the_identity_probes_the_gpu_display_with_its_prefs(self, started): + """The identity claims the GPU Firefox reports on the GPU display, not + the one the desktop renders on.""" + probes = [] + + def probe(executable_path, headless, env, prefs): + probes.append((env.get('DISPLAY'), {k: prefs.get(k) for k in GPU_PREFS})) + return ('NVIDIA Corporation', 'NVIDIA GeForce GTX 980, or similar') + + kwargs = {'gpu': '0'} + utils.start_virtual_display('virtual-gpu', False, kwargs) + with mock.patch.object(utils, '_host_os_key', lambda: 'lin'), mock.patch.object( + utils, 'host_gpu', probe + ), mock.patch.object(utils, 'installed_verstr', lambda: '150.0.2'), mock.patch.object( + utils, 'launch_path', lambda **kw: '/nonexistent/camoufox' + ): + options = utils.launch_options(os='linux', headless=False, i_know_what_im_doing=True, **kwargs) + + assert probes == [(':77', GPU_PREFS)] + prefs = options['firefox_user_prefs'] + assert not host_rendering.has_canvas_placeholder(prefs) + + def test_the_probe_reads_with_the_launch_rendering_prefs_only(self, monkeypatch): + calls = [] + monkeypatch.setattr(host_rendering, '_host_gpu', lambda *args: calls.append(args)) + host_rendering.host_gpu('/x/camoufox', False, {'DISPLAY': ':77'}, {**GPU_PREFS, 'intl.locale.requested': 'en-US'}) + + assert calls == [('/x/camoufox', False, (('DISPLAY', ':77'),), tuple(sorted(GPU_PREFS.items())))] + + def test_a_failed_launch_tears_the_display_down(self, monkeypatch): + display = mock.Mock() + monkeypatch.setattr(sync_api, 'start_virtual_display', lambda headless, debug, kwargs: (display, False)) + monkeypatch.setattr(sync_api, 'launch_options', mock.Mock(side_effect=RuntimeError('boom'))) + + with pytest.raises(RuntimeError, match='boom'): + sync_api.NewBrowser(mock.Mock(), headless='virtual-gpu') + display.kill.assert_called_once() + + +class FakePage: + def __init__(self): + self.url = None + self.closed = False + + def goto(self, url): + self.url = url + + def close(self): + self.closed = True + + +class FakeBrowser: + def __init__(self): + self.page = FakePage() + self.closed = False + + def new_page(self): + return self.page + + def close(self): + self.closed = True + + +class TestGpuProof: + def test_a_browser_that_opened_the_gpu_is_kept(self, monkeypatch): + display = GpuDisplay(NVIDIA) + monkeypatch.setattr(display, 'wait_for_gpu', lambda: True) + browser = FakeBrowser() + + assert utils.sync_attach_vd(browser, display) is browser + assert browser.page.url == gpudisplay.PROBE_PAGE and browser.page.closed + assert not browser.closed + + def test_a_browser_in_software_is_closed_and_the_launch_fails(self, monkeypatch): + display = GpuDisplay(NVIDIA) + monkeypatch.setattr(display, 'wait_for_gpu', lambda: False) + kill = mock.Mock() + monkeypatch.setattr(display, 'kill', kill) + browser = FakeBrowser() + + with pytest.raises(GpuSoftwareFallback): + utils.sync_attach_vd(browser, display) + assert browser.closed + kill.assert_called() + + def test_require_gpu_false_warns_instead(self, monkeypatch): + display = GpuDisplay(NVIDIA, require_gpu=False) + monkeypatch.setattr(display, 'wait_for_gpu', lambda: False) + + with warnings.catch_warnings(record=True) as caught: + warnings.simplefilter('always') + utils.sync_attach_vd(FakeBrowser(), display) + assert any(issubclass(w.category, LeakWarning) and 'software' in str(w.message) for w in caught) + + def test_the_wait_is_overridable(self, monkeypatch): + display = GpuDisplay(NVIDIA) + monkeypatch.setattr(display, 'uses_gpu', lambda: False) + monkeypatch.setenv('CAMOUFOX_GPU_WAIT_S', '0.3') + start = time.monotonic() + assert display.wait_for_gpu() is False + assert time.monotonic() - start < 5 + + +def _holding(path: str, display: str) -> subprocess.Popen: + """A process on `display` that holds `path` open, as a browser holds the GPU.""" + proc = subprocess.Popen( + [sys.executable, '-c', f'f = open({path!r}); print(1, flush=True); import time; time.sleep(60)'], + env={**os.environ, 'DISPLAY': display}, + stdout=subprocess.PIPE, + ) + proc.stdout.readline() + return proc + + +# /proc//fdinfo of Firefox's render node on an RX 7900 XTX, trimmed. +AMDGPU_FDINFO = """pos:\t0 +flags:\t02100002 +drm-driver:\tamdgpu +drm-client-id:\t5873 +drm-total-vram:\t159812 KiB +drm-engine-gfx:\t{gfx} ns +drm-engine-compute:\t0 ns +drm-engine-capacity-gfx:\t1 +""" + +# From the kernel's Xe usage stats documentation. +XE_FDINFO = """pos:\t0 +flags:\t0100002 +drm-driver:\txe +drm-client-id:\t21 +drm-cycles-rcs:\t{rcs} +drm-total-cycles-rcs:\t7655183225 +drm-cycles-bcs:\t0 +drm-total-cycles-bcs:\t7655183225 +drm-engine-capacity-vcs:\t2 +""" + + +class TestGpuUse: + """Rendering is read from what the kernel accounts to the browser, never + from the renderer string, which the identity spoofs.""" + + def test_engine_time_on_the_render_node_is_rendering(self): + assert gpudisplay.drew_on_gpu(AMDGPU_FDINFO.format(gfx=39907610)) + + def test_xe_busy_cycles_count(self): + # xe reports cycles only; its total-cycles line grows on an idle client too. + assert gpudisplay.drew_on_gpu(XE_FDINFO.format(rcs=28257900)) + assert not gpudisplay.drew_on_gpu(XE_FDINFO.format(rcs=0)) + + def test_an_idle_render_node_is_not(self): + # Firefox opens it for DMABuf in software too; the capacity line is not time. + assert not gpudisplay.drew_on_gpu(AMDGPU_FDINFO.format(gfx=0)) + assert not gpudisplay.drew_on_gpu('pos:\t0\nflags:\t02\n') + + @pytest.fixture + def card(self, tmp_path): + for name in ('renderD200', 'nvidia7'): + (tmp_path / name).touch() + return GpuDevice( + '0000:01:00.0', str(tmp_path / 'renderD200'), None, '0x10de', '0x2c02', 'nvidia', + str(tmp_path / 'nvidia7'), + ) + + @pytest.fixture + def display(self, card): + display = GpuDisplay(card) + display._display = 98765 + return display + + @pytest.mark.parametrize( + 'held, on, rendering', + [ + ('nvidia_node', ':98765', True), + ('nvidia_node', ':987650', False), + # An open render node with no engine time is software rendering. + ('render_node', ':98765', False), + ], + ) + def test_what_a_process_on_the_display_holds(self, card, display, held, on, rendering): + proc = _holding(getattr(card, held), on) + try: + assert display.uses_gpu() is rendering + finally: + proc.kill() + proc.wait() + + @pytest.mark.parametrize('held', ['render_node', 'card_node']) + def test_engine_work_on_either_drm_node_of_the_card_is_rendering( + self, tmp_path, monkeypatch, held + ): + # On an RX 7900 XTX, a second launch from one process drew through + # /dev/dri/card0 and left renderD128 idle. + for name in ('renderD200', 'card9', 'other'): + (tmp_path / name).touch() + gpu = GpuDevice( + '0000:6f:00.0', str(tmp_path / 'renderD200'), str(tmp_path / 'card9'), + '0x1002', '0x744c', 'amdgpu', + ) + display = GpuDisplay(gpu) + display._display = 98765 + monkeypatch.setattr(gpudisplay, 'drew_on_gpu', lambda fdinfo: True) + for path, rendering in ((getattr(gpu, held), True), (str(tmp_path / 'other'), False)): + proc = _holding(path, ':98765') + try: + assert display.uses_gpu() is rendering + finally: + proc.kill() + proc.wait() + + def test_kill_sweeps_every_process_on_the_display(self, card, display): + proc = _holding(card.render_node, ':98765') + try: + display.kill() + assert proc.wait(timeout=5) is not None + finally: + proc.kill() + proc.wait() + + +class TestVtGuard: + @pytest.fixture + def vt(self, monkeypatch, tmp_path): + active = tmp_path / 'active' + active.write_text('tty2\n') + monkeypatch.setattr(gpudisplay, 'ACTIVE_VT', active) + return active + + def test_a_vt_switch_is_undone_and_fails_the_launch(self, vt, monkeypatch): + commands = [] + + def run(command, **kwargs): + commands.append(command) + if command[:2] == ['loginctl', 'list-sessions']: + return subprocess.CompletedProcess(command, 0, '3 1000 user seat0 tty2\n', '') + if command[:2] == ['loginctl', 'show-session']: + return subprocess.CompletedProcess(command, 0, '2\n', '') + if command[:2] == ['loginctl', 'activate']: + vt.write_text('tty2\n') + return subprocess.CompletedProcess(command, 0, '', '') + + monkeypatch.setattr(gpudisplay.subprocess, 'run', run) + display = GpuDisplay(NVIDIA) + kill = mock.Mock() + monkeypatch.setattr(display, 'kill', kill) + display._vt = 'tty2' + vt.write_text('tty7\n') + + with pytest.raises(GpuVtTakeover, match='switched back'): + display._starting() + assert ['loginctl', 'activate', '3'] in commands + kill.assert_called_once() + + def test_an_unchanged_vt_is_left_alone(self, vt): + display = GpuDisplay(NVIDIA) + display._vt = 'tty2' + display._starting() diff --git a/python/tests/test_host_rendering.py b/python/tests/test_host_rendering.py index 173bc265..bd78a65e 100644 --- a/python/tests/test_host_rendering.py +++ b/python/tests/test_host_rendering.py @@ -45,7 +45,7 @@ def on_host(gpu, os_key="lin"): """A host whose Firefox renders on `gpu`; records every probe.""" probes = [] - def probe(executable_path, headless, env): + def probe(executable_path, headless, env, prefs): probes.append((executable_path, headless)) return gpu @@ -234,13 +234,17 @@ class TestWebGpu: def test_the_probe_ignores_what_the_launcher_adds_to_the_environment(): - """host_identity probes with the launch's env, which carries - CAMOU_* and FONTCONFIG_FILE; that must hit launch_options' cached probe.""" + """host_identity probes with the launch's env and prefs, which carry + CAMOU_*, FONTCONFIG_FILE and prefs that choose no device; that must hit + launch_options' cached probe.""" from camoufox import host_rendering with mock.patch.object(host_rendering, "_host_gpu", return_value=HOST_GPU) as probe: - host_gpu("/bin/camoufox", True, {"DISPLAY": ":0"}) - host_gpu("/bin/camoufox", True, {"DISPLAY": ":0", "CAMOU_CONFIG_1": "{}", "FONTCONFIG_FILE": "/x"}) + host_gpu("/bin/camoufox", True, {"DISPLAY": ":0"}, {}) + host_gpu( + "/bin/camoufox", True, {"DISPLAY": ":0", "CAMOU_CONFIG_1": "{}", "FONTCONFIG_FILE": "/x"}, + {"webgl.force-enabled": True}, + ) assert probe.call_args_list[0] == probe.call_args_list[1] diff --git a/python/tests/test_launch_failure_cleanup.py b/python/tests/test_launch_failure_cleanup.py new file mode 100644 index 00000000..9694829c --- /dev/null +++ b/python/tests/test_launch_failure_cleanup.py @@ -0,0 +1,71 @@ +"""headless="virtual" must not strand its Xvfb when the launch fails. + +Everything after VirtualDisplay() -- launch_options(), the Playwright launch -- +can raise before sync/async_attach_vd wires kill() into close, which used to +leave one Xvfb and its /tmp/.X lock per failed launch. +""" + +import asyncio + +import pytest + +from camoufox import async_api, sync_api, utils + + +class FakeDisplay: + instances = [] + + def __init__(self, debug=None): + self.killed = False + FakeDisplay.instances.append(self) + + def get(self): + return ":99" + + def kill(self): + self.killed = True + + +class Boom(Exception): + pass + + +def _raise(*args, **kwargs): + raise Boom() + + +@pytest.fixture(autouse=True) +def fake_display(monkeypatch): + FakeDisplay.instances.clear() + # NewBrowser and AsyncNewBrowser start the display through + # utils.start_virtual_display. + monkeypatch.setattr(utils, "VirtualDisplay", FakeDisplay) + + +def test_sync_kills_display_when_launch_options_fails(monkeypatch): + monkeypatch.setattr(sync_api, "launch_options", _raise) + with pytest.raises(Boom): + sync_api.NewBrowser(object(), headless="virtual") + assert FakeDisplay.instances[0].killed + + +def test_async_kills_display_when_launch_options_fails(monkeypatch): + monkeypatch.setattr(async_api, "launch_options", _raise) + with pytest.raises(Boom): + asyncio.run(async_api.AsyncNewBrowser(object(), headless="virtual")) + assert FakeDisplay.instances[0].killed + + +def test_sync_kills_display_when_browser_launch_fails(monkeypatch): + monkeypatch.setattr(sync_api, "launch_options", lambda **kw: {}) + monkeypatch.setattr(sync_api, "host_identity", lambda *a: None) + + class Firefox: + launch = staticmethod(_raise) + + class Playwright: + firefox = Firefox() + + with pytest.raises(Boom): + sync_api.NewBrowser(Playwright(), headless="virtual") + assert FakeDisplay.instances[0].killed diff --git a/python/tests/test_proxy_geo.py b/python/tests/test_proxy_geo.py index 2e46a5cd..1ff9d65c 100644 --- a/python/tests/test_proxy_geo.py +++ b/python/tests/test_proxy_geo.py @@ -107,3 +107,29 @@ def test_no_lookup_when_both_values_are_given(api): with mock.patch.object(ip.requests, "get") as get: _new_context(api, {"server": "1.2.3.4:8080"}, webrtc_ip="198.51.100.1", timezone_id="UTC") get.assert_not_called() + + +def test_lookups_through_a_proxy_get_longer_than_direct_ones(monkeypatch): + # A proxied probe adds a hop and a TLS handshake; 5 s failed whole launches + # behind proxies that route the long way round. + timeouts = [] + + def get(url, **kwargs): + timeouts.append((url, kwargs["timeout"], bool(kwargs.get("proxies")))) + response = mock.MagicMock() + response.text = "203.0.113.7" + response.json.return_value = EXIT + return response + + monkeypatch.setattr(ip.requests, "get", get) + ip.public_ip.cache_clear() + ip.public_ip() + ip.public_ip("http://u:p@proxy.example.com:8080") + ip.proxy_exit_geo("http://u:p@proxy.example.com:8080") + ip.public_ip.cache_clear() + assert [(t, proxied) for _, t, proxied in timeouts] == [ + (ip.DIRECT_IP_TIMEOUT, False), + (ip.PROXIED_IP_TIMEOUT, True), + (ip.PROXIED_IP_TIMEOUT, True), + ] + assert ip.PROXIED_IP_TIMEOUT > ip.DIRECT_IP_TIMEOUT diff --git a/python/tests/test_server.py b/python/tests/test_server.py index 867576dc..7ffbda24 100644 --- a/python/tests/test_server.py +++ b/python/tests/test_server.py @@ -25,7 +25,7 @@ from pathlib import Path import orjson import pytest -from camoufox import server +from camoufox import server, utils from camoufox.server import get_nodejs # Anything on the driver's private lib/ path is fair game for Playwright to @@ -303,7 +303,7 @@ class _ExitedProcess: @pytest.fixture def fake_virtual_display(monkeypatch): _FakeVirtualDisplay.instances = [] - monkeypatch.setattr(server, "VirtualDisplay", _FakeVirtualDisplay, raising=False) + monkeypatch.setattr(utils, "VirtualDisplay", _FakeVirtualDisplay) monkeypatch.setattr(server, "get_nodejs", lambda: "/node") return _FakeVirtualDisplay.instances @@ -347,3 +347,49 @@ def test_launch_server_kills_virtual_display_when_launch_fails( assert len(fake_virtual_display) == 1 assert fake_virtual_display[0].killed + + +def test_a_served_gpu_display_is_proved_on_the_printed_endpoint(monkeypatch, capsys): + # The server's browser runs in Node, so the GPU check connects to the + # endpoint launchServer.js prints, and the output still reaches the user. + import io + + import playwright.sync_api + + connected = [] + + class FakePlaywright: + def __enter__(self): + return self + + def __exit__(self, *args): + pass + + @property + def firefox(self): + return self + + def connect(self, endpoint): + connected.append(endpoint) + return self + + def close(self): + connected.append("closed") + + proved = [] + monkeypatch.setattr(playwright.sync_api, "sync_playwright", FakePlaywright) + monkeypatch.setattr(server, "prove_gpu", lambda browser, display: proved.append(display)) + + class Process: + stdout = io.StringIO( + "Launching server...\n" + "Websocket endpoint:\x1b[93m ws://localhost:4242/abc \x1b[0m\n" + "after\n" + ) + + display = object() + server._prove_served_gpu(Process(), display) + + assert connected == ["ws://localhost:4242/abc", "closed"] + assert proved == [display] + assert "ws://localhost:4242/abc" in capsys.readouterr().out diff --git a/python/tests/test_webgl.py b/python/tests/test_webgl.py index 32906c37..20dc79ad 100644 --- a/python/tests/test_webgl.py +++ b/python/tests/test_webgl.py @@ -42,7 +42,9 @@ def test_converter_reproduces_the_recorded_device(): value, less the UNMASKED_* strings, which the browser takes from webGl:vendor/renderer rather than the table. Keys since marked removed (contextAttributes) are no longer sent. WebGL1's line width range is - WebGL2's since Firefox 156 (test_webgl1_line_width_range_is_webgl2s).""" + WebGL2's since Firefox 156 (test_webgl1_line_width_range_is_webgl2s), and + Firefox 158 adds EXT_polygon_offset_clamp on this desktop GL device + (test_polygon_offset_clamp_follows_the_backend).""" removed = { entry["property"] for entry in json.loads(PROPERTIES.read_text()) @@ -51,6 +53,8 @@ def test_converter_reproduces_the_recorded_device(): old = json.loads((Path(__file__).parent / "data" / "webgl-gtx980-linux.json").read_text()) old = {key: value for key, value in old.items() if key not in removed} old["webGl:parameters"]["33902"] = old["webGl2:parameters"]["33902"] + for key in ("webGl:supportedExtensions", "webGl2:supportedExtensions"): + old[key] = sorted([*old[key], "EXT_polygon_offset_clamp"], key=str.casefold) new = webgl_for_gpu("lin", *_GTX_980_LINUX, seed=0) assert new.keys() == old.keys() @@ -196,7 +200,9 @@ def test_draft_extensions_filtered_on_every_os(): webgl2 = {**recorded, "supportedExtensions": ["EXT_texture_norm16", "WEBGL_clip_cull_distance", "OVR_multiview2"]} for target_os in OSES: config = webgl.to_config(recorded, webgl2, target_os) - backend = ["EXT_depth_clamp"] if target_os == "win" else [] + # A device with WebGL2 is D3D11 feature level 10_0 or above, where ANGLE + # also clamps polygon offsets; the recording carries no desktop GL mark. + backend = ["EXT_depth_clamp", "EXT_polygon_offset_clamp"] if target_os == "win" else [] assert config["webGl:supportedExtensions"] == ["ANGLE_instanced_arrays", *backend] assert config["webGl2:supportedExtensions"] == (backend + ["OVR_multiview2"] if target_os == "win" else []) @@ -208,6 +214,21 @@ def test_windows_exposes_ext_depth_clamp_on_every_device(): assert all("EXT_depth_clamp" in exts for exts in _extensions("win", key) if exts), key +def test_polygon_offset_clamp_follows_the_backend(): + """Firefox 158 exposes EXT_polygon_offset_clamp on ANGLE's D3D11 backend + from feature level 10_0 (every device with WebGL2) and on Linux desktop GL + (the recordings with EXT_depth_clamp), never on macOS's GL 4.1; fpgen's + Firefox 146 records predate it.""" + for target_os in OSES: + for s in range(100): + config = sample_webgl_for_screen(target_os, 1920, 1080, s) + desktop_gl = "EXT_depth_clamp" in config["webGl:supportedExtensions"] + want = {"win": config["webGl2Enabled"], "lin": desktop_gl, "mac": False}[target_os] + for key in ("webGl:supportedExtensions", "webGl2:supportedExtensions"): + if key in config: + assert ("EXT_polygon_offset_clamp" in config[key]) == want, (target_os, s, key) + + def test_extensions_are_in_firefoxs_order(): """getSupportedExtensions lists in WebGLExtensionID order: alphabetical, ignoring case. An extension the backend adds takes its place there.""" diff --git a/typescript/README.md b/typescript/README.md index a055d7e7..59adcd07 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -154,7 +154,27 @@ host's only when the identity claims the host's GPU. Otherwise |---|---|---| | `false` (default) | A normal window | Needs a display. | | `true` | Firefox headless | Camoufox patches the headless tells it knows about. | -| `"virtual"` | A headed browser on a private Xvfb display | Linux only, needs `Xvfb` and `setpriv` (util-linux). Handled by `Camoufox()`, `NewBrowser()` and `launchServer()`. The display is 1x1 unless `CAMOUFOX_VIRTUAL_DISPLAY_SIZE` (e.g. `1920x1080x24`) says otherwise. | +| `"virtual"` | A headed browser on a private Xvfb display | Linux only, needs `Xvfb` and `setpriv` (util-linux). Handled by `Camoufox()`, `NewBrowser()` and `launchServer()`. The display is 1x1 unless `CAMOUFOX_VIRTUAL_DISPLAY_SIZE` (e.g. `1920x1080x24`) says otherwise. Xvfb has no GPU: canvas and WebGL render in software. | +| `"virtual-gpu"` | A headed browser on a private, headless Xorg server bound to one GPU | Linux only, needs Xorg and the card's driver. Canvas and WebGL render on the card. Handled like `"virtual"`. | + +```javascript +import { Camoufox } from "camoufox"; + +const browser = await Camoufox({ headless: "virtual-gpu", gpu: "0000:01:00.0", os: "linux" }); +``` + +The card is named by `gpu` or `CAMOUFOX_GPU`, never guessed. Without root, +set the machine up once per card. This installs Xorg and its setuid wrapper, +lets the wrapper start Xorg for any user and installs the card's config. A +launch that fails for want of it ends its error with this command: + +```bash +npx camoufox gpu-setup 0000:01:00.0 | sudo sh +``` + +The launch checks that the browser renders on the card, and the identity claims +that card. The Python README explains the selectors, the checks and the +errors: [The GPU display](https://github.com/daijro/camoufox/blob/main/python/README.md#the-gpu-display). ### Remote server @@ -187,7 +207,7 @@ await plain.close(); Prefer `NewBrowser()`: it also defaults new pages to no viewport when the window size is spoofed, and to the host's own color scheme and motion settings. `launchOptions()` returns Playwright's camelCase keys (`executablePath`, -`firefoxUserPrefs`), and does not handle `headless: "virtual"`. +`firefoxUserPrefs`), and does not handle `headless: "virtual"` or `"virtual-gpu"`. ## Launch options @@ -199,7 +219,9 @@ names. Any other key is passed to Playwright's `firefox.launch()` (or | Option | Type | Default | Effect | |---|---|---|---| | `os` | `string \| string[]` | fpgen's real-world mix | `"windows"`, `"macos"`, `"linux"`, or a list to pick from. | -| `headless` | `boolean \| "virtual"` | `false` | See [Headless modes](#headless-modes). | +| `headless` | `boolean \| "virtual" \| "virtual-gpu"` | `false` | See [Headless modes](#headless-modes). | +| `gpu` | `string \| number` | `CAMOUFOX_GPU`, or the only GPU | The card for `headless: "virtual-gpu"`. Not taken by `launchOptions()`. | +| `require_gpu` | `boolean` | `true` | With `headless: "virtual-gpu"`, fail the launch when the browser does not render on the card; `false` warns. Not taken by `launchOptions()`. | | `proxy` | `{ server, username?, password?, bypass? }` | none | Playwright proxy. | | `geoip` | `boolean \| string` | none | `true` finds the public IP (through `proxy` if set); a string uses that IP. Sets timezone, locale, geolocation and the WebRTC IP. Without a proxy, also decides whether IPv6 stays on. | | `geoip_db` | `string` | the `camoufox set --geoip` choice | GeoIP database name, e.g. `"GeoIP AIO by daijro"`. | @@ -254,6 +276,8 @@ and `from_options` (an object from `launchOptions()` to use as is). | `path` | | Print the data directory (`~/.cache/camoufox` on Linux). | | `test [url]` | `--executable-path ` | Open a headed browser with the Playwright inspector. | | `server` | | Start a Playwright server and print its websocket endpoint. | +| `gpu-setup [gpu]` | | Print the root script that sets this machine up for `headless: "virtual-gpu"` on the card `gpu` names (or `CAMOUFOX_GPU`). Run it with `\| sudo sh`. | +| `gpu-xorg-config [gpu]` | | Print the Xorg config `headless: "virtual-gpu"` needs for the card `gpu` names (or `CAMOUFOX_GPU`). | Each release is paired with the one browser build it was built and tested with, the same build as the Python release of the same version, and every launch uses diff --git a/typescript/scripts/golden/launch_golden.py b/typescript/scripts/golden/launch_golden.py index f73d06db..187b9576 100644 --- a/typescript/scripts/golden/launch_golden.py +++ b/typescript/scripts/golden/launch_golden.py @@ -472,7 +472,7 @@ def run(name, spec): restore.append(('get_random_preset', utils.get_random_preset)) utils.get_random_preset = fake_random_preset if 'host_gpu' in special: - def fake_host_gpu(executable_path, headless, env): + def fake_host_gpu(executable_path, headless, env, prefs): calls.append({'fn': 'host_gpu', 'executable_path': executable_path, 'headless': headless}) return tuple(special['host_gpu']) diff --git a/typescript/src/__main__.ts b/typescript/src/__main__.ts index 916dace1..051bea5c 100644 --- a/typescript/src/__main__.ts +++ b/typescript/src/__main__.ts @@ -1312,6 +1312,26 @@ function dirSize(dir: string): string { return `${size.toFixed(1)} GB`; } +program + .command("gpu-xorg-config") + .description('Print the Xorg config headless="virtual-gpu" needs for GPU') + .argument("[gpu]") + .action(async (gpu: string | undefined) => { + const { selectGpu, xorgConfig } = await import("./gpudisplay.js"); + process.stdout.write(xorgConfig(selectGpu(gpu))); + }); + +program + .command("gpu-setup") + .description( + 'Print a root script that sets this machine up for headless="virtual-gpu" on GPU', + ) + .argument("[gpu]") + .action(async (gpu: string | undefined) => { + const { selectGpu, setupScript } = await import("./gpudisplay.js"); + process.stdout.write(setupScript(selectGpu(gpu))); + }); + program .command("version") .description("Display version, package, browser, and storage info") diff --git a/typescript/src/addons.ts b/typescript/src/addons.ts index 15cd2740..63d9de51 100644 --- a/typescript/src/addons.ts +++ b/typescript/src/addons.ts @@ -21,6 +21,10 @@ export type DefaultAddon = keyof typeof DefaultAddons; // Addons are stored in a shared folder, not per-browser version const ADDONS_DIR: string = path.join(INSTALL_DIR, "addons"); +// One chain for the module: concurrent launches in one process would otherwise +// interleave the same check-then-extract at its awaits. +let extractChain: Promise = Promise.resolve(); + /** * Confirms that the addon paths are valid. */ @@ -50,11 +54,17 @@ export async function addDefaultAddons( addons[name] = url; } } - await maybeDownloadAddons(addons, addonsList); + const run = extractChain.then(() => maybeDownloadAddons(addons, addonsList)); + extractChain = run.catch(() => undefined); + await run; } /** * Downloads and extracts an addon from a given URL to a specified path. + * + * Extracts into a sibling temp dir and renames it into place last, so a + * concurrent launch (another process, which the chain cannot see) never finds + * a manifest.json in a directory whose other files are still being written. */ export async function downloadAndExtract( url: string, @@ -62,7 +72,24 @@ export async function downloadAndExtract( name: string, ): Promise { const buffer = await webdl(url, `Downloading addon (${name})`, false); - unzip(buffer, extractPath, `Extracting addon (${name})`, false); + const tmpDir = fs.mkdtempSync( + path.join(path.dirname(extractPath), `.${name}.tmp-`), + ); + try { + unzip(buffer, tmpDir, `Extracting addon (${name})`, false); + try { + fs.renameSync(tmpDir, extractPath); + } catch { + // The target is not empty (or exists at all, on Windows). A complete + // copy came from another process and may be loading in its browser, + // so keep it; only an incomplete one is replaced. + if (fs.existsSync(path.join(extractPath, "manifest.json"))) return; + fs.rmSync(extractPath, { recursive: true }); + fs.renameSync(tmpDir, extractPath); + } + } finally { + fs.rmSync(tmpDir, { recursive: true, force: true }); + } } /** @@ -102,8 +129,11 @@ export async function maybeDownloadAddons( await addonsDeps.downloadAndExtract(url, addonPath, addonName); addonsList?.push(addonPath); } catch (e) { - // Drop the partial directory so the next run re-downloads. - fs.rmSync(addonPath, { recursive: true, force: true }); + // Drop the partial directory so the next run re-downloads. A complete + // one came from another process and may be loading in its browser. + if (!fs.existsSync(path.join(addonPath, "manifest.json"))) { + fs.rmSync(addonPath, { recursive: true, force: true }); + } console.log(`Failed to download and extract ${addonName}: ${e}`); } } diff --git a/typescript/src/exceptions.ts b/typescript/src/exceptions.ts index cee5c553..dabc77e2 100644 --- a/typescript/src/exceptions.ts +++ b/typescript/src/exceptions.ts @@ -175,6 +175,64 @@ export class VirtualDisplayNotSupported extends VirtualDisplayError { } } +export class GpuDisplayError extends VirtualDisplayError { + constructor(message?: string) { + super(message ?? "The headless='virtual-gpu' display cannot be used."); + this.name = "GpuDisplayError"; + } +} + +export class NoGpuFound extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "No GPU render node with a PCI address was found."); + this.name = "NoGpuFound"; + } +} + +export class AmbiguousGpuSelection extends GpuDisplayError { + constructor(message?: string) { + super( + message ?? "Several GPUs match, or several exist and none was named.", + ); + this.name = "AmbiguousGpuSelection"; + } +} + +export class GpuNotFound extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "The GPU selector matches no GPU."); + this.name = "GpuNotFound"; + } +} + +export class CannotFindXorg extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "Xorg cannot be found."); + this.name = "CannotFindXorg"; + } +} + +export class CannotExecuteXorg extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "Xorg cannot be started, or exited right after starting."); + this.name = "CannotExecuteXorg"; + } +} + +export class GpuVtTakeover extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "The Xorg server switched the active console VT."); + this.name = "GpuVtTakeover"; + } +} + +export class GpuSoftwareFallback extends GpuDisplayError { + constructor(message?: string) { + super(message ?? "The browser on a GPU display never rendered on the GPU."); + this.name = "GpuSoftwareFallback"; + } +} + export class CamoufoxNotInstalled extends FileNotFoundError { constructor(message?: string) { super(message ?? "Camoufox is not installed."); diff --git a/typescript/src/gpudisplay.ts b/typescript/src/gpudisplay.ts new file mode 100644 index 00000000..9ff16e71 --- /dev/null +++ b/typescript/src/gpudisplay.ts @@ -0,0 +1,793 @@ +/** + * headless="virtual-gpu": a headless Xorg server pinned to one GPU. + * + * TypeScript twin of python/src/camoufox/gpudisplay.py. + * + * Xvfb has no GPU path, so a browser on it renders WebGL and canvas with + * Mesa's software rasterizer. This display is a real Xorg server bound to one + * card by its PCI address, drawing a virtual screen with no monitor attached, + * so the browser renders on that card. The card is always named, never + * guessed: the identity claims the GPU that renders, and two cards render + * differently. + */ +import { execFileSync } from "node:child_process"; +import * as fs from "node:fs"; +import * as net from "node:net"; +import * as os from "node:os"; +import * as path from "node:path"; +import { + AmbiguousGpuSelection, + CannotExecuteXorg, + CannotFindXorg, + GpuNotFound, + GpuSoftwareFallback, + GpuVtTakeover, + NoGpuFound, +} from "./exceptions.js"; +import { VirtualDisplay } from "./virtdisplay.js"; +import { LeakWarning } from "./warnings.js"; + +/** Names the card when the `gpu` launch option is not given. */ +export const GPU_ENV_VAR = "CAMOUFOX_GPU"; + +/** + * How long the browser has to render on the GPU after the probe page starts + * drawing. A card busy with other work took 5-10s in Holo's measurements. + */ +export const GPU_WAIT_S = 30; +export const GPU_WAIT_ENV_VAR = "CAMOUFOX_GPU_WAIT_S"; + +/** + * The root window is not observable (screen.* is spoofed per context), but + * the GPU compositor needs a real surface, so it is not 1x1 like Xvfb's. + */ +export const GPU_SCREEN = "1920x1080x24"; + +/** Where Xorg looks up a relative -config when the setuid wrapper elevates it. */ +export const SYSTEM_CONFIG_DIR = "/etc/X11"; + +// Without root, Xorg.wrap must let any user start Xorg (a launch from ssh, +// systemd or a container is not a console login) and keep it root, which a +// server with no VT of its own needs to open the card. Stock Debian and Ubuntu +// ship allowed_users=console and needs_root_rights=auto. +export const XWRAPPER_CONFIG = "/etc/X11/Xwrapper.config"; +export const XWRAPPER_SETTINGS: Readonly> = { + allowed_users: "anybody", + needs_root_rights: "yes", +}; +export const XORG_WRAPPERS = [ + "/usr/lib/xorg/Xorg.wrap", + "/usr/libexec/Xorg.wrap", +] as const; + +/** + * -terminate: the server exits this many seconds after its last client leaves. + * -sharevts: never take a VT of its own, which blanks a live desktop. + */ +export const SERVER_FLAGS = [ + "-terminate", + "2", + "-nolisten", + "tcp", + "-sharevts", + "-novtswitch", +] as const; + +/** + * Firefox's GPU paths, on by default for this display only; the caller's prefs + * win. webgl.force-enabled is set by every launch already. Forcing the + * accelerated canvas made 2D canvas match Windows Firefox on the same card. + */ +export const GPU_PREFS: Record = { + "gfx.webrender.all": true, + "layers.acceleration.force-enabled": true, + "gfx.x11-egl.enabled": true, + "gfx.canvas.accelerated": true, + "gfx.canvas.accelerated.force-enabled": true, +}; + +/** + * Draws one WebGL frame per animation frame: Firefox opens the GPU only when + * something renders. + */ +export const PROBE_PAGE = + "data:text/html,"; + +const ACTIVE_VT = "/sys/class/tty/tty0/active"; +/** + * A crash right after startup (a driver fault under VRAM pressure) and a VT + * switch both land just after the display is reported. + */ +const SETTLE_MS = 1000; + +/** An X11 connection setup request: little-endian, protocol 11.0, no auth. */ +const X11_SETUP = Buffer.from([0x6c, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0]); + +const VENDORS: Record = { + "0x10de": "NVIDIA", + "0x1002": "AMD", + "0x8086": "Intel", +}; + +const PCI_ADDRESS = /^[0-9a-f]{4}:[0-9a-f]{2}:[0-9a-f]{2}\.[0-9a-f]$/; + +/** A GPU with a DRM render node, as sysfs describes it. */ +export interface GpuDevice { + pciAddress: string; + renderNode: string; + cardNode: string | null; + vendorId: string; + deviceId: string; + kernelDriver: string; + /** /dev/nvidia for the NVIDIA driver, which renders through it. */ + nvidiaNode: string | null; +} + +export function gpuVendor(gpu: GpuDevice): string { + return VENDORS[gpu.vendorId] ?? gpu.vendorId; +} + +/** Xorg's BusID: decimal bus:device:function, without the domain. */ +export function busId(gpu: GpuDevice): string { + const [, bus, devFn] = gpu.pciAddress.split(":"); + const [dev, fn] = devFn.split("."); + return `PCI:${Number.parseInt(bus, 16)}:${Number.parseInt(dev, 16)}:${Number.parseInt(fn, 16)}`; +} + +/** modesetting drives any KMS device with glamor; NVIDIA needs its own. */ +export function xorgDriver(gpu: GpuDevice): string { + return gpu.kernelDriver === "nvidia" ? "nvidia" : "modesetting"; +} + +/** Whether a DRM file's usage stats (its fdinfo) show time on a GPU engine. */ +/** + * Whether a DRM file's usage stats (its fdinfo) show work on a GPU engine. + * + * Drivers report busy time (drm-engine-: ns; amdgpu, i915) or busy + * cycles (drm-cycles-: ; xe reports only these). drm-total-cycles + * counts the GPU's clock whether this client used it or not, so it is not work. + */ +export function drewOnGpu(fdinfo: string): boolean { + return [ + ...fdinfo.matchAll( + /^drm-(?:engine-[\w-]+:\s*(\d+) ns|cycles-[\w-]+:\s*(\d+))$/gm, + ), + ].some((match) => Number(match[1] ?? match[2]) > 0); +} + +/** + * The card's render node and its primary node. Firefox's GPU work is accounted + * to whichever it was handed: a second launch from one process on an RX 7900 + * XTX drew through /dev/dri/card0, not renderD128. + */ +export function drmNodes(gpu: GpuDevice): string[] { + return [gpu.renderNode, gpu.cardNode].filter((node): node is string => + Boolean(node), + ); +} + +export function describeGpu(gpu: GpuDevice): string { + return `${gpu.pciAddress} ${gpuVendor(gpu)} [${gpu.vendorId}:${gpu.deviceId}] driver=${gpu.kernelDriver} ${gpu.renderNode}`; +} + +function read(file: string): string { + try { + return fs.readFileSync(file, "utf-8").trim(); + } catch { + return ""; + } +} + +function realpath(file: string): string | null { + try { + return fs.realpathSync(file); + } catch { + return null; + } +} + +function list(dir: string): string[] { + try { + return fs.readdirSync(dir); + } catch { + return []; + } +} + +function nvidiaNode(root: string, pciAddress: string): string | null { + const info = read( + path.join(root, "proc/driver/nvidia/gpus", pciAddress, "information"), + ); + const match = /^Device Minor:\s*(\d+)/m.exec(info); + return match ? `/dev/nvidia${match[1]}` : null; +} + +/** + * The GPUs with a render node and a PCI address, in PCI address order. + * + * Ordered by PCI address, not render node number: render nodes are numbered in + * the order the drivers loaded, which can change from one boot to the next. + */ +export function enumerateGpus(root = "/"): GpuDevice[] { + const drm = path.join(root, "sys/class/drm"); + const cards = new Map(); + for (const card of list(drm)) { + if (!/^card\d+$/.test(card)) continue; + const real = realpath(path.join(drm, card, "device")); + if (real) cards.set(real, `/dev/dri/${card}`); + } + + const gpus: GpuDevice[] = []; + for (const node of list(path.join(root, "dev/dri"))) { + if (!node.startsWith("renderD")) continue; + const device = path.join(drm, node, "device"); + const real = realpath(device); + if (!real || !PCI_ADDRESS.test(path.basename(real))) continue; + const pciAddress = path.basename(real); + const uevent = Object.fromEntries( + read(path.join(device, "uevent")) + .split("\n") + .filter((line) => line.includes("=")) + .map((line) => [ + line.slice(0, line.indexOf("=")), + line.slice(line.indexOf("=") + 1), + ]), + ); + const kernelDriver = uevent.DRIVER ?? ""; + gpus.push({ + pciAddress, + renderNode: `/dev/dri/${node}`, + cardNode: cards.get(real) ?? null, + vendorId: read(path.join(device, "vendor")).toLowerCase(), + deviceId: read(path.join(device, "device")).toLowerCase(), + kernelDriver, + nvidiaNode: + kernelDriver === "nvidia" ? nvidiaNode(root, pciAddress) : null, + }); + } + return gpus.sort((a, b) => + a.pciAddress < b.pciAddress ? -1 : a.pciAddress > b.pciAddress ? 1 : 0, + ); +} + +function matches(index: number, gpu: GpuDevice, selector: string): boolean { + if (/^\d+$/.test(selector)) return Number(selector) === index; + const ids = `${gpu.vendorId}:${gpu.deviceId}`.replaceAll("0x", ""); + const names = [gpu.renderNode, gpuVendor(gpu), ids]; + if (gpu.cardNode) names.push(gpu.cardNode); + const wanted = selector.replaceAll("0x", ""); + return ( + names.some( + (name) => + name.toLowerCase() === wanted || + path.basename(name).toLowerCase() === wanted, + ) || gpu.pciAddress.includes(selector) + ); +} + +function listing(gpus: GpuDevice[], shown?: GpuDevice[]): string { + return gpus + .map((gpu, i) => + !shown || shown.includes(gpu) ? ` [${i}] ${describeGpu(gpu)}` : null, + ) + .filter((line) => line !== null) + .join("\n"); +} + +/** + * The one GPU `selector` (or CAMOUFOX_GPU) names. + * + * A selector is an index into enumerateGpus(), a render or card node (name or + * /dev/dri path), a PCI address or part of one, vendor:device ids, or a vendor + * name. Without one, the host must have exactly one GPU. + */ +export function selectGpu( + selector?: string | number | null, + gpus: GpuDevice[] = enumerateGpus(), +): GpuDevice { + if (!gpus.length) { + throw new NoGpuFound( + "virtual-gpu: no GPU render node with a PCI address. Is a GPU present, is its driver " + + "loaded, and are /dev/dri and /sys visible (--device /dev/dri in a container)?", + ); + } + const wanted = String(selector ?? process.env[GPU_ENV_VAR] ?? "") + .trim() + .toLowerCase(); + if (!wanted) { + if (gpus.length === 1) return gpus[0]; + throw new AmbiguousGpuSelection( + `virtual-gpu: ${gpus.length} GPUs found. Name one with gpu= or ${GPU_ENV_VAR}, ` + + `preferably by PCI address:\n${listing(gpus)}`, + ); + } + const matched = gpus.filter((gpu, i) => matches(i, gpu, wanted)); + if (!matched.length) { + throw new GpuNotFound( + `virtual-gpu: no GPU matches '${wanted}'. Available:\n${listing(gpus)}`, + ); + } + if (matched.length > 1) { + throw new AmbiguousGpuSelection( + `virtual-gpu: '${wanted}' matches ${matched.length} GPUs:\n${listing(gpus, matched)}`, + ); + } + return matched[0]; +} + +/** + * An xorg.conf that drives `gpu` with a virtual screen and no outputs. + * + * `UseDisplayDevice "None"` keeps the NVIDIA driver off every connector, so it + * needs no DRM master and coexists with a desktop on the same card. + */ +export function xorgConfig(gpu: GpuDevice, screen = GPU_SCREEN): string { + const [width, height, depth] = screen.split("x"); + const driver = xorgDriver(gpu); + const offscreen = + driver === "nvidia" ? '\tOption "UseDisplayDevice" "None"\n' : ""; + return `# Generated by camoufox for headless="virtual-gpu". +# GPU: ${gpu.pciAddress} ${gpuVendor(gpu)} [${gpu.vendorId}:${gpu.deviceId}] driver=${gpu.kernelDriver} +Section "ServerFlags" +\tOption "AutoAddDevices" "false" +\tOption "AutoAddGPU" "false" +\tOption "DontVTSwitch" "true" +\tOption "AllowMouseOpenFail" "true" +EndSection + +Section "Device" +\tIdentifier "camoufox-gpu" +\tDriver "${driver}" +\tBusID "${busId(gpu)}" +${offscreen}\tOption "AllowEmptyInitialConfiguration" "true" +EndSection + +Section "Monitor" +\tIdentifier "camoufox-monitor" +\tHorizSync 5.0 - 1000.0 +\tVertRefresh 5.0 - 200.0 +EndSection + +Section "Screen" +\tIdentifier "camoufox-screen" +\tDevice "camoufox-gpu" +\tMonitor "camoufox-monitor" +\tDefaultDepth ${depth} +\tSubSection "Display" +\t\tDepth ${depth} +\t\tVirtual ${width} ${height} +\tEndSubSection +EndSection + +Section "ServerLayout" +\tIdentifier "camoufox-layout" +\tScreen "camoufox-screen" +EndSection +`; +} + +/** The config's file name in /etc/X11, keyed by PCI address. */ +export function configName(gpu: GpuDevice): string { + return `camoufox-gpu-${gpu.pciAddress.replace(/[:.]/g, "_")}.conf`; +} + +/** The one command that sets this machine up for `gpu`. */ +export function setupCommand(gpu: GpuDevice): string { + const sudo = process.getuid?.() === 0 ? "" : "sudo "; + return `npx camoufox gpu-setup ${gpu.pciAddress} | ${sudo}sh`; +} + +/** + * A root shell script that sets this machine up for headless="virtual-gpu" on + * `gpu`: Xorg and its setuid wrapper, the wrapper's settings, and the card's + * config. Safe to run again. + */ +export function setupScript(gpu: GpuDevice): string { + const config = path.join(GpuDisplay.configDir, configName(gpu)); + const xwrapper = GpuDisplay.xwrapperConfig; + const settings = Object.entries(XWRAPPER_SETTINGS) + .map(([key, value]) => `${key}=${value}\\n`) + .join(""); + const deletes = Object.keys(XWRAPPER_SETTINGS) + .map((key) => `-e '/^[[:space:]]*${key}[[:space:]]*=/d'`) + .join(" "); + const nvidia = + xorgDriver(gpu) === "nvidia" + ? "\n" + + "if ! find /usr/lib /usr/lib64 -name nvidia_drv.so 2>/dev/null | grep -q .; then\n" + + "\techo 'camoufox gpu-setup: no nvidia_drv.so found. Install the NVIDIA driver'\\''s Xorg " + + "module, matching the kernel driver (on Ubuntu, xserver-xorg-video-nvidia-).' >&2\n" + + "fi\n" + : ""; + return `#!/bin/sh +# Generated by camoufox gpu-setup for headless="virtual-gpu". +# GPU: ${describeGpu(gpu)} +# Run once as root: ${setupCommand(gpu)} +set -e +if [ "$(id -u)" -ne 0 ]; then +\techo 'camoufox gpu-setup: run this as root (pipe it to sudo sh).' >&2 +\texit 1 +fi + +# 1. The Xorg server and its setuid wrapper, Xorg.wrap. +if command -v apt-get >/dev/null 2>&1; then +\tdpkg -s xserver-xorg-core xserver-xorg-legacy >/dev/null 2>&1 \\ +\t\t|| DEBIAN_FRONTEND=noninteractive apt-get install -y xserver-xorg-core xserver-xorg-legacy +elif ! command -v Xorg >/dev/null 2>&1; then +\techo 'camoufox gpu-setup: install the Xorg server and its setuid wrapper (Xorg.wrap), then run this again.' >&2 +\texit 1 +fi +${nvidia} +# 2. Let Xorg.wrap start Xorg as root for any user. A launch from ssh, systemd +# or a container is not a console login. Any local user can then start a +# root X server. +touch ${xwrapper} +sed -i ${deletes} ${xwrapper} +printf '${settings}' >> ${xwrapper} + +# 3. The card's config, bound by PCI address. +cat > ${config} <<'CAMOUFOX_XORG_CONF' +${xorgConfig(gpu)}CAMOUFOX_XORG_CONF + +echo 'headless="virtual-gpu" is set up for ${gpu.pciAddress}.' +`; +} + +/** What keeps Xorg.wrap from starting Xorg for this user, if anything. */ +export function setupProblems(): string[] { + const problems: string[] = []; + const wrappers = GpuDisplay.xorgWrappers; + if (!wrappers.some((wrapper) => fs.existsSync(wrapper))) { + problems.push(`no setuid Xorg.wrap (${wrappers.join(" or ")})`); + } + const xwrapper = GpuDisplay.xwrapperConfig; + const settings = new Map(); + for (const line of read(xwrapper).split("\n")) { + const at = line.indexOf("="); + if (at >= 0) + settings.set(line.slice(0, at).trim(), line.slice(at + 1).trim()); + } + for (const [key, wanted] of Object.entries(XWRAPPER_SETTINGS)) { + const have = settings.get(key) || "unset"; + if (have !== wanted) + problems.push(`${xwrapper} has ${key}=${have}, needs ${key}=${wanted}`); + } + return problems; +} + +/** The logind session on VT `vt`, which its user may activate without root. */ +function sessionOnVt(vt: string): string | null { + let sessions: string; + try { + sessions = execFileSync("loginctl", ["list-sessions", "--no-legend"], { + encoding: "utf-8", + }); + } catch { + return null; + } + for (const line of sessions.split("\n")) { + const session = line.trim().split(/\s+/)[0]; + if (!session) continue; + try { + const number = execFileSync( + "loginctl", + ["show-session", session, "-p", "VTNr", "--value"], + { encoding: "utf-8" }, + ).trim(); + if (number === vt) return session; + } catch {} + } + return null; +} + +function run(command: string, args: string[]): void { + try { + execFileSync(command, args, { stdio: "ignore" }); + } catch {} +} + +const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms)); + +/** + * A headless Xorg server on one GPU, for headless="virtual-gpu". + * + * As root, Xorg takes a temporary config and log. Otherwise it runs through + * the setuid Xorg.wrap, which accepts only a config name relative to /etc/X11 + * and no -logfile, so the config is installed there once. + */ +export class GpuDisplay extends VirtualDisplay { + /** Where the config is installed for the setuid wrapper. */ + static configDir = SYSTEM_CONFIG_DIR; + /** Xorg.wrap's settings. */ + static xwrapperConfig = XWRAPPER_CONFIG; + /** Where the setuid wrapper may be installed. */ + static xorgWrappers: readonly string[] = XORG_WRAPPERS; + gpu: GpuDevice; + requireGpu: boolean; + private client: net.Socket | null = null; + private tempFiles: string[] = []; + private vt: string | null = null; + private vtTaken = false; + + constructor(gpu: GpuDevice, debug = false, requireGpu = true) { + super(debug, GPU_SCREEN); + this.serverName = "Xorg"; + this.gpu = gpu; + this.requireGpu = requireGpu; + } + + get xorgPath(): string { + try { + return execFileSync("which", ["Xorg"], { + encoding: "utf-8", + stdio: ["ignore", "pipe", "ignore"], + }).trim(); + } catch { + throw new CannotFindXorg( + 'headless="virtual-gpu" needs the Xorg server. Set this machine up with:\n' + + ` ${setupCommand(this.gpu)}`, + ); + } + } + + /** A failed start, with what the machine is missing when that is why. */ + protected error(message: string): Error { + if (process.getuid?.() !== 0) { + const problems = setupProblems(); + if (problems.length) { + message += + '\nheadless="virtual-gpu" without root needs Xorg.wrap to start Xorg as root:\n' + + problems.map((problem) => ` - ${problem}\n`).join("") + + `Set this machine up with:\n ${setupCommand(this.gpu)}`; + } + } + return new CannotExecuteXorg(message); + } + + // No parent-death signal: the setuid Xorg.wrap drops it on exec. The held + // client and -terminate end the server instead (ready()). + protected wrapper(): string[] { + return []; + } + + protected command(): string[] { + let files: string[]; + if (process.getuid?.() === 0) { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), "camoufox-xorg-")); + const config = path.join(dir, "xorg.conf"); + fs.writeFileSync(config, xorgConfig(this.gpu, this.screen), { + mode: 0o600, + }); + const log = path.join(dir, "xorg.log"); + this.tempFiles = [dir, log]; + files = ["-config", config, "-logfile", log]; + } else { + const name = configName(this.gpu); + const installed = path.join(GpuDisplay.configDir, name); + if (!fs.existsSync(installed)) { + throw new CannotExecuteXorg( + `headless="virtual-gpu" without root needs ${installed}. ` + + `Set this machine up with:\n ${setupCommand(this.gpu)}`, + ); + } + files = ["-config", name]; + } + return [this.xorgPath, ...files, ...SERVER_FLAGS]; + } + + protected serverEnv(): NodeJS.ProcessEnv { + return process.env; + } + + private get log(): string { + return this.tempFiles[1] ?? `/var/log/Xorg.${this._display}.log`; + } + + async get(): Promise { + this.vt = read(ACTIVE_VT) || null; + this.vtTaken = false; + const vt = this.vt; + const guard = vt + ? setInterval(() => { + if (read(ACTIVE_VT) !== vt) this.vtTaken = true; + }, 100) + : null; + try { + const display = await super.get(); + if (this.vtTaken) this.failVt(); + return display; + } finally { + if (guard) clearInterval(guard); + } + } + + protected async ready(): Promise { + const deadline = Date.now() + SETTLE_MS; + while (Date.now() < deadline) { + if (this.vtTaken) this.failVt(); + const proc = this.proc; + if (proc && (proc.exitCode !== null || proc.signalCode !== null)) { + const error = this.error( + `Xorg exited (${proc.exitCode ?? proc.signalCode}) right after starting. See ${this.log}.`, + ); + this.kill(); + throw error; + } + await sleep(100); + } + // The server exits at its last client's disconnect (-terminate), and a + // server no client ever reached never does. Holding one client from here + // on means it always has a last client: this one, closed by kill() or by + // the kernel when this process dies. An unprivileged launcher may not be + // able to signal a root Xorg, so this is the teardown that always works. + const client = net.connect({ path: `/tmp/.X11-unix/X${this._display}` }); + try { + await new Promise((resolve, reject) => { + client.once("connect", resolve); + client.once("error", reject); + }); + } catch (error) { + this.kill(); + throw this.error( + `Could not connect to the Xorg display it reported: ${error}`, + ); + } + client.on("error", () => {}); + client.write(X11_SETUP); + // Never keeps the launcher's event loop alive. + client.unref(); + this.client = client; + } + + private failVt(): never { + const vt = this.vt ?? ""; + const number = vt.replace(/^tty/, ""); + const session = sessionOnVt(number); + if (session) run("loginctl", ["activate", session]); + if (read(ACTIVE_VT) !== vt) run("chvt", [number]); + const restored = read(ACTIVE_VT) === vt; + this.kill(); + throw new GpuVtTakeover( + `Xorg on ${describeGpu(this.gpu)} switched the active VT away from ${vt}. ` + + (restored + ? "It was switched back." + : `Switch back with \`sudo chvt ${number}\`.`), + ); + } + + /** Every process started with DISPLAY set to this display, except Xorg and us. */ + private displayProcesses(): number[] { + const needle = `\0DISPLAY=:${this._display}\0`; + const skip = new Set([process.pid, this.proc?.pid]); + const pids: number[] = []; + for (const entry of list("/proc")) { + if (!/^\d+$/.test(entry) || skip.has(Number(entry))) continue; + try { + const environ = fs.readFileSync(`/proc/${entry}/environ`, "latin1"); + if (`\0${environ}`.includes(needle)) pids.push(Number(entry)); + } catch {} + } + return pids; + } + + /** + * Whether a process on this display renders on the GPU. + * + * Firefox opens the card's DRM nodes for DMABuf even when it renders in + * software, so an open render node proves nothing. Rendering is the NVIDIA + * driver's /dev/nvidia held open, or work the kernel accounted to a + * GPU engine on one of the card's DRM nodes. + */ + usesGpu(): boolean { + const nodes = drmNodes(this.gpu); + for (const pid of this.displayProcesses()) { + for (const fd of list(`/proc/${pid}/fd`)) { + try { + const target = fs.readlinkSync(`/proc/${pid}/fd/${fd}`); + if ( + target === this.gpu.nvidiaNode || + (nodes.includes(target) && + drewOnGpu(fs.readFileSync(`/proc/${pid}/fdinfo/${fd}`, "utf-8"))) + ) + return true; + } catch {} + } + } + return false; + } + + async waitForGpu(): Promise { + const waitS = Number(process.env[GPU_WAIT_ENV_VAR]) || GPU_WAIT_S; + const deadline = Date.now() + waitS * 1000; + while (Date.now() < deadline) { + if (this.usesGpu()) return true; + await sleep(250); + } + return false; + } + + /** Throw, or warn with require_gpu: false, when the browser did not use the GPU. */ + checkGpu(active: boolean): void { + if (active) return; + if (!this.requireGpu) { + LeakWarning.warn("gpu_software_rendering"); + return; + } + throw new GpuSoftwareFallback( + `The browser on :${this._display} never rendered on ${describeGpu(this.gpu)}, so it renders ` + + "in software. Firefox may have blocklisted the driver or failed to create a GPU " + + `context. See ${this.log}.`, + ); + } + + kill(): void { + this.client?.destroy(); + this.client = null; + if (this._display !== null) { + // The browser's helpers (dbus, at-spi) are not in its process group. + for (const signal of ["SIGTERM", "SIGKILL"] as const) { + for (const pid of this.displayProcesses()) { + try { + process.kill(pid, signal); + } catch {} + } + const deadline = Date.now() + 1500; + while (this.displayProcesses().length && Date.now() < deadline) { + Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 50); + } + } + } + // SIGTERM lets Xorg remove its root-owned socket, which this process + // cannot; the base kill() SIGKILLs only a server still running after that. + const proc = this.proc; + if (proc && proc.exitCode === null && proc.signalCode === null) { + try { + proc.kill("SIGTERM"); + } catch {} + const deadline = Date.now() + 10_000; + while (!exited(proc.pid) && Date.now() < deadline) { + Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 50); + } + } + super.kill(); + if (this.tempFiles.length) { + fs.rmSync(this.tempFiles[0], { recursive: true, force: true }); + this.tempFiles = []; + } + this._display = null; + } +} + +/** Whether `pid` has exited (a zombie counts: it renders nothing). */ +function exited(pid: number | undefined): boolean { + if (!pid) return true; + const stat = read(`/proc/${pid}/stat`); + return !stat || / Z /.test(stat.slice(stat.lastIndexOf(")"))); +} + +/** Something that opens pages: a Browser or a BrowserContext. */ +interface PageOpener { + newPage(): Promise<{ + goto(url: string): Promise; + close(): Promise; + }>; +} + +/** Draw in a page of `target` and check the browser rendered on the GPU. */ +export async function proveGpu( + target: PageOpener, + display: GpuDisplay, +): Promise { + const page = await target.newPage(); + let active: boolean; + try { + await page.goto(PROBE_PAGE); + active = await display.waitForGpu(); + } finally { + await page.close(); + } + display.checkGpu(active); +} diff --git a/typescript/src/host_rendering.ts b/typescript/src/host_rendering.ts index f73ef3c4..22749e41 100644 --- a/typescript/src/host_rendering.ts +++ b/typescript/src/host_rendering.ts @@ -14,6 +14,7 @@ */ import { firefox } from "playwright-core"; import { isSoftwareRenderer } from "./fingerprints.js"; +import { GPU_PREFS } from "./gpudisplay.js"; export const BASELINE_OVERRIDES_PREF = "privacy.baselineFingerprintingProtection.overrides"; @@ -95,22 +96,32 @@ const probes = new Map>(); * The [vendor, renderer] this machine's Firefox reports, or null without WebGL. * * Read from the binary about to launch, with no identity applied, under the - * same display: headless, Xvfb and a real display can each render on a - * different device. The strings are the ones Firefox sanitizes itself. + * same display and the same rendering prefs: headless, Xvfb, a GPU display and + * a real display can each render on a different device. The strings are the + * ones Firefox sanitizes itself. */ export function hostGpu( executablePath: string, headless: boolean, env: Record, + prefs: Record, ): Promise { const hostEnv = Object.entries(env) .filter(([key]) => !LAUNCHER_ENV.some((prefix) => key.startsWith(prefix))) .map(([key, value]) => [key, String(value)]) .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)); - const key = JSON.stringify([executablePath, headless, hostEnv]); + const hostPrefs = Object.keys(GPU_PREFS) + .filter((key) => key in prefs) + .map((key) => [key, prefs[key]]); + const key = JSON.stringify([executablePath, headless, hostEnv, hostPrefs]); let gpu = probes.get(key); if (!gpu) { - gpu = readGpu(executablePath, headless, Object.fromEntries(hostEnv)); + gpu = readGpu( + executablePath, + headless, + Object.fromEntries(hostEnv), + Object.fromEntries(hostPrefs), + ); // Remember a reading, not a failure: the next launch tries again. gpu.catch(() => probes.delete(key)); probes.set(key, gpu); @@ -122,13 +133,14 @@ async function readGpu( executablePath: string, headless: boolean, env: Record, + prefs: Record, ): Promise { const browser = await firefox.launch({ executablePath, headless, env, // The launch forces WebGL on, which can choose another device. - firefoxUserPrefs: { "webgl.force-enabled": true }, + firefoxUserPrefs: { ...prefs, "webgl.force-enabled": true }, }); try { const page = await browser.newPage(); diff --git a/typescript/src/ip.ts b/typescript/src/ip.ts index 5c7e723b..8501ad8d 100644 --- a/typescript/src/ip.ts +++ b/typescript/src/ip.ts @@ -83,6 +83,12 @@ export function validateIP(ip: string): void { const IMPIT_CACHE_MAX = 8; const impitCache = new Map(); +// Probing the exit IP through a proxy adds a hop and a TLS handshake behind it; +// 5 s is not enough for a proxy that routes the long way round, and every URL +// timing out fails the whole launch. Direct probes keep 5 s. +export const DIRECT_IP_TIMEOUT_MS = 5000; +export const PROXIED_IP_TIMEOUT_MS = 15000; + function getImpit(proxy?: string): Impit { const key = proxy ?? ""; const cached = impitCache.get(key); @@ -95,7 +101,7 @@ function getImpit(proxy?: string): Impit { // is what geoip trusts for the whole identity, so a MITM must not pick it. const impit = new Impit({ proxyUrl: proxy, - timeout: 5000, + timeout: proxy ? PROXIED_IP_TIMEOUT_MS : DIRECT_IP_TIMEOUT_MS, ignoreTlsErrors: false, }); impitCache.set(key, impit); diff --git a/typescript/src/server.ts b/typescript/src/server.ts index 776da164..29b7fbf2 100644 --- a/typescript/src/server.ts +++ b/typescript/src/server.ts @@ -10,18 +10,26 @@ */ import { type BrowserServer, firefox } from "playwright-core"; import { withUnpinnedLaunch } from "./cpu_affinity.js"; +import { GpuDisplay, proveGpu } from "./gpudisplay.js"; import { camelCase } from "./sync_api.js"; -import { type LaunchOptions, launchOptions } from "./utils.js"; -import { VirtualDisplay } from "./virtdisplay.js"; +import { + type GpuDisplayOptions, + type Headless, + type LaunchOptions, + launchOptions, + startVirtualDisplay, +} from "./utils.js"; -export interface LaunchServerOptions extends Omit { +export interface LaunchServerOptions + extends Omit, + GpuDisplayOptions { /** Port to listen on. Defaults to a random free port. */ port?: number; /** Path of the websocket endpoint. Defaults to a random path. */ ws_path?: string; - /** Whether to run the browser headless. `"virtual"` spawns an Xvfb display - * (a TS extension: Python's launch_server passes headless through). */ - headless?: boolean | "virtual"; + /** Whether to run the browser headless. `"virtual"` spawns an Xvfb display, + * `"virtual-gpu"` a headless Xorg server bound to one GPU. */ + headless?: Headless; } /** @@ -62,15 +70,11 @@ export async function launchServer({ delete options[unsupported]; } - let virtualDisplay: VirtualDisplay | null = null; - let headlessBool: boolean | undefined; - if (headless === "virtual") { - virtualDisplay = new VirtualDisplay(options.debug ?? false); - options.virtual_display = await virtualDisplay.get(); - headlessBool = false; - } else { - headlessBool = headless; - } + const [virtualDisplay, headlessBool] = await startVirtualDisplay( + headless, + options.debug, + options, + ); try { const config = await launchOptions({ ...options, headless: headlessBool }); @@ -85,6 +89,17 @@ export async function launchServer({ const display = virtualDisplay; server.on("close", () => display.kill()); } + if (virtualDisplay instanceof GpuDisplay) { + const browser = await firefox.connect(server.wsEndpoint()); + try { + await proveGpu(browser, virtualDisplay); + } catch (error) { + await server.close(); + throw error; + } finally { + await browser.close(); + } + } return server; } catch (error) { diff --git a/typescript/src/sync_api.ts b/typescript/src/sync_api.ts index a33e320a..19f31552 100644 --- a/typescript/src/sync_api.ts +++ b/typescript/src/sync_api.ts @@ -27,20 +27,26 @@ import { attachVirtualDisplay, contextIdentity, driverPid, + type GpuDisplayOptions, + type Headless, hostIdentity, type LaunchOptions, launchOptions, pinnedCoreCount, STOCK_MEDIA_DEFAULTS, spoofsWindowDimensions, + startVirtualDisplay, } from "./utils.js"; -import { VirtualDisplay } from "./virtdisplay.js"; +import type { VirtualDisplay } from "./virtdisplay.js"; -export type Headless = boolean | "virtual"; +export type { Headless } from "./utils.js"; -export interface NewBrowserOptions extends Omit { +export interface NewBrowserOptions + extends Omit, + GpuDisplayOptions { /** Whether to run the browser headless. On Linux, `"virtual"` runs a real - * (non-headless) browser on an Xvfb display instead. */ + * (non-headless) browser on an Xvfb display instead, and `"virtual-gpu"` + * on a headless Xorg server bound to one GPU. */ headless?: Headless; /** A set of launch options generated by `launchOptions()` to use as-is. */ from_options?: Record; @@ -90,15 +96,11 @@ export async function NewBrowser( ...kwargs }: NewBrowserOptions = {}, ): Promise { - let virtualDisplay: VirtualDisplay | null = null; - let headlessBool: boolean | undefined; - if (headless === "virtual") { - virtualDisplay = new VirtualDisplay(debug ?? false); - kwargs.virtual_display = await virtualDisplay.get(); - headlessBool = false; - } else { - headlessBool = headless; - } + const [virtualDisplay, headlessBool] = await startVirtualDisplay( + headless, + debug, + kwargs, + ); let fromOptions = from_options; // Options the caller built leave its contexts to the caller @@ -119,7 +121,7 @@ export async function NewBrowser( }); } } catch (error) { - // A failed launch must not leave the Xvfb process behind. + // A failed launch must not leave the display behind. virtualDisplay?.kill(); throw error; } diff --git a/typescript/src/utils.ts b/typescript/src/utils.ts index c9f53e35..ef090f9e 100644 --- a/typescript/src/utils.ts +++ b/typescript/src/utils.ts @@ -44,6 +44,7 @@ import { WINDOWS_11_MARKER_FONTS, } from "./fingerprints.js"; import { geoipAllowed, getGeolocation } from "./geolocation.js"; +import { GPU_PREFS, GpuDisplay, proveGpu, selectGpu } from "./gpudisplay.js"; import { addCanvasPlaceholder, type Gpu, @@ -88,7 +89,7 @@ import { pyTypeName, ValueError, } from "./pycompat.js"; -import type { VirtualDisplay } from "./virtdisplay.js"; +import { VirtualDisplay } from "./virtdisplay.js"; import { FallbackWarning, LeakWarning, warn } from "./warnings.js"; import { firefoxGpus, sampleWebglForScreen, webglForGpu } from "./webgl.js"; @@ -229,6 +230,7 @@ export const utilsDeps = { generateRandomVoiceSubset, setMediaDevicesDefaults, hostGpu, + selectGpu, // The WebGL draws read fpgen's model, fetched on first use like Python's. firefoxGpus: async (targetOs: string) => { await ensureModel(); @@ -1086,6 +1088,7 @@ export async function hostIdentity( fromOptions.executablePath, fromOptions.headless, fromOptions.env, + prefs, ), ); return covered ? null : [hostOs, gpu]; @@ -1167,14 +1170,68 @@ export function attachNoViewportDefault(target: T): T { return target; } +/** The headless modes NewBrowser and launchServer accept. */ +export type Headless = boolean | "virtual" | "virtual-gpu"; + +/** The options of the display headless="virtual-gpu" starts. */ +export interface GpuDisplayOptions { + /** The GPU for headless="virtual-gpu": an index, a render or card node, a + * PCI address, vendor:device ids or a vendor name. Defaults to + * $CAMOUFOX_GPU, or the host's only GPU. */ + gpu?: string | number; + /** Fail the launch (the default) when the browser on the GPU display does + * not render on the GPU; false warns instead. */ + require_gpu?: boolean; +} + /** - * Attaches the virtual display to the browser's cleanup. (Python has an async - * and a sync variant; playwright-core has one API.) + * Start the display headless="virtual" or "virtual-gpu" asks for. + * + * Takes the display's own options out of `options` and points the launch at + * the display. Returns the display, or null, and the headless value to launch + * with. */ -export function attachVirtualDisplay( +export async function startVirtualDisplay( + headless: Headless | undefined, + debug: boolean | undefined, + options: LaunchOptions & GpuDisplayOptions, +): Promise<[VirtualDisplay | null, boolean | undefined]> { + const { gpu, require_gpu } = options; + delete options.gpu; + delete options.require_gpu; + let display: VirtualDisplay; + if (headless === "virtual-gpu") { + display = new GpuDisplay( + utilsDeps.selectGpu(gpu), + debug ?? false, + require_gpu !== false, + ); + options.firefox_user_prefs = { + ...GPU_PREFS, + ...options.firefox_user_prefs, + }; + } else if (gpu !== undefined || require_gpu !== undefined) { + throw new ValueError( + "gpu and require_gpu apply to headless='virtual-gpu' only", + ); + } else if (headless === "virtual") { + display = new VirtualDisplay(debug ?? false); + } else { + return [null, headless]; + } + options.virtual_display = await display.get(); + return [display, false]; +} + +/** + * Attaches the virtual display to the browser's cleanup, and on a GPU display + * checks the browser renders on the GPU. (Python has an async and a sync + * variant; playwright-core has one API.) + */ +export async function attachVirtualDisplay( browser: T, virtualDisplay?: VirtualDisplay | null, -): T { +): Promise { if (!virtualDisplay) return browser; // Skip if no virtual display is provided const target = browser as any; @@ -1194,6 +1251,14 @@ export function attachVirtualDisplay( ); target._virtualDisplay = virtualDisplay; + if (virtualDisplay instanceof GpuDisplay) { + try { + await proveGpu(target, virtualDisplay); + } catch (error) { + await target.close(); + throw error; + } + } return browser; } @@ -1887,7 +1952,8 @@ export async function launchOptions({ pyTruthy(webgl_config) || (pyTruthy(config["webGl:vendor"]) && pyTruthy(config["webGl:renderer"])), Boolean(block_webgl), - () => utilsDeps.hostGpu(resolvedExecutable, headless, env), + () => + utilsDeps.hostGpu(resolvedExecutable, headless, env, firefox_user_prefs), ); if (coverCanvas) { addCanvasPlaceholder(firefox_user_prefs); diff --git a/typescript/src/virtdisplay.ts b/typescript/src/virtdisplay.ts index 0f0e7d7c..98a686e3 100644 --- a/typescript/src/virtdisplay.ts +++ b/typescript/src/virtdisplay.ts @@ -12,8 +12,12 @@ import { } from "./exceptions.js"; import { OS_NAME } from "./paths.js"; -/** Safe timeout for Xvfb writing the display num; prevents an infinite hang. */ -const DISPLAYFD_READ_TIMEOUT_MS = 10_000; +/** + * Safe timeout for Xvfb writing the display num; prevents an infinite hang. A + * cold first Xvfb on a fresh host took 0.6-8.4 s to report, so 10 s failed + * launches that would have succeeded. + */ +const DISPLAYFD_READ_TIMEOUT_MS = 30_000; /** * Xvfb root geometry for headless="virtual". It is not observable (screen.* is @@ -52,7 +56,9 @@ export class VirtualDisplay { screen: string; composite: boolean; proc: ChildProcess | null = null; - private _display: number | null = null; + protected _display: number | null = null; + /** What get() calls the server in its errors. */ + protected serverName = "Xvfb"; constructor(debug: boolean = false, screen?: string, composite?: boolean) { this.debug = debug; @@ -125,31 +131,53 @@ export class VirtualDisplay { } } + /** The error get() raises when the server fails. */ + protected error(message: string): Error { + return new CannotExecuteXvfb(message); + } + /** - * Spawn Xvfb (if it isn't already running) and return its ":N" display. + * What execs the server. setpriv's parent-death signal stops Xvfb when this + * process dies without reaching kill(), even by SIGKILL; SIGTERM lets Xvfb + * remove its own lock and socket. See xvfb-dies-with-its-launcher in + * ci/tribal-rules.yml. + */ + protected wrapper(): string[] { + return [this.setprivPath, "--pdeathsig", "TERM"]; + } + + /** The server's argv, less -displayfd, which get() adds. */ + protected command(): string[] { + return [this.xvfbPath, ...this.xvfbArgs]; + } + + protected serverEnv(): NodeJS.ProcessEnv { + return { + ...process.env, + // Force Mesa software GLX; we don't use the GPU anyway. + __GLX_VENDOR_LIBRARY_NAME: "mesa", + LIBGL_ALWAYS_SOFTWARE: "1", + }; + } + + /** Called once the server has reported its display. */ + protected async ready(): Promise {} + + /** + * Spawn the server (if it isn't already running) and return its ":N" display. * - * Uses `-displayfd` so Xvfb itself picks a free display number atomically - * and reports it back, avoiding userspace races. Python's `pass_fds` keeps - * the fd at its parent number; Node's `stdio` array renumbers extra pipes - * from 3 upward, so we hand Xvfb fd 3 and read the pipe at index 3. + * Uses `-displayfd` so the server itself picks a free display number + * atomically and reports it back, avoiding userspace races. Python's + * `pass_fds` keeps the fd at its parent number; Node's `stdio` array + * renumbers extra pipes from 3 upward, so we hand the server fd 3 and read + * the pipe at index 3. */ async get(): Promise { VirtualDisplay.assertLinux(); if (this.proc === null) { - // setpriv's parent-death signal stops Xvfb when this process dies - // without reaching kill(), even by SIGKILL; SIGTERM lets Xvfb remove - // its own lock and socket. See xvfb-dies-with-its-launcher in - // ci/tribal-rules.yml. - const cmd = [ - this.setprivPath, - "--pdeathsig", - "TERM", - this.xvfbPath, - "-displayfd", - "3", - ...this.xvfbArgs, - ]; + const [program, ...args] = this.command(); + const cmd = [...this.wrapper(), program, "-displayfd", "3", ...args]; if (this.debug) { console.log("Starting virtual display:", cmd.join(" ")); } @@ -161,33 +189,31 @@ export class VirtualDisplay { "pipe", ], detached: true, - env: { - ...process.env, - // Force Mesa software GLX; we don't use the GPU anyway. - __GLX_VENDOR_LIBRARY_NAME: "mesa", - LIBGL_ALWAYS_SOFTWARE: "1", - }, + env: this.serverEnv(), }); // A spawn that fails after spawn() returns (EACCES, ENOEXEC, a noexec // mount) is an 'error' event on the child; with no listener Node // treats it as uncaught and exits. readDisplayNumber() turns it into - // CannotExecuteXvfb; this keeps any later one from killing the process. + // this.error(); this keeps any later one from killing the process. this.proc.on("error", () => {}); const displayFd = this.proc.stdio[3] as NodeJS.ReadableStream | null; if (!displayFd) { this.kill(); - throw new CannotExecuteXvfb("Could not open Xvfb's -displayfd pipe"); + throw this.error(`Could not open ${this.serverName}'s -displayfd pipe`); } const raw = await this.readDisplayNumber(displayFd); const parsed = Number.parseInt(raw.trim(), 10); if (Number.isNaN(parsed)) { this.kill(); - throw new CannotExecuteXvfb(`Xvfb wrote non-integer display: '${raw}'`); + throw this.error( + `${this.serverName} wrote non-integer display: '${raw}'`, + ); } this._display = parsed; + await this.ready(); } else if (this.debug) { console.log(`Using virtual display: ${this._display}`); } @@ -216,7 +242,7 @@ export class VirtualDisplay { const onSpawnError = (error: Error) => finish(() => { this.kill(); - reject(new CannotExecuteXvfb(`Could not start Xvfb: ${error}`)); + reject(this.error(`Could not start ${this.serverName}: ${error}`)); }); proc?.once("error", onSpawnError); @@ -224,8 +250,8 @@ export class VirtualDisplay { finish(() => { this.kill(); reject( - new CannotExecuteXvfb( - `Xvfb did not report a display within ${DISPLAYFD_READ_TIMEOUT_MS}ms`, + this.error( + `${this.serverName} did not report a display within ${DISPLAYFD_READ_TIMEOUT_MS}ms`, ), ); }); @@ -246,8 +272,8 @@ export class VirtualDisplay { const exit = this.proc?.exitCode; this.kill(); reject( - new CannotExecuteXvfb( - `Xvfb did not report a display (got '${buf}', exit=${exit})`, + this.error( + `${this.serverName} did not report a display (got '${buf}', exit=${exit})`, ), ); }); @@ -256,7 +282,7 @@ export class VirtualDisplay { finish(() => { this.kill(); reject( - new CannotExecuteXvfb(`Failed to read Xvfb's display: ${error}`), + this.error(`Failed to read ${this.serverName}'s display: ${error}`), ); }); }); diff --git a/typescript/src/webgl.ts b/typescript/src/webgl.ts index 3a502aa8..ce961d44 100644 --- a/typescript/src/webgl.ts +++ b/typescript/src/webgl.ts @@ -60,6 +60,13 @@ const BACKEND_EXTENSIONS: Readonly> = { win: ["EXT_depth_clamp"], }; +// Firefox 158 (bug 1854003) exposes EXT_polygon_offset_clamp wherever the GL +// backend clamps polygon offsets: ANGLE's D3D11 backend from feature level 10_0, +// which WebGL2 needs, and Linux desktop GL drivers (ARB_polygon_offset_clamp, +// core in GL 4.6), whose recordings have EXT_depth_clamp. macOS release builds +// run WebGL on CGL's GL 4.1, which lacks it. +const POLYGON_OFFSET_CLAMP = "EXT_polygon_offset_clamp"; + const ALIASED_LINE_WIDTH_RANGE = "33902"; // What Firefox reports under privacy.resistFingerprinting, which a Camoufox @@ -133,16 +140,34 @@ export function firefoxGpus(targetOs: string): Array<[string, string]> { ]); } +/** The extensions the shipped Firefox adds on this device's backend. */ +function backendExtensions( + targetOs: string, + webgl: Record, + hasWebgl2: boolean, +): readonly string[] { + const extensions = BACKEND_EXTENSIONS[targetOs] ?? []; + if ( + (targetOs === "win" && hasWebgl2) || + (targetOs === "lin" && + (webgl.supportedExtensions as string[]).includes("EXT_depth_clamp")) + ) { + return [...extensions, POLYGON_OFFSET_CLAMP]; + } + return extensions; +} + function contextConfig( prefix: string, webgl: Record, targetOs: string, + backend: readonly string[], ): Record { const blocked = filteredExtensions(targetOs); const extensions = (webgl.supportedExtensions as string[]).filter( (extension) => !blocked.has(extension), ); - for (const extension of BACKEND_EXTENSIONS[targetOs] ?? []) { + for (const extension of backend) { if (extensions.includes(extension)) continue; // Firefox lists them in WebGLExtensionID order: alphabetical, ignoring case. const at = extensions.findIndex( @@ -183,14 +208,15 @@ export function toConfig( const hasWebgl2 = Array.isArray(webgl2) ? webgl2.length > 0 : Object.keys(webgl2 ?? {}).length > 0; + const backend = backendExtensions(targetOs, webgl, hasWebgl2); const config: Record = { "webGl:vendor": webgl.vendor, "webGl:renderer": webgl.renderer, - ...contextConfig("webGl", webgl, targetOs), + ...contextConfig("webGl", webgl, targetOs, backend), webGl2Enabled: hasWebgl2, }; if (hasWebgl2) { - Object.assign(config, contextConfig("webGl2", webgl2, targetOs)); + Object.assign(config, contextConfig("webGl2", webgl2, targetOs, backend)); // Firefox 156 creates WebGL1 on the same GL profile as WebGL2, so both // report one line width range. 146 forced WebGL1 onto a compatibility // profile, and fpgen recorded that profile's driver range. diff --git a/typescript/tests/addons.test.ts b/typescript/tests/addons.test.ts index 3d23746c..56ac715a 100644 --- a/typescript/tests/addons.test.ts +++ b/typescript/tests/addons.test.ts @@ -81,3 +81,88 @@ it("removes the partial directory when a download fails", async () => { ); log.mockRestore(); }); + +it("downloads once for concurrent launches", async () => { + // Two launches in one process share the check-then-extract; unserialized, + // both saw no manifest at the await and both downloaded. + const calls: string[] = []; + addons.addonsDeps.downloadAndExtract = async (_url, extractPath, name) => { + calls.push(name); + await new Promise((resolve) => setTimeout(resolve, 50)); + writeManifest(extractPath); + }; + + const outs: string[][] = [[], []]; + await Promise.all(outs.map((out) => addons.addDefaultAddons(out))); + + expect(calls).toEqual(["UBO"]); + expect(outs).toEqual([[ubo], [ubo]]); +}); + +/** Re-imports addons with webdl stubbed and unzip replaced by `fakeUnzip`. */ +async function withUnzip(fakeUnzip: (extractPath: string) => void) { + vi.resetModules(); + vi.doMock("../src/pkgman.js", async (importOriginal) => ({ + ...(await importOriginal()), + webdl: async () => Buffer.alloc(0), + unzip: (_buffer: Buffer, extractPath: string) => fakeUnzip(extractPath), + })); + const mod: Addons = await import("../src/addons.js"); + vi.doUnmock("../src/pkgman.js"); + return mod; +} + +it("extracts so the addon appears complete or not at all", async () => { + // Another process checks for manifest.json without the chain, so the addon + // directory must never hold a manifest while its other files are missing. + fs.mkdirSync(ubo, { recursive: true }); + const seen: boolean[] = []; + const mod = await withUnzip((extractPath) => { + seen.push(fs.existsSync(path.join(ubo, "manifest.json"))); + writeManifest(extractPath); + fs.writeFileSync(path.join(extractPath, "background.js"), ""); + seen.push(fs.existsSync(path.join(ubo, "manifest.json"))); + }); + + await mod.downloadAndExtract("url", ubo, "UBO"); + + expect(seen).toEqual([false, false]); + expect(fs.readdirSync(ubo).sort()).toEqual([ + "background.js", + "manifest.json", + ]); + expect(fs.readdirSync(path.dirname(ubo))).toEqual(["UBO"]); +}); + +it("keeps a complete addon installed meanwhile", async () => { + // Another process can finish installing the addon while this one extracts. + // Its copy may already be loading in a browser, so it must not be deleted. + fs.mkdirSync(ubo, { recursive: true }); + const mod = await withUnzip((extractPath) => { + writeManifest(extractPath); + writeManifest(ubo); + fs.writeFileSync(path.join(ubo, "theirs.js"), ""); + }); + + await mod.downloadAndExtract("url", ubo, "UBO"); + + expect(fs.readdirSync(ubo).sort()).toEqual(["manifest.json", "theirs.js"]); + expect(fs.readdirSync(path.dirname(ubo))).toEqual(["UBO"]); +}); + +it("keeps a complete addon when a download fails", async () => { + // This launch's download fails after another process installed the addon. + // That copy may already be loading in a browser, so it must not be deleted. + addons.addonsDeps.downloadAndExtract = async () => { + writeManifest(ubo); + throw new Error("network died mid-download"); + }; + const log = vi.spyOn(console, "log").mockImplementation(() => {}); + + const out: string[] = []; + await addons.maybeDownloadAddons({ ...addons.DefaultAddons }, out); + + expect(fs.existsSync(path.join(ubo, "manifest.json"))).toBe(true); + expect(out).toEqual([]); + log.mockRestore(); +}); diff --git a/typescript/tests/e2e.test.ts b/typescript/tests/e2e.test.ts index b272657a..fcdf1b72 100644 --- a/typescript/tests/e2e.test.ts +++ b/typescript/tests/e2e.test.ts @@ -326,7 +326,14 @@ function expectMatchesConfig( expect(probe.historyLength).toBe(1); // The storage quota is the stock-profile disk's, not the temp dir's. expect(typeof probe.storageQuota).toBe("number"); - expect(probe.mediaDevices.length).toBeGreaterThan(0); + // Media devices: the identity's, never the host's. Before any grant stock + // Firefox lists one entry per input kind the machine has and no outputs, + // so a speaker-only identity lists nothing. + expect(config["mediaDevices:enabled"]).toBe(true); + const inputKinds: string[] = []; + if (config["mediaDevices:micros"] > 0) inputKinds.push("audioinput"); + if (config["mediaDevices:webcams"] > 0) inputKinds.push("videoinput"); + expect(probe.mediaDevices).toEqual(inputKinds); } describe.runIf(ENABLED)("e2e: the TS launcher drives a real Camoufox", () => { diff --git a/typescript/tests/gpu-display.test.ts b/typescript/tests/gpu-display.test.ts new file mode 100644 index 00000000..461a16ed --- /dev/null +++ b/typescript/tests/gpu-display.test.ts @@ -0,0 +1,126 @@ +/** + * headless="virtual-gpu" on a real GPU, through the TypeScript API. + * + * Opt-in, like e2e.test.ts: it needs the card CAMOUFOX_GPU names, Xorg with + * the card's driver and, without root, the machine set up for it + * (`npx camoufox gpu-setup | sudo sh`). CI has no GPU runner. + * + * CAMOUFOX_GPU=01:00.0 CAMOUFOX_EXECUTABLE=/path/to/camoufox-bin pnpm test tests/gpu-display.test.ts + * + * Twin of browser/tests/native/test_gpu_display.py. The GPU-free half is + * gpudisplay.test.ts. + */ +import { execFileSync } from "node:child_process"; +import * as fs from "node:fs"; +import { firefox } from "playwright-core"; +import { afterEach, beforeEach, describe, expect, it } from "vitest"; +import { gpuVendor, selectGpu } from "../src/gpudisplay.js"; +import { launchServer } from "../src/server.js"; +import { Camoufox } from "../src/sync_api.js"; + +const ENABLED = Boolean(process.env.CAMOUFOX_GPU?.trim()); +const EXECUTABLE = process.env.CAMOUFOX_EXECUTABLE ?? ""; +const ACTIVE_VT = "/sys/class/tty/tty0/active"; + +const READ_GPU = () => { + const gl = (globalThis as any).document + .createElement("canvas") + .getContext("webgl"); + const info = gl.getExtension("WEBGL_debug_renderer_info"); + return `${gl.getParameter(info.UNMASKED_VENDOR_WEBGL)} ${gl.getParameter(info.UNMASKED_RENDERER_WEBGL)}`; +}; + +function xorgServers(): Set { + try { + return new Set( + execFileSync("pgrep", ["-x", "Xorg"], { encoding: "utf-8" }) + .split(/\s+/) + .filter(Boolean) + .map(Number), + ); + } catch { + return new Set(); + } +} + +async function waitUntilGone(pids: Set): Promise { + const deadline = Date.now() + 15_000; + let left = [...pids].filter((pid) => xorgServers().has(pid)); + while (left.length && Date.now() < deadline) { + await new Promise((r) => setTimeout(r, 100)); + left = [...pids].filter((pid) => xorgServers().has(pid)); + } + return left; +} + +describe.runIf(ENABLED)("headless='virtual-gpu' on a real GPU", () => { + if (ENABLED && !EXECUTABLE) { + throw new Error("CAMOUFOX_EXECUTABLE must name the browser to test"); + } + const vendor = () => gpuVendor(selectGpu()).toLowerCase(); + let vt: string | null = null; + let wayland: string | undefined; + + beforeEach(() => { + // Nothing here may open on the desktop the tests run from. + wayland = process.env.WAYLAND_DISPLAY; + delete process.env.WAYLAND_DISPLAY; + vt = fs.existsSync(ACTIVE_VT) + ? fs.readFileSync(ACTIVE_VT, "utf-8").trim() + : null; + }); + afterEach(() => { + if (wayland !== undefined) process.env.WAYLAND_DISPLAY = wayland; + if (vt) expect(fs.readFileSync(ACTIVE_VT, "utf-8").trim()).toBe(vt); + }); + + it("renders on the named card and leaves no server behind", async () => { + const before = xorgServers(); + const browser = await Camoufox({ + headless: "virtual-gpu", + os: "linux", + executable_path: EXECUTABLE, + }); + const started = new Set( + [...xorgServers()].filter((pid) => !before.has(pid)), + ); + try { + expect(started.size).toBe(1); + const display = (browser as any)._virtualDisplay; + expect(display.usesGpu()).toBe(true); + // The identity claims the card that renders, not the desktop's GPU. + const page = await browser.newPage(); + expect((await page.evaluate(READ_GPU)).toLowerCase()).toContain(vendor()); + } finally { + await browser.close(); + } + expect(await waitUntilGone(started)).toEqual([]); + }, 120_000); + + it("serves a browser on the card", async () => { + const before = xorgServers(); + const server = await launchServer({ + headless: "virtual-gpu", + os: "linux", + executable_path: EXECUTABLE, + }); + const started = new Set( + [...xorgServers()].filter((pid) => !before.has(pid)), + ); + try { + expect(started.size).toBe(1); + const browser = await firefox.connect(server.wsEndpoint()); + try { + const page = await browser.newPage(); + expect((await page.evaluate(READ_GPU)).toLowerCase()).toContain( + vendor(), + ); + } finally { + await browser.close(); + } + } finally { + await server.close(); + } + expect(await waitUntilGone(started)).toEqual([]); + }, 120_000); +}); diff --git a/typescript/tests/gpudisplay.test.ts b/typescript/tests/gpudisplay.test.ts new file mode 100644 index 00000000..8b1d0a76 --- /dev/null +++ b/typescript/tests/gpudisplay.test.ts @@ -0,0 +1,730 @@ +/** + * Tests for gpudisplay.ts (headless="virtual-gpu") that need no GPU: + * enumeration and selection on a fake sysfs tree, the generated xorg.conf, the + * Xorg argv, the browser's environment and prefs, the identity's GPU probe, + * the GPU-use check, and teardown. + * + * Twin of python/tests/test_gpudisplay.py. The real display is + * gpu-display.test.ts. + */ +import { type ChildProcess, execFileSync, spawn } from "node:child_process"; +import * as fs from "node:fs"; +import * as os from "node:os"; +import * as path from "node:path"; +import { afterEach, describe, expect, it, onTestFinished, vi } from "vitest"; +import { + HOME, + quietly, + restoreDeps, + stubHost, + utils, + warnings, +} from "./launch-host.js"; + +const { + AmbiguousGpuSelection, + CannotExecuteXorg, + GpuNotFound, + GpuSoftwareFallback, + NoGpuFound, + VirtualDisplayError, +} = await import("../src/exceptions.js"); +const gpudisplay = await import("../src/gpudisplay.js"); +const { + busId, + configName, + drewOnGpu, + enumerateGpus, + GPU_PREFS, + GpuDisplay, + PROBE_PAGE, + SERVER_FLAGS, + selectGpu, + xorgConfig, + xorgDriver, +} = gpudisplay; +type GpuDevice = import("../src/gpudisplay.js").GpuDevice; +const { hostGpu } = await import("../src/host_rendering.js"); +const { firefox } = await import("playwright-core"); + +const deps = utils.utilsDeps; + +const NVIDIA: GpuDevice = { + pciAddress: "0000:01:00.0", + renderNode: "/dev/dri/renderD129", + cardNode: "/dev/dri/card1", + vendorId: "0x10de", + deviceId: "0x2c02", + kernelDriver: "nvidia", + nvidiaNode: "/dev/nvidia0", +}; +const AMD: GpuDevice = { + pciAddress: "0000:6f:00.0", + renderNode: "/dev/dri/renderD128", + cardNode: "/dev/dri/card0", + vendorId: "0x1002", + deviceId: "0x744c", + kernelDriver: "amdgpu", + nvidiaNode: null, +}; +const AMD_IGPU: GpuDevice = { + pciAddress: "0000:70:00.0", + renderNode: "/dev/dri/renderD130", + cardNode: "/dev/dri/card3", + vendorId: "0x1002", + deviceId: "0x13c0", + kernelDriver: "amdgpu", + nvidiaNode: null, +}; +const HOST = [NVIDIA, AMD, AMD_IGPU]; + +const scratch: string[] = []; +function tmpdir(): string { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), "camoufox-gpu-test-")); + scratch.push(dir); + return dir; +} + +afterEach(() => { + restoreDeps(); + vi.restoreAllMocks(); + vi.unstubAllEnvs(); + for (const dir of scratch.splice(0)) + fs.rmSync(dir, { recursive: true, force: true }); +}); + +/** This machine's layout: the render nodes are numbered in driver load order, + * so the AMD card is renderD128 though the NVIDIA one has the lower address. */ +function fakeHost(): string { + const root = tmpdir(); + fs.mkdirSync(path.join(root, "dev/dri"), { recursive: true }); + fs.mkdirSync(path.join(root, "sys/class/drm"), { recursive: true }); + const device = (pci: string, vendor: string, id: string, driver: string) => { + const dir = path.join(root, "sys/devices/pci0000:00", pci); + fs.mkdirSync(dir, { recursive: true }); + fs.writeFileSync(path.join(dir, "vendor"), `${vendor}\n`); + fs.writeFileSync(path.join(dir, "device"), `${id}\n`); + fs.writeFileSync( + path.join(dir, "uevent"), + `DRIVER=${driver}\nPCI_SLOT_NAME=${pci}\n`, + ); + return dir; + }; + const node = (name: string, dir: string) => { + fs.writeFileSync(path.join(root, "dev/dri", name), ""); + fs.mkdirSync(path.join(root, "sys/class/drm", name)); + fs.symlinkSync(dir, path.join(root, "sys/class/drm", name, "device")); + }; + const nvidia = device("0000:01:00.0", "0x10de", "0x2c02", "nvidia"); + const amd = device("0000:6f:00.0", "0x1002", "0x744C", "amdgpu"); + const igpu = device("0000:70:00.0", "0x1002", "0x13c0", "amdgpu"); + node("renderD128", amd); + node("card0", amd); + node("renderD129", nvidia); + node("card1", nvidia); + node("renderD130", igpu); + node("card3", igpu); + // A connector is a card*-named entry that is not a card. + fs.mkdirSync(path.join(root, "sys/class/drm/card1-DP-1")); + // A render node with no PCI device cannot be bound by BusID. + const platform = path.join(root, "sys/devices/platform/vgem"); + fs.mkdirSync(platform, { recursive: true }); + node("renderD131", platform); + const info = path.join(root, "proc/driver/nvidia/gpus/0000:01:00.0"); + fs.mkdirSync(info, { recursive: true }); + fs.writeFileSync( + path.join(info, "information"), + "Model: \t NVIDIA GeForce RTX 5080\nDevice Minor: \t 0\n", + ); + return root; +} + +describe.runIf(process.platform === "linux")("enumeration", () => { + it("lists PCI GPUs in address order, not render node order", () => { + expect(enumerateGpus(fakeHost())).toEqual(HOST); + }); + + it("finds no GPUs without /dev/dri", () => { + expect(enumerateGpus(tmpdir())).toEqual([]); + }); + + it("writes the bus ID in decimal without the domain", () => { + expect(busId(NVIDIA)).toBe("PCI:1:0:0"); + expect(busId(AMD)).toBe("PCI:111:0:0"); + }); + + it("gives NVIDIA its own driver and everything else modesetting", () => { + expect(xorgDriver(NVIDIA)).toBe("nvidia"); + expect(xorgDriver(AMD)).toBe("modesetting"); + }); +}); + +describe("selection", () => { + it.each([ + 0, + "0", + "renderD129", + "/dev/dri/renderD129", + "card1", + "/dev/dri/card1", + "01:00.0", + "0000:01:00.0", + "10de:2c02", + "0x10de:0x2c02", + "nvidia", + "NVIDIA", + ])("%s names the NVIDIA card", (selector) => { + expect(selectGpu(selector, HOST)).toEqual(NVIDIA); + }); + + it("a PCI address names the AMD card", () => { + expect(selectGpu("6f:00.0", HOST)).toEqual(AMD); + }); + + it("the environment names the card when the option does not", () => { + vi.stubEnv("CAMOUFOX_GPU", "6f:00.0"); + expect(selectGpu(undefined, HOST)).toEqual(AMD); + expect(selectGpu("01:00.0", HOST)).toEqual(NVIDIA); + }); + + it("a lone GPU needs no selector", () => { + vi.stubEnv("CAMOUFOX_GPU", ""); + expect(selectGpu(undefined, [AMD])).toEqual(AMD); + }); + + it("several GPUs and no selector is ambiguous", () => { + vi.stubEnv("CAMOUFOX_GPU", ""); + expect(() => selectGpu(undefined, HOST)).toThrow(AmbiguousGpuSelection); + }); + + it("a selector matching two GPUs is ambiguous", () => { + expect(() => selectGpu("amd", HOST)).toThrow(/\[1\][\s\S]*\[2\]/); + }); + + it("a selector matching nothing fails", () => { + expect(() => selectGpu("intel", HOST)).toThrow(GpuNotFound); + expect(() => selectGpu(3, HOST)).toThrow(GpuNotFound); + expect(() => selectGpu("intel", HOST)).toThrow(VirtualDisplayError); + }); + + it("no GPUs fails", () => { + expect(() => selectGpu("0", [])).toThrow(NoGpuFound); + }); +}); + +describe("xorg.conf", () => { + it("drives NVIDIA offscreen", () => { + const config = xorgConfig(NVIDIA); + for (const line of [ + 'Option "AutoAddDevices" "false"', + 'Option "AutoAddGPU" "false"', + 'Option "DontVTSwitch" "true"', + 'Option "AllowMouseOpenFail" "true"', + 'Driver "nvidia"', + 'BusID "PCI:1:0:0"', + 'Option "UseDisplayDevice" "None"', + 'Option "AllowEmptyInitialConfiguration" "true"', + "HorizSync 5.0 - 1000.0", + "VertRefresh 5.0 - 200.0", + "DefaultDepth 24", + "Virtual 1920 1080", + ]) + expect(config).toContain(line); + }); + + it("drives other cards with modesetting, without the NVIDIA option", () => { + const config = xorgConfig(AMD); + expect(config).toContain('Driver "modesetting"'); + expect(config).toContain('BusID "PCI:111:0:0"'); + expect(config).not.toContain("UseDisplayDevice"); + }); + + it("names no render node, which can change between boots", () => { + expect(xorgConfig(NVIDIA)).not.toContain("renderD"); + }); + + it("is named by PCI address", () => { + expect(configName(NVIDIA)).toBe("camoufox-gpu-0000_01_00_0.conf"); + }); +}); + +describe("the Xorg command", () => { + function display(gpu: GpuDevice) { + const d = new GpuDisplay(gpu); + Object.defineProperty(d, "xorgPath", { get: () => "/usr/bin/Xorg" }); + return d as any; + } + + function configDir(): string { + const dir = tmpdir(); + const installed = GpuDisplay.configDir; + GpuDisplay.configDir = dir; + onTestFinished(() => { + GpuDisplay.configDir = installed; + }); + return dir; + } + + it("names the installed config without root", () => { + vi.spyOn(process, "getuid").mockReturnValue(1000); + fs.writeFileSync( + path.join(configDir(), configName(NVIDIA)), + xorgConfig(NVIDIA), + ); + expect(display(NVIDIA).command()).toEqual([ + "/usr/bin/Xorg", + "-config", + "camoufox-gpu-0000_01_00_0.conf", + "-terminate", + "2", + "-nolisten", + "tcp", + "-sharevts", + "-novtswitch", + ]); + }); + + it("says how to install a missing config without root", () => { + vi.spyOn(process, "getuid").mockReturnValue(1000); + const dir = configDir(); + expect(() => display(NVIDIA).command()).toThrow(CannotExecuteXorg); + expect(() => display(NVIDIA).command()).toThrow( + `needs ${dir}/camoufox-gpu-0000_01_00_0.conf. Set this machine up with:\n` + + " npx camoufox gpu-setup 0000:01:00.0 | sudo sh", + ); + }); + + it("names the setup command when Xorg is missing", () => { + vi.spyOn(process, "getuid").mockReturnValue(0); + const d = new GpuDisplay(AMD) as any; + expect(() => { + const original = process.env.PATH; + process.env.PATH = ""; + try { + return d.xorgPath; + } finally { + process.env.PATH = original; + } + }).toThrow( + // As root the script needs no sudo. + /needs the Xorg server\. Set this machine up with:\n {2}npx camoufox gpu-setup 0000:6f:00\.0 \| sh$/, + ); + }); + + it("uses a temporary config and log as root, and removes them", () => { + vi.spyOn(process, "getuid").mockReturnValue(0); + const d = display(AMD); + const command: string[] = d.command(); + const config = command[command.indexOf("-config") + 1]; + const log = command[command.indexOf("-logfile") + 1]; + expect(path.isAbsolute(config)).toBe(true); + expect(fs.readFileSync(config, "utf-8")).toBe(xorgConfig(AMD)); + expect(command.slice(-6)).toEqual([...SERVER_FLAGS]); + fs.writeFileSync(log, ""); + d.kill(); + expect(fs.existsSync(config) || fs.existsSync(log)).toBe(false); + }); + + it("leaves the server's environment untouched", () => { + // Xvfb's server is forced onto Mesa's software GLX; this one must not be. + expect((new GpuDisplay(NVIDIA) as any).serverEnv()).toBe(process.env); + }); +}); + +describe("the launch", () => { + function started() { + deps.selectGpu = () => NVIDIA; + vi.spyOn(GpuDisplay.prototype, "get").mockResolvedValue(":77"); + } + + it("points the launch at the display, with the GPU prefs", async () => { + started(); + const options: Record = { + gpu: "01:00.0", + firefox_user_prefs: { "gfx.webrender.all": false }, + }; + const [display, headless] = await utils.startVirtualDisplay( + "virtual-gpu", + false, + options, + ); + expect(display).toBeInstanceOf(GpuDisplay); + expect((display as any).requireGpu).toBe(true); + expect(headless).toBe(false); + expect(options).toEqual({ + virtual_display: ":77", + // The caller's prefs win. + firefox_user_prefs: { ...GPU_PREFS, "gfx.webrender.all": false }, + }); + }); + + it("only warns with require_gpu: false", async () => { + started(); + const [display] = await utils.startVirtualDisplay("virtual-gpu", false, { + require_gpu: false, + } as any); + expect((display as any).requireGpu).toBe(false); + }); + + it.each([ + "gpu", + "require_gpu", + ])("refuses %s without virtual-gpu", async (option) => { + await expect( + utils.startVirtualDisplay("virtual", false, { [option]: "0" } as any), + ).rejects.toThrow(/virtual-gpu/); + }); + + it("gives the browser X11 settings but no GPU overrides", async () => { + started(); + stubHost(); + const options: Record = { gpu: "0" }; + await utils.startVirtualDisplay("virtual-gpu", false, options); + const launched = await quietly(() => + utils.launchOptions({ + ...options, + env: { HOME }, + headless: false, + i_know_what_im_doing: true, + }), + ); + expect(launched.env.DISPLAY).toBe(":77"); + const overrides = Object.keys(launched.env).filter((key) => + /^(MESA_|__GLX_|LIBGL_|DRI_PRIME|__NV_)/.test(key), + ); + expect(overrides).toEqual([]); + }); + + it("probes the identity's GPU on the GPU display, with its prefs", async () => { + // The identity claims the GPU Firefox reports on the GPU display, not + // the one the desktop renders on. + started(); + stubHost(); + deps.hostOsKey = () => "lin"; + const probes: any[] = []; + deps.hostGpu = async (_exe, _headless, env, prefs) => { + probes.push([ + env.DISPLAY, + Object.fromEntries(Object.keys(GPU_PREFS).map((k) => [k, prefs[k]])), + ]); + return ["NVIDIA Corporation", "NVIDIA GeForce GTX 980, or similar"]; + }; + const options: Record = { gpu: "0" }; + await utils.startVirtualDisplay("virtual-gpu", false, options); + await quietly(() => + utils.launchOptions({ + ...options, + os: "linux", + env: { HOME }, + headless: false, + i_know_what_im_doing: true, + }), + ); + expect(probes).toEqual([[":77", GPU_PREFS]]); + }); + + it("reads the probe with the launch's rendering prefs only", () => { + const launch = vi + .spyOn(firefox, "launch") + .mockImplementation(() => new Promise(() => undefined)); + hostGpu( + "/x/camoufox", + false, + { DISPLAY: ":77" }, + { ...GPU_PREFS, "intl.locale.requested": "en-US" }, + ); + expect(launch.mock.calls[0][0]?.firefoxUserPrefs).toEqual({ + ...GPU_PREFS, + "webgl.force-enabled": true, + }); + }); +}); + +class FakePage { + url: string | null = null; + closed = false; + async goto(url: string) { + this.url = url; + } + async close() { + this.closed = true; + } +} + +class FakeBrowser { + page = new FakePage(); + closed = false; + async newPage() { + return this.page; + } + async close() { + this.closed = true; + } +} + +describe("the GPU check", () => { + it("keeps a browser that rendered on the GPU", async () => { + const display = new GpuDisplay(NVIDIA); + vi.spyOn(display, "waitForGpu").mockResolvedValue(true); + const browser = new FakeBrowser(); + expect(await utils.attachVirtualDisplay(browser, display)).toBe(browser); + expect(browser.page.url).toBe(PROBE_PAGE); + expect(browser.page.closed).toBe(true); + expect(browser.closed).toBe(false); + }); + + it("closes a browser in software and fails the launch", async () => { + const display = new GpuDisplay(NVIDIA); + vi.spyOn(display, "waitForGpu").mockResolvedValue(false); + const kill = vi.spyOn(display, "kill").mockImplementation(() => {}); + const browser = new FakeBrowser(); + await expect(utils.attachVirtualDisplay(browser, display)).rejects.toThrow( + GpuSoftwareFallback, + ); + expect(browser.closed).toBe(true); + expect(kill).toHaveBeenCalled(); + }); + + it("warns instead with require_gpu: false", async () => { + const display = new GpuDisplay(NVIDIA, false, false); + vi.spyOn(display, "waitForGpu").mockResolvedValue(false); + const { warnings: caught } = await warnings.recordWarnings(() => + utils.attachVirtualDisplay(new FakeBrowser(), display), + ); + expect( + caught.some( + (w) => w.category === "LeakWarning" && w.message.includes("software"), + ), + ).toBe(true); + }); +}); + +// /proc//fdinfo of Firefox's render node on an RX 7900 XTX, trimmed. +describe("setting a machine up", () => { + function xwrapper(contents: string, wrapperExists = true): string { + vi.spyOn(process, "getuid").mockReturnValue(1000); + const dir = tmpdir(); + const config = path.join(dir, "Xwrapper.config"); + fs.writeFileSync(config, contents); + const wrapper = path.join(dir, "Xorg.wrap"); + if (wrapperExists) fs.writeFileSync(wrapper, ""); + const saved = [GpuDisplay.xwrapperConfig, GpuDisplay.xorgWrappers] as const; + GpuDisplay.xwrapperConfig = config; + GpuDisplay.xorgWrappers = [wrapper]; + onTestFinished(() => { + [GpuDisplay.xwrapperConfig, GpuDisplay.xorgWrappers] = saved; + }); + return config; + } + const fail = (message: string) => + (new GpuDisplay(AMD) as any).error(message) as Error; + + it("names a stock wrapper's settings and the fix", () => { + // What Debian and Ubuntu ship. + const config = xwrapper("# Xwrapper.config\nallowed_users=console\n"); + const error = fail("Xorg exited (1) right after starting."); + expect(error).toBeInstanceOf(CannotExecuteXorg); + expect(error.message).toContain( + `${config} has allowed_users=console, needs allowed_users=anybody`, + ); + expect(error.message).toContain( + `${config} has needs_root_rights=unset, needs needs_root_rights=yes`, + ); + expect(error.message).toMatch( + /npx camoufox gpu-setup 0000:6f:00\.0 \| sudo sh$/, + ); + }); + + it("names a missing wrapper", () => { + xwrapper("allowed_users=anybody\nneeds_root_rights=yes\n", false); + expect(gpudisplay.setupProblems()).toEqual([ + `no setuid Xorg.wrap (${GpuDisplay.xorgWrappers[0]})`, + ]); + }); + + it("adds nothing on a machine that is set up, or as root", () => { + xwrapper("allowed_users = anybody\nneeds_root_rights = yes\n"); + expect(fail("Xorg exited (1).").message).toBe("Xorg exited (1)."); + xwrapper("allowed_users=console\n"); + vi.spyOn(process, "getuid").mockReturnValue(0); + expect(fail("Xorg exited (1).").message).toBe("Xorg exited (1)."); + }); + + it.each([ + ["nvidia", NVIDIA], + ["amd", AMD], + ] as const)("prints a valid sh script for %s", (_, gpu) => { + const script = gpudisplay.setupScript(gpu); + expect(() => + execFileSync("sh", ["-n"], { input: script, stdio: "pipe" }), + ).not.toThrow(); + const config = path.join(GpuDisplay.configDir, configName(gpu)); + expect(script).toContain( + `cat > ${config} <<'CAMOUFOX_XORG_CONF'\n${xorgConfig(gpu)}CAMOUFOX_XORG_CONF\n`, + ); + expect(script).toContain( + "printf 'allowed_users=anybody\\nneeds_root_rights=yes\\n'", + ); + expect(script.includes("nvidia_drv.so")).toBe(gpu === NVIDIA); + }); +}); + +const AMDGPU_FDINFO = (gfx: number) => + `pos:\t0\nflags:\t02100002\ndrm-driver:\tamdgpu\ndrm-client-id:\t5873\n` + + `drm-total-vram:\t159812 KiB\ndrm-engine-gfx:\t${gfx} ns\n` + + `drm-engine-compute:\t0 ns\ndrm-engine-capacity-gfx:\t1\n`; + +// From the kernel's Xe usage stats documentation. +const XE_FDINFO = (rcs: number) => + `pos:\t0\nflags:\t0100002\ndrm-driver:\txe\ndrm-client-id:\t21\n` + + `drm-cycles-rcs:\t${rcs}\ndrm-total-cycles-rcs:\t7655183225\n` + + `drm-cycles-bcs:\t0\ndrm-total-cycles-bcs:\t7655183225\n` + + `drm-engine-capacity-vcs:\t2\n`; + +/** A process on `display` that holds `file` open, as a browser holds the GPU. */ +async function holding(file: string, display: string): Promise { + const child = spawn( + process.execPath, + [ + "-e", + `require("fs").openSync(${JSON.stringify(file)}, "r"); console.log(1); setTimeout(() => {}, 60000);`, + ], + { + env: { ...process.env, DISPLAY: display }, + stdio: ["ignore", "pipe", "ignore"], + }, + ); + await new Promise((resolve) => child.stdout?.once("data", resolve)); + return child; +} + +describe.runIf(process.platform === "linux")("GPU use", () => { + // Rendering is read from what the kernel accounts to the browser, never + // from the renderer string, which the identity spoofs. + it("counts engine time on the render node as rendering", () => { + expect(drewOnGpu(AMDGPU_FDINFO(39907610))).toBe(true); + }); + + it("counts xe's busy cycles, not its total cycles", () => { + // xe reports cycles only; its total-cycles line grows on an idle client too. + expect(drewOnGpu(XE_FDINFO(28257900))).toBe(true); + expect(drewOnGpu(XE_FDINFO(0))).toBe(false); + }); + + it("reads engine work from both of the card's DRM nodes", () => { + // On an RX 7900 XTX, a second launch from one process drew through + // /dev/dri/card0 and left renderD128 idle. + const amd = { + ...NVIDIA, + renderNode: "/dev/dri/renderD128", + cardNode: "/dev/dri/card0", + }; + expect(gpudisplay.drmNodes(amd)).toEqual([ + "/dev/dri/renderD128", + "/dev/dri/card0", + ]); + expect(gpudisplay.drmNodes({ ...amd, cardNode: null })).toEqual([ + "/dev/dri/renderD128", + ]); + }); + + it("does not count an idle render node", () => { + // Firefox opens it for DMABuf in software too; the capacity line is not time. + expect(drewOnGpu(AMDGPU_FDINFO(0))).toBe(false); + expect(drewOnGpu("pos:\t0\nflags:\t02\n")).toBe(false); + }); + + function card(): GpuDevice { + const dir = tmpdir(); + for (const name of ["renderD200", "nvidia7"]) + fs.writeFileSync(path.join(dir, name), ""); + return { + ...NVIDIA, + renderNode: path.join(dir, "renderD200"), + nvidiaNode: path.join(dir, "nvidia7"), + }; + } + + it.each([ + ["nvidiaNode", ":98765", true], + ["nvidiaNode", ":987650", false], + // An open render node with no engine time is software rendering. + ["renderNode", ":98765", false], + ] as const)("a process holding %s on %s renders: %s", async (held, on, rendering) => { + const gpu = card(); + const display = new GpuDisplay(gpu) as any; + display._display = 98765; + const child = await holding(gpu[held] as string, on); + try { + expect(display.usesGpu()).toBe(rendering); + } finally { + child.kill("SIGKILL"); + } + }); + + it("kill sweeps every process on the display", async () => { + const gpu = card(); + const display = new GpuDisplay(gpu) as any; + display._display = 98765; + const child = await holding(gpu.renderNode, ":98765"); + const exited = new Promise((resolve) => child.once("exit", resolve)); + try { + display.kill(); + expect(await exited).not.toBeUndefined(); + } finally { + child.kill("SIGKILL"); + } + }); +}); + +describe("the server", () => { + // The served browser has no page of its own, so the check connects to the + // endpoint and draws in a page there. + async function serve(rendered: boolean) { + stubHost(); + deps.selectGpu = () => NVIDIA; + vi.spyOn(GpuDisplay.prototype, "get").mockResolvedValue(":77"); + vi.spyOn(GpuDisplay.prototype, "waitForGpu").mockResolvedValue(rendered); + const kill = vi + .spyOn(GpuDisplay.prototype, "kill") + .mockImplementation(() => {}); + const server = { + closed: false, + wsEndpoint: () => "ws://localhost:4242/abc", + on: () => server, + async close() { + server.closed = true; + }, + }; + vi.spyOn(firefox, "launchServer").mockResolvedValue(server as any); + const browser = new FakeBrowser(); + const connect = vi + .spyOn(firefox, "connect") + .mockResolvedValue(browser as any); + const { launchServer } = await import("../src/server.js"); + const result = quietly(() => + launchServer({ + headless: "virtual-gpu", + env: { HOME }, + i_know_what_im_doing: true, + }), + ); + return { result, server, browser, connect, kill }; + } + + it("checks the GPU on its endpoint", async () => { + const { result, server, browser, connect } = await serve(true); + expect(await result).toBe(server); + expect(connect).toHaveBeenCalledWith("ws://localhost:4242/abc"); + expect(browser.page.url).toBe(PROBE_PAGE); + expect(browser.closed).toBe(true); + expect(server.closed).toBe(false); + }); + + it("closes a server whose browser renders in software", async () => { + const { result, server, kill } = await serve(false); + await expect(result).rejects.toThrow(GpuSoftwareFallback); + expect(server.closed).toBe(true); + expect(kill).toHaveBeenCalled(); + }); +}); diff --git a/typescript/tests/host-rendering.test.ts b/typescript/tests/host-rendering.test.ts index 6f513543..95f14163 100644 --- a/typescript/tests/host-rendering.test.ts +++ b/typescript/tests/host-rendering.test.ts @@ -298,17 +298,23 @@ describe.skipIf(!MODEL.ok)("WebGPU", () => { }); it("the probe ignores what the launcher adds to the environment", () => { - // hostIdentity probes with the launch's env, which carries CAMOU_* and - // FONTCONFIG_FILE; that must hit launchOptions' cached probe. + // hostIdentity probes with the launch's env and prefs, which carry CAMOU_*, + // FONTCONFIG_FILE and prefs that choose no device; that must hit + // launchOptions' cached probe. const launch = vi .spyOn(firefox, "launch") .mockImplementation(() => new Promise(() => undefined)); - const first = hostGpu("/nonexistent/camoufox", true, { DISPLAY: ":0" }); - const second = hostGpu("/nonexistent/camoufox", true, { - DISPLAY: ":0", - CAMOU_CONFIG_1: "{}", - FONTCONFIG_FILE: "/x", - }); + const first = hostGpu("/nonexistent/camoufox", true, { DISPLAY: ":0" }, {}); + const second = hostGpu( + "/nonexistent/camoufox", + true, + { + DISPLAY: ":0", + CAMOU_CONFIG_1: "{}", + FONTCONFIG_FILE: "/x", + }, + { "webgl.force-enabled": true }, + ); expect(second).toBe(first); expect(launch).toHaveBeenCalledTimes(1); diff --git a/typescript/tests/webgl.test.ts b/typescript/tests/webgl.test.ts index f1a71d50..33eef459 100644 --- a/typescript/tests/webgl.test.ts +++ b/typescript/tests/webgl.test.ts @@ -81,8 +81,17 @@ describe.skipIf(!MODEL.ok)("webgl (test_webgl.py)", () => { JSON.parse(fs.readFileSync(GTX_980_FIXTURE, "utf-8")), ).filter(([key]) => !removed.has(key)), ); - // WebGL1's line width range is WebGL2's since Firefox 156. + // WebGL1's line width range is WebGL2's since Firefox 156, and Firefox + // 158 adds EXT_polygon_offset_clamp on this desktop GL device. old["webGl:parameters"]["33902"] = old["webGl2:parameters"]["33902"]; + for (const key of [ + "webGl:supportedExtensions", + "webGl2:supportedExtensions", + ]) { + old[key] = [...old[key], "EXT_polygon_offset_clamp"].sort((a, b) => + a.toLowerCase() < b.toLowerCase() ? -1 : 1, + ); + } const fresh = JSON.parse( orjsonDumps(webglForGpu("lin", ...GTX_980_LINUX, 0), false), ); @@ -254,6 +263,35 @@ describe.skipIf(!MODEL.ok)("webgl (test_webgl.py)", () => { } }); + it("EXT_polygon_offset_clamp follows the backend", () => { + // Firefox 158 exposes it on ANGLE's D3D11 backend from feature level 10_0 + // (every device with WebGL2) and on Linux desktop GL (the recordings with + // EXT_depth_clamp), never on macOS's GL 4.1; fpgen's Firefox 146 records + // predate it. + for (const os of OSES) { + for (let s = 0; s < 100; s++) { + const config = sampleWebglForScreen(os, 1920, 1080, s); + const desktopGl = ( + config["webGl:supportedExtensions"] as string[] + ).includes("EXT_depth_clamp"); + const want = { win: config.webGl2Enabled, lin: desktopGl, mac: false }[ + os + ]; + for (const key of [ + "webGl:supportedExtensions", + "webGl2:supportedExtensions", + ]) { + if (key in config) { + expect( + (config[key] as string[]).includes("EXT_polygon_offset_clamp"), + `${os} ${s} ${key}`, + ).toBe(want); + } + } + } + } + }); + it("extensions are in Firefox's order", () => { // WebGLExtensionID order: alphabetical, ignoring case. const firefoxOrder = (exts: string[]) => @@ -331,7 +369,10 @@ it("draft extensions are filtered on every OS", () => { }; for (const os of OSES) { const config = toConfig(recorded, webgl2, os); - const backend = os === "win" ? ["EXT_depth_clamp"] : []; + // A device with WebGL2 is D3D11 feature level 10_0 or above, where ANGLE + // also clamps polygon offsets; the recording carries no desktop GL mark. + const backend = + os === "win" ? ["EXT_depth_clamp", "EXT_polygon_offset_clamp"] : []; expect(config["webGl:supportedExtensions"]).toEqual([ "ANGLE_instanced_arrays", ...backend,