CI: Use github environment to protect release workflow

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

.clippy.toml

@@ -0,0 +1,2 @@
+# Lint for https://github.com/advisories/GHSA-r6v5-fh4h-64xc until we upgrade to time >=0.3.47
+disallowed-types = ["time::format_description::well_known::Rfc2822"]

.config/nextest.toml

@@ -1,6 +1,7 @@
 [profile.default]
 # Print a slow warning after period, terminate unit-test after 4x period.
 slow-timeout = { period = "5s", terminate-after = 4 }
+status-level = "leak"
 
 [profile.ci]
 fail-fast = false

.devcontainer/Ubuntu.Dockerfile

@@ -0,0 +1,48 @@
+# Dockerfile for the servo devcontainer environment.
+# Note that the build-context is the repository root.
+# We use a multi-stage build to keep the final image size down.
+
+# We use a prebuilt image for `uv` to speed up builds and later copy the artifacts
+# into the final stage.
+FROM ghcr.io/astral-sh/uv:latest AS uv
+
+FROM ubuntu:24.04 AS base
+
+# Install apt dependencies.
+COPY python/servo/platform/linux_packages /tmp/linux_packages
+RUN apt-get update \
+    &&  /tmp/linux_packages/generate_pkg_list.sh /tmp/linux_packages/apt/* | xargs apt-get install -y --no-install-recommends \
+    && curl --version
+
+# Please keep `RUST_VERSION` in sync with the `rust-toolchain.toml` file.
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH \
+    UV_TOOL_BIN_DIR=/usr/local/bin \
+    RUST_VERSION=1.92.0
+
+# Keep the list of components in sync with `rust-toolchain.toml` file.
+RUN curl https://sh.rustup.rs -sSf \
+        | sh -s -- --default-toolchain ${RUST_VERSION} -y --component clippy,llvm-tools,llvm-tools-preview,rustc-dev,rustfmt,rust-src \
+    && \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
+
+# prebuilt rust tools we use
+FROM base AS rust_builder
+
+# TODO: We would need to use `ARG` and install specific versions, to ensure
+# that the tools are updated and not always cached.
+RUN cargo install cargo-deny cargo-nextest taplo-cli cargo-about --locked
+
+
+FROM base AS final
+
+COPY --from=rust_builder \
+    /usr/local/cargo/bin/cargo-deny \
+    /usr/local/cargo/bin/cargo-nextest \
+    /usr/local/cargo/bin/taplo \
+    /usr/local/cargo/bin/cargo-about \
+    /usr/local/cargo/bin/
+COPY --from=uv /uv /uvx /bin/

.devcontainer/Ubuntu.Dockerfile.dockerignore

@@ -0,0 +1,3 @@
+*
+!/.devcontainer
+!/python/servo/platform/linux_packages

.devcontainer/devcontainer.json

@@ -0,0 +1,24 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "Ubuntu",
+	"image": "ghcr.io/servo/servo/devcontainer-ubuntu:latest",
+	// Alternatively, uncomment the "build" property below to build the image from the Dockerfile in this folder.
+	// "build": {
+	// 	"dockerfile": "Ubuntu.Dockerfile",
+	// 	"context": ".."
+	// },
+
+
+	// Most dependencies are installed in the image, but we run mach bootstrap to ensure
+	// the environment matches what's expected in the current servo version, which might 
+	// have changed since the image was built.
+	"postCreateCommand":
+		"./mach bootstrap --yes",
+
+	"containerEnv": {
+		"CC": "clang",
+		"CXX": "clang++",
+		"UV_PROJECT_ENVIRONMENT": ".devcontainer-venv"
+	}
+}

.github/CODEOWNERS

@@ -39,6 +39,10 @@
 # Reviewers for XPath related code
 /components/xpath @simonwuelker
 
+# Reviewers for DevTools
+/components/devtools @atbrakhi @eerii
+/components/shared/devtools @atbrakhi @eerii
+
 # Reviewers for CI related code
 /.github/workflows @sagudev
 /.github/actions @sagudev

.github/actions/parse_msrv/action.yml

@@ -12,10 +12,10 @@ runs:
       id: parse_version
       shell: bash
       run:  |
-        msrv=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "libservo") | .rust_version')
+        msrv=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "servo") | .rust_version')
         if [[ "${msrv}" == "null" ]]; then
-          echo "Failed to determine MSRV of libservo"
+          echo "Failed to determine MSRV of servo"
           exit 1
         fi
-        echo "libservo has a minimum supported Rust version of ${msrv}."
+        echo "servo has a minimum supported Rust version of ${msrv}."
         echo "LIBSERVO_RUST_VERSION=${msrv}" >> "$GITHUB_OUTPUT"

.github/actions/setup-python/action.yml

@@ -15,10 +15,10 @@ runs:
     # symlink to this version.
     - name: Setup system python
       if: ${{ inputs.skip-python-setup != 'true' }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version-file: ${{ inputs.python-version-file-path }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v4
+      uses: astral-sh/setup-uv@v7
       with:
-        version: "0.8.5"
+        version: "0.9.21"

.github/dependabot.yml

@@ -28,6 +28,17 @@ updates:
         - "emath"
         - "epaint"
         - "epaint_default_fonts"
+    futures-rs-related:
+      patterns:
+        - "futures"
+        - "futures-channel"
+        - "futures-core"
+        - "futures-executor"
+        - "futures-io"
+        - "futures-macro"
+        - "futures-sink"
+        - "futures-task"
+        - "futures-util"
     gstreamer-related:
       patterns:
         - "gio*"
@@ -91,7 +102,6 @@ updates:
   - dependency-name: servo_arc
   - dependency-name: stylo
   - dependency-name: stylo_atoms
-  - dependency-name: stylo_config
   - dependency-name: stylo_derive
   - dependency-name: stylo_dom
   - dependency-name: stylo_malloc_size_of

.github/workflows/android.yml

@@ -1,6 +1,10 @@
 name: Android
 on:
   workflow_call:
+    outputs:
+      artifact_ids:
+        value: ${{ jobs.build.outputs.artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
     inputs:
       profile:
         required: false
@@ -33,6 +37,8 @@ jobs:
   build:
     name: Android Build
     runs-on: ubuntu-22.04
+    outputs:
+      artifact_ids: ${{ steps.artifact_ids.outputs.artifact_ids }}
     strategy:
       matrix:
         target: ['aarch64-linux-android', 'armv7-linux-androideabi', 'x86_64-linux-android']
@@ -40,9 +46,8 @@ jobs:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         with:
-          tool-cache: false
+          tool-cache: true
           android: false
-          large-packages: false
           swap-storage: false
       - uses: actions/checkout@v5
         if: github.event_name != 'pull_request_target'
@@ -57,12 +62,15 @@ jobs:
           fetch-depth: 2
       - name: Install crown
         run: cargo install --path support/crown
+      - name: Change Mirror Priorities
+        uses: ./.github/actions/apt-mirrors
       - name: Setup Python
         uses: ./.github/actions/setup-python
       - name: Bootstrap dependencies
-        run: sudo apt update && ./mach bootstrap --skip-lints --skip-nextest
+        timeout-minutes: 30
+        run: sudo apt update && ./mach bootstrap --yes --skip-lints --skip-nextest
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -99,27 +107,38 @@ jobs:
           APK_SIGNING_KEY_PASS: ${{ secrets.APK_SIGNING_KEY_PASS }}
         run: |
           ./mach build --use-crown --locked --target ${{ matrix.target }} --profile ${{ inputs.profile }}
-          cp -r target/cargo-timings target/cargo-timings-android-${{ matrix.target }}
+          mv target/cargo-timings target/cargo-timings-android-${{ matrix.target }}
       # TODO: This is disabled since APK crashes during startup.
       # See https://github.com/servo/servo/issues/31134
       # - name: Script tests
       #   run: ./mach test-android-startup
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-android-${{ matrix.target }}-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
+          if-no-files-found: error
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-apk
         with:
           name: ${{ inputs.profile }}-binary-android-${{ matrix.target }}
           path: target/android/${{ matrix.target }}/${{ inputs.profile }}/servoapp.apk
+          if-no-files-found: error
       - name: Upload AAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-aar
         with:
           name: ${{ inputs.profile }}-library-android-${{ matrix.target }}
           path: target/android/${{ matrix.target }}/${{ inputs.profile }}/servoview.aar
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        if: matrix.target == 'aarch64-linux-android'
+        id: artifact_ids
+        shell: bash
+        run: |
+          echo "artifact_ids=${{steps.upload-apk.outputs.artifact-id}},${{steps.upload-aar.outputs.artifact-id}}" >> $GITHUB_OUTPUT
 
   bencher:
     needs: ["build"]

.github/workflows/bencher.yml

@@ -58,7 +58,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           github-hosted-runner-label: ubuntu-22.04
@@ -77,8 +77,8 @@ jobs:
     name: Bencher (${{ inputs.target }}) [${{ needs.runner-select.outputs.unique-id }}]
     runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
     steps:
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
-      - uses: actions/download-artifact@v4
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
+      - uses: actions/download-artifact@v8
         with:
           name: ${{ inputs.profile }}-binary-${{ inputs.target }}
           path: ${{ inputs.profile }}-binary-${{ inputs.target }}
@@ -92,12 +92,16 @@ jobs:
       - name: Setup Python
         if: ${{ runner.environment != 'self-hosted' }}
         uses: ./.github/actions/setup-python
+      - name: Change Mirror Priorities
+        if: ${{ runner.environment != 'self-hosted' }}
+        uses: ./.github/actions/apt-mirrors
       - name: Bootstrap dependencies
         if: ${{ runner.environment != 'self-hosted' && (inputs.speedometer || inputs.dromaeo) }}
+        timeout-minutes: 30
         run: |
           sudo apt update
           sudo apt install -qy --no-install-recommends mesa-vulkan-drivers
-          ./mach bootstrap --skip-lints --skip-nextest
+          ./mach bootstrap --yes --skip-lints --skip-nextest
       - uses: bencherdev/bencher@main
       - name: File size
         if: ${{ inputs.file-size == true }}

.github/workflows/book-export.yml

@@ -0,0 +1,70 @@
+name: Book Export
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  upstream:
+    # Run job only on servo/servo
+    if: github.repository == 'servo/servo'
+    runs-on: ubuntu-latest
+    environment:
+      name: book-sync
+      deployment: false
+    steps:
+      - name: Check out Servo
+        uses: actions/checkout@v6
+        with:
+          sparse-checkout: |
+            python/servo/platform/linux_packages
+          fetch-depth: '2'
+      - name: Check out Servo book
+        uses: actions/checkout@v6
+        with:
+          path: book
+          repository: 'servo/book'
+          token: ${{ secrets.BOOK_SYNC_TOKEN }}
+      - name: Check for changes
+        working-directory: python/servo/platform/linux_packages
+        id: changes
+        run: |
+          # Note: This check assumes the action only runs on `main`.
+          if git diff --quiet HEAD HEAD^ -- . ; then
+            echo "No changes detected, exiting."
+            echo "CHANGES=false" >> $GITHUB_OUTPUT
+          else
+            echo "Changes detected, exporting book."
+            ./generate_pkg_list.sh apt/apt_common.txt > ${{github.workspace}}/book/src/building/linux_packages/apt_common.txt
+            ./generate_pkg_list.sh apt/apt_ubuntu_only.txt > ${{github.workspace}}/book/src/building/linux_packages/apt_ubuntu_only.txt
+            ./generate_pkg_list.sh dnf/dnf_base.txt > ${{github.workspace}}/book/src/building/linux_packages/dnf_base.txt
+            ./generate_pkg_list.sh xbps/xbps_base.txt > ${{github.workspace}}/book/src/building/linux_packages/xbps_base.txt
+            echo "CHANGES=true" >> $GITHUB_OUTPUT
+          fi
+      - name: Commit changes
+        working-directory: book
+        if: ${{ steps.changes.outputs.CHANGES == 'true'}}
+        run: |
+          git config --local user.email "ghbot+book-sync@servo.org"
+          git config --local user.name "Book Sync Bot"
+          git add src/building/linux_packages/
+          git commit -m "linux: Update dependency list based on servo/servo@${GITHUB_SHA::13}"
+      - name: Push changes
+        if: ${{ steps.changes.outputs.CHANGES == 'true'}}
+        working-directory: book
+        run: git push 'https://${{ secrets.BOOK_SYNC_TOKEN }}@github.com/servo-bot/book.git' 'HEAD:linux_pkgs_sync_${{ github.sha }}'
+      - name: Open PR
+        if: ${{ steps.changes.outputs.CHANGES == 'true'}}
+        env:
+          GH_TOKEN: ${{ secrets.BOOK_SYNC_CREATE_PR_TOKEN }}
+          UPDATE_BRANCH: linux_pkgs_sync_${{ github.sha }}
+        working-directory: book
+        run: |
+          BODY=$(cat <<EOF
+          Update dependency list based on servo/servo@${GITHUB_SHA}
+          EOF
+          )
+          gh pr create \
+            --title "Sync Linux packages with servo (${GITHUB_SHA::7})" \
+            --repo servo/book \
+            --body "$BODY" --head servo-bot:${{ env.UPDATE_BRANCH }}

.github/workflows/docker.yml

@@ -0,0 +1,52 @@
+#
+name: Build Docker image and push to GitHub Packages
+
+# This workflow file is adapted from the example at https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-a-registry-using-a-personal-access-token
+on:
+  push:
+    branches:
+      - main
+    # Only rebuild if the Dockerfile or dependencies change.
+    paths:
+      - '.devcontainer/**'
+      - 'python/servo/platform/linux_packages/**'
+  workflow_dispatch:
+
+jobs:
+  devcontainer_ubuntu:
+    runs-on: ubuntu-latest
+    # We probably don't want to spam the package registry of every developer
+    # thats working on servo and has actions enabled on their fork.
+    # You can comment this if to test changes to the workflow locally in your fork,
+    # use manual workflow dispatch in your fork.
+    if: github.repository_owner == 'servo' || github.event_name == 'workflow_dispatch'
+    permissions:
+      packages: write
+      contents: read
+    env:
+      IMAGE_NAME: devcontainer-ubuntu
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Build image
+        run: docker build . --file .devcontainer/Ubuntu.Dockerfile --tag ${{ env.IMAGE_NAME }} --label "runnumber=${GITHUB_RUN_ID}"
+
+      - name: Log in to registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/servo/$IMAGE_NAME
+
+          # This changes all uppercase characters to lowercase.
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+          # This strips the git ref prefix from the version.
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # This uses the Docker `latest` tag convention.
+          [ "$VERSION" == "main" ] && VERSION=latest
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+          # Todo: It would be nice to add another tag here, that has a version number, or a date-tag.
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/docs.yml

@@ -21,10 +21,12 @@ jobs:
           swap-storage: false
       - name: Setup Python
         uses: ./.github/actions/setup-python
+      - name: Change Mirror Priorities
+        uses: ./.github/actions/apt-mirrors
       - name: Bootstrap
         run: |
           sudo apt update
-          ./mach bootstrap --skip-lints --skip-nextest
+          ./mach bootstrap --yes --skip-lints --skip-nextest
       - name: Set LIBCLANG_PATH # This is needed for bindgen in mozangle.
         run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
       - name: Compile docs

.github/workflows/lint.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           # Before updating the GH action runner image for the nightly job, ensure
@@ -42,7 +42,7 @@ jobs:
     name: Lint [${{ needs.runner-select.outputs.unique-id }}]
     runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
     steps:
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           fetch-depth: 2
 
@@ -65,11 +65,15 @@ jobs:
           crate: cargo-deny
           version: 0.19.0
           locked: true
+      - name: Change Mirror Priorities
+        if: ${{ runner.environment != 'self-hosted' }}
+        uses: ./.github/actions/apt-mirrors
       - name: Bootstrap dependencies
         if: ${{ runner.environment != 'self-hosted' }}
+        timeout-minutes: 30
         run: |
           sudo apt update
-          ./mach bootstrap --skip-nextest
+          ./mach bootstrap --yes --skip-nextest
       - name: Clippy
         run: |
           ./mach clippy --locked --github-annotations -- -- --deny warnings

.github/workflows/linux-wpt.yml

@@ -32,25 +32,45 @@ env:
   WPT_ALWAYS_SUCCEED_ARG: "${{ inputs.wpt-sync-from-upstream && '--always-succeed' || '' }}"
 
 jobs:
-  chunks:
-    name: Generate chunks array
-    runs-on: ubuntu-22.04
+  # Runs the underlying job (“workload”) on a self-hosted runner if available,
+  # with the help of a `runner-select` job and a `runner-timeout` job.
+  runner-select:
+    runs-on: ubuntu-24.04
     outputs:
-      chunks-array: ${{ steps.generate-chunks-array.outputs.result }}
+      unique-id: ${{ steps.select.outputs.unique-id }}
+      selected-runner-label: ${{ steps.select.outputs.selected-runner-label }}
+      selected-runner-count: ${{ steps.select.outputs.selected-runner-count }}
+      selected-runner-indices: ${{ steps.select.outputs.selected-runner-indices }}
+      runner-type-label: ${{ steps.select.outputs.runner-type-label }}
+      is-self-hosted: ${{ steps.select.outputs.is-self-hosted }}
     steps:
-      - uses: actions/github-script@v7
-        id: generate-chunks-array
+      - name: Runner select
+        id: select
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
-          script: |
-            return Array.from({length: ${{ inputs.number-of-wpt-chunks }}}, (_, i) => i + 1)
+          GITHUB_TOKEN: ${{ github.token }}
+          # Before updating the GH action runner image for the nightly job, ensure
+          # that the system has a glibc version that is compatible with the one
+          # used by the wpt.fyi runners.
+          github-hosted-runner-label: ubuntu-22.04
+          github-hosted-runner-count: ${{ inputs.number-of-wpt-chunks }}
+          self-hosted-image-name: servo-ubuntu2204-wpt
+          self-hosted-runner-count: 3
+          # You can disable self-hosted runners globally by creating a repository variable named
+          # NO_SELF_HOSTED_RUNNERS with any non-empty value.
+          # <https://github.com/servo/servo/settings/variables/actions>
+          NO_SELF_HOSTED_RUNNERS: ${{ vars.NO_SELF_HOSTED_RUNNERS }}
+          # Any other boolean conditions that disable self-hosted runners go here.
+          force-github-hosted-runner: true
   linux-wpt:
-    name: WPT
-    runs-on: ubuntu-22.04
-    needs: chunks
+    needs:
+      - runner-select
+    name: WPT [${{ needs.runner-select.outputs.unique-id }}]
+    runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
     strategy:
       fail-fast: false
       matrix:
-        chunk_id: ${{ fromJson(needs.chunks.outputs.chunks-array) }}
+        chunk_id: ${{ fromJSON(needs.runner-select.outputs.selected-runner-indices) }}
     steps:
       - uses: actions/checkout@v5
         if: github.event_name != 'pull_request_target'
@@ -60,21 +80,27 @@ jobs:
         if: github.event_name == 'pull_request_target'
         with:
           ref: refs/pull/${{ github.event.number }}/head
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: ${{ inputs.profile }}-binary-linux
           path: ${{ inputs.profile }}-binary-linux
       - name: unPackage binary
         run: tar -xzf ${{ inputs.profile }}-binary-linux/servo-tech-demo.tar.gz
       - name: Setup Python
+        if: ${{ runner.environment != 'self-hosted' }}
         uses: ./.github/actions/setup-python
       - name: Change Mirror Priorities
+        if: ${{ runner.environment != 'self-hosted' }}
         uses: ./.github/actions/apt-mirrors
       - name: Bootstrap dependencies
+        timeout-minutes: 30
         run: |
           sudo apt update
-          sudo apt install -qy --no-install-recommends mesa-vulkan-drivers fonts-noto-cjk
-          ./mach bootstrap --skip-lints --skip-nextest
+          ./mach bootstrap --yes --skip-lints --skip-nextest
+          # FIXME #41043, #41044
+          sudo apt install -qy --no-install-recommends mesa-vulkan-drivers fonts-noto-cjk fonts-dejavu-extra
+          # FIXME #35029
+          sudo apt purge -y fonts-droid-fallback
       - name: Sync from upstream WPT
         if: ${{ inputs.wpt-sync-from-upstream }}
         run: |
@@ -83,11 +109,12 @@ jobs:
         run: |
           mkdir -p wpt-filtered-logs/linux
           mkdir -p wpt-full-logs/linux
+          nproc=$(nproc)
           ./mach test-wpt \
             --bin ${{ inputs.binary-path }} \
             $WPT_ALWAYS_SUCCEED_ARG \
-            --profile ${{ inputs.profile }} --processes $(nproc) --timeout-multiplier 2 \
-            --total-chunks ${{ inputs.number-of-wpt-chunks }} --this-chunk ${{ matrix.chunk_id }} \
+            --profile ${{ inputs.profile }} --processes $((nproc * ${{ runner.environment == 'self-hosted' && 2 || 1 }})) --timeout-multiplier 2 \
+            --total-chunks ${{ needs.runner-select.outputs.selected-runner-count }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw wpt-full-logs/linux/raw/${{ matrix.chunk_id }}.log \
             --log-wptreport wpt-full-logs/linux/wptreport/${{ matrix.chunk_id }}.json \
             --log-raw-stable-unexpected wpt-filtered-logs/linux/${{ matrix.chunk_id }}.log \
@@ -96,17 +123,19 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
       - name: Archive results (filtered)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ always() }}
         with:
           name: wpt-filtered-logs-linux-${{ matrix.chunk_id }}
           path: wpt-filtered-logs/*/
+          if-no-files-found: error
       - name: Archive results (full)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ always() }}
         with:
           name: wpt-full-logs-linux-${{ matrix.chunk_id }}
           path: wpt-full-logs/*/
+          if-no-files-found: error
 
   report-test-results:
     name: Process WPT Results
@@ -115,14 +144,14 @@ jobs:
     needs: linux-wpt
     steps:
       - name: Merge logs (full)
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: wpt-full-logs-linux
           pattern: wpt-full-logs-linux-*
           delete-merged: true
       # This job needs to be last. If no filtered results were uploaded, it will fail, but we want to merge other archives in that case.
       - name: Merge logs (filtered)
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: wpt-filtered-logs-linux
           pattern: wpt-filtered-logs-linux-*
@@ -135,7 +164,7 @@ jobs:
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream && github.event_name == 'pull_request_target' }}
         with:
           ref: refs/pull/${{ github.event.number }}/head
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
         with:
           name: wpt-filtered-logs-linux
@@ -147,10 +176,11 @@ jobs:
           cat results/linux/*.log > stable-unexpected-results.log || true
       - name: Upload aggregated results
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: stable-unexpected-results-linux
           path: stable-unexpected-results.log
+          if-no-files-found: error
       - name: Report results
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
         run: |

.github/workflows/linux.yml

@@ -1,6 +1,10 @@
 name: Linux
 on:
   workflow_call:
+    outputs:
+      artifact_ids:
+        value: ${{ jobs.build.outputs.artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
     inputs:
       profile:
         required: false
@@ -101,7 +105,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           # Before updating the GH action runner image for the nightly job, ensure
@@ -121,8 +125,10 @@ jobs:
       - runner-select
     name: Linux Build [${{ needs.runner-select.outputs.unique-id }}]
     runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
+    outputs:
+      artifact_ids: ${{ steps.artifact_ids.outputs.artifact_ids }}
     steps:
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         if: ${{ runner.environment != 'self-hosted' }}
@@ -144,12 +150,12 @@ jobs:
           tool: nextest
       - name: Bootstrap dependencies
         if: ${{ runner.environment != 'self-hosted' }}
-        timeout-minutes: 10
+        timeout-minutes: 30
         run: |
           sudo apt update
           echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections
           sudo apt install -qy tshark
-          ./mach bootstrap --skip-lints
+          ./mach bootstrap --yes --skip-lints
 
       # Always install crown, even on self-hosted runners, because it is tightly
       # coupled to the rustc version, and we may have the wrong version if the
@@ -160,7 +166,7 @@ jobs:
       - name: Build (${{ inputs.profile }})
         run: |
           ./mach build --use-crown --locked --profile ${{ inputs.profile }} ${{ inputs.build-args }}
-          cp -r target/cargo-timings target/cargo-timings-linux
+          mv target/cargo-timings target/cargo-timings-linux
       - name: Smoketest
         run: xvfb-run ./mach smoketest --profile ${{ inputs.profile  }}
       - name: Script tests
@@ -170,6 +176,7 @@ jobs:
         if: ${{ inputs.unit-tests }}
         env:
           NEXTEST_RETRIES: 2 # https://github.com/servo/servo/issues/30683
+          LANG: en-US
         run: ./mach test-unit --profile ${{ inputs.profile }} --nextest-profile ci
       # We upload the test-results to Codecov to help us identify flaky unit-tests.
       - name: Upload test results to Codecov
@@ -185,21 +192,29 @@ jobs:
           flags: unittests,unittests-linux,unittests-linux-${{ inputs.profile }}
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Devtools tests
-        if: ${{ false && inputs.unit-tests }}  # FIXME #39273
+        if: ${{ false && inputs.unit-tests }} # FIXME #39273
         run: ./mach test-devtools --profile ${{ inputs.profile }}
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-linux-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
+          if-no-files-found: error
       - name: Build mach package
         run: ./mach package --profile ${{ inputs.profile }}
       - name: Upload artifact for mach package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-tarball
         with:
           name: ${{ inputs.profile }}-binary-linux
           path: target/${{ inputs.profile }}/servo-tech-demo.tar.gz
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        id: artifact_ids
+        shell: bash
+        run: |
+          echo "artifact_ids=${{steps.upload-tarball.outputs.artifact-id}}" >> $GITHUB_OUTPUT
 
   wpt-2020:
     if: ${{ inputs.wpt }}
@@ -211,7 +226,7 @@ jobs:
       profile: ${{ inputs.profile }}
       wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }}
       number-of-wpt-chunks: ${{ inputs. number-of-wpt-chunks }}
-      binary-path: servo/servo
+      binary-path: servo/servoshell
     secrets: inherit
 
   bencher:
@@ -219,10 +234,10 @@ jobs:
     if: ${{ inputs.bencher && inputs.profile != 'debug' && github.event_name != 'workflow_dispatch' && github.event_name != 'merge_group' }}
     uses: ./.github/workflows/bencher.yml
     with:
-      target: 'linux'
+      target: "linux"
       profile: ${{ inputs.profile }}
       compressed-file-path: ${{ inputs.profile }}-binary-linux/servo-tech-demo.tar.gz
-      binary-path: servo/servo
+      binary-path: servo/servoshell
       file-size: true
       # We only evaluate speedometer and dromaeo score in release
       speedometer: ${{ inputs.profile == 'release' }}
@@ -263,9 +278,17 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ steps.msrv.outputs.rust_version }}
+      # We can remove this after upgrading to Rust 1.90, but for now
+      # installing lld is the easiest way to get it in path.
+      - name: install lld
+        run: sudo apt-get install -y lld
       - name: Compile libservo with MSRV
+        env:
+          # lld seems to use less memory and prevents OOM errors during linking.
+          # We can remove this after upgrading to Rust 1.90, where lld will be the default.
+          RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
         run: |
-          cargo +${{ steps.msrv.outputs.rust_version }} build -p libservo --locked --all-targets
+          cargo +${{ steps.msrv.outputs.rust_version }} build -p servo --locked
 
   # Runs the underlying job (“workload”) on a self-hosted runner if available.
   runner-select-coverage:
@@ -278,7 +301,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           # Before updating the GH action runner image for the nightly job, ensure
@@ -300,7 +323,7 @@ jobs:
     runs-on: ${{ needs.runner-select-coverage.outputs.selected-runner-label }}
     continue-on-error: true
     steps:
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         if: ${{ runner.environment != 'self-hosted' }}
@@ -324,10 +347,11 @@ jobs:
           tool: cargo-llvm-cov,cargo-nextest
       - name: Bootstrap dependencies
         if: ${{ runner.environment != 'self-hosted' }}
+        timeout-minutes: 30
         shell: bash
         run: |
           sudo apt update
-          ./mach bootstrap --skip-lints
+          ./mach bootstrap --yes --skip-lints
       - name: Determine options
         id: options
         run: |
@@ -343,6 +367,7 @@ jobs:
         shell: bash
         env:
           NEXTEST_RETRIES: 2 # https://github.com/servo/servo/issues/30683
+          LANG: en-US
         run: |
           ./mach test-unit --code-coverage \
               --profile=${{ steps.options.outputs.cargo_profile }} \
@@ -355,3 +380,75 @@ jobs:
           files: codecov.json,support/crown/codecov.json
           fail_ci_if_error: true
           flags: unittests
+
+  media-examples:
+    name: Media Examples
+    if: ${{ inputs.unit-tests }}
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v5
+        if: github.event_name != 'pull_request_target'
+        with:
+          fetch-depth: 1
+      # This is necessary to checkout the pull request if this run was triggered via a
+      # `pull_request_target` event.
+      - uses: actions/checkout@v5
+        if: github.event_name == 'pull_request_target'
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 1
+      - name: Change Mirror Priorities
+        uses: ./.github/actions/apt-mirrors
+      - name: Install Dependencies
+        run: |
+          sudo bash -c 'apt-add-repository -y https://mirrors.kernel.org/ubuntu'
+          sudo apt update
+          sudo apt install -y \
+            gstreamer1.0-libav \
+            gstreamer1.0-plugins-bad \
+            gstreamer1.0-plugins-base \
+            gstreamer1.0-plugins-good \
+            gstreamer1.0-plugins-ugly \
+            gstreamer1.0-tools \
+            jackd2 \
+            libasound2-plugins \
+            libfaad2 \
+            libffi7 \
+            libfftw3-single3 \
+            libges-1.0-dev \
+            libgstreamer-plugins-bad1.0-dev\
+            libgstreamer-plugins-base1.0-dev \
+            libgstreamer1.0-dev \
+            libgstrtspserver-1.0-dev \
+            libjack-jackd2-0 \
+            libmms0 \
+            libmpg123-0 \
+            libopus0 \
+            liborc-0.4-0 \
+            liborc-0.4-dev \
+            libpulsedsp \
+            libsamplerate0 \
+            libspeexdsp1 \
+            libtdb1 \
+            libtheora0 \
+            libtwolame0 \
+            libwayland-egl1-mesa \
+            libwebrtc-audio-processing1 \
+            pulseaudio \
+            pulseaudio-utils \
+            webp
+      - name: Determine MSRV
+        id: msrv
+        uses: ./.github/actions/parse_msrv
+      - name: Install MSRV
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ steps.msrv.outputs.rust_version }}
+      - name: Virtual Audio Devices
+        run: |
+          jackd -d dummy &
+          pulseaudio --start
+          gst-inspect-1.0 | grep Total
+      - name: Run Examples
+        run: |
+          ls components/media/examples/examples/*.rs | xargs -I{} basename  {} .rs  | grep -v params_connect | RUST_BACKTRACE=1 GST_DEBUG=3 xargs -I{} cargo run -p servo-media-examples --example {}

.github/workflows/mac-arm64.yml

@@ -2,6 +2,10 @@ name: MacOS Arm64
 
 on:
   workflow_call:
+    outputs:
+      artifact_ids:
+        value: ${{ jobs.build.outputs.artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
     inputs:
       profile:
         required: false
@@ -68,12 +72,19 @@ on:
 env:
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
+  # Increment this to purge the cache (https://github.com/mozilla/sccache/blob/main/docs/GHA.md)
+  SCCACHE_GHA_VERSION: 1
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+  CCACHE: "sccache"
   CARGO_INCREMENTAL: 0
 
 jobs:
   build:
     name: MacOS 15 Build
     runs-on: macos-15
+    outputs:
+      artifact_ids: ${{ steps.artifact_ids.outputs.artifact_ids }}
     steps:
       # XProtect can cause random failures if it decides that the DMG we create
       # during the packaging phase is malware.
@@ -105,6 +116,8 @@ jobs:
       - if: runner.environment != 'self-hosted'
         name: Setup Python
         uses: ./.github/actions/setup-python
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.9
 
       # Always install crown, even on self-hosted runners, because it is tightly
       # coupled to the rustc version, and we may have the wrong version if the
@@ -119,12 +132,12 @@ jobs:
       - if: runner.environment != 'self-hosted'
         name: Bootstrap
         run: |
-          ./mach bootstrap --skip-lints
+          ./mach bootstrap --yes --skip-lints
           brew install gnu-tar
       - name: Build (${{ inputs.profile }})
         run: |
           ./mach build --use-crown --locked --profile ${{ inputs.profile }}  ${{ inputs.build-args }}
-          cp -r target/cargo-timings target/cargo-timings-macos-arm64
+          mv target/cargo-timings target/cargo-timings-macos-arm64
       - name: Smoketest
         uses: nick-fields/retry@v3
         with: # See https://github.com/servo/servo/issues/30757
@@ -164,23 +177,32 @@ jobs:
           max_attempts: 2
           command: ./etc/ci/macos_package_smoketest.sh target/${{ inputs.profile }}/servo-tech-demo.dmg
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-macos-arm64-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
+          if-no-files-found: error
       - name: Upload artifact for mach package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-dmg
         with:
           name: ${{ inputs.profile }}-binary-mac-arm64
           path: target/${{ inputs.profile }}/servo-tech-demo.dmg
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        id: artifact_ids
+        shell: bash
+        run: |
+          echo "artifact_ids=${{ steps.upload-dmg.outputs.artifact-id }}" >> $GITHUB_OUTPUT
       - name: Build package for target
-        run: gtar -czf target.tar.gz target/${{ inputs.profile }}/servo target/${{ inputs.profile }}/lib/*.dylib resources
+        run: gtar -czf target.tar.gz target/${{ inputs.profile }}/servoshell target/${{ inputs.profile }}/lib/*.dylib resources
       - name: Upload package for target
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ inputs.profile }}-binary-macos-arm64
           path: target.tar.gz
+          if-no-files-found: error
 
   wpt-2020:
     if: ${{ inputs.wpt }}
@@ -201,7 +223,7 @@ jobs:
       target: 'macos-arm64'
       profile: ${{ inputs.profile }}
       compressed-file-path: ${{ inputs.profile }}-binary-macos-arm64/target.tar.gz
-      binary-path: target/${{ inputs.profile }}/servo
+      binary-path: target/${{ inputs.profile }}/servoshell
       file-size: true
       speedometer: false
       dromaeo: false
@@ -234,4 +256,4 @@ jobs:
           toolchain: ${{ steps.msrv.outputs.rust_version }}
       - name: Compile libservo with MSRV
         run: |
-          cargo +${{ steps.msrv.outputs.rust_version }} build -p libservo --locked --all-targets
+          cargo +${{ steps.msrv.outputs.rust_version }} build -p servo --locked

.github/workflows/mac-wpt.yml

@@ -38,7 +38,7 @@ jobs:
         if: github.event_name == 'pull_request_target'
         with:
           ref: refs/pull/${{ github.event.number }}/head
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: ${{ inputs.profile }}-binary-${{ env.NAME }}
       - name: Setup Python
@@ -47,7 +47,7 @@ jobs:
         timeout-minutes: 60
         run: |
           gtar -xzf target.tar.gz
-          ./mach bootstrap --skip-lints --skip-nextest
+          ./mach bootstrap --yes --skip-lints --skip-nextest
       - name: Smoketest
         run: ./mach smoketest --profile ${{ inputs.profile }}
       - name: Run tests
@@ -62,17 +62,19 @@ jobs:
             --filter-intermittents wpt-filtered-logs/${{ env.NAME }}/${{ matrix.chunk_id }}.json
             ${{ inputs.wpt-args }}
       - name: Archive results (filtered)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ always() }}
         with:
           name: wpt-filtered-logs-${{ env.NAME }}-${{ matrix.chunk_id }}
           path: wpt-filtered-logs/*/
+          if-no-files-found: error
       - name: Archive results (full)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: ${{ always() }}
         with:
           name: wpt-full-logs-${{ env.NAME }}-${{ matrix.chunk_id }}
           path: wpt-full-logs/*/
+          if-no-files-found: error
 
   report-test-results:
     name: Process WPT Results
@@ -81,13 +83,13 @@ jobs:
     needs: mac-wpt
     steps:
       - name: Merge logs (filtered)
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: wpt-filtered-logs-${{ env.NAME }}
           pattern: wpt-filtered-logs-${{ env.NAME }}-*
           delete-merged: true
       - name: Merge logs (full)
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: wpt-full-logs-${{ env.NAME }}
           pattern: wpt-full-logs-${{ env.NAME }}-*
@@ -103,11 +105,12 @@ jobs:
           cat results/${{ env.NAME }}/*.log > stable-unexpected-results.log || true
       - name: Upload aggregated results
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: stable-unexpected-results-${{ env.NAME }}
           path: stable-unexpected-results.log
-      - uses: actions/download-artifact@v4
+          if-no-files-found: error
+      - uses: actions/download-artifact@v8
         if: ${{ !cancelled() }}
         with:
           name: wpt-filtered-logs-${{ env.NAME }}

.github/workflows/mac.yml

@@ -2,6 +2,10 @@ name: MacOS
 
 on:
   workflow_call:
+    outputs:
+      artifact_ids:
+        value: ${{ jobs.build.outputs.artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
     inputs:
       profile:
         required: false
@@ -83,7 +87,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           github-hosted-runner-label: macos-15-intel
@@ -100,6 +104,8 @@ jobs:
       - runner-select
     name: MacOS Build [${{ needs.runner-select.outputs.unique-id }}]
     runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
+    outputs:
+      artifact_ids: ${{ steps.artifact_ids.outputs.artifact_ids }}
     steps:
       # XProtect can cause random failures if it decides that the DMG we create
       # during the packaging phase is malware.
@@ -108,7 +114,7 @@ jobs:
       - name: Kill XProtectBehaviorService
         run: |
           echo Killing XProtect.; sudo pkill -9 XProtect >/dev/null || true;
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
 
       - if: runner.environment != 'self-hosted'
         name: Setup Python
@@ -127,12 +133,12 @@ jobs:
       - if: runner.environment != 'self-hosted'
         name: Bootstrap
         run: |
-          ./mach bootstrap --skip-lints
+          ./mach bootstrap --yes --skip-lints
           brew install gnu-tar
       - name: Build (${{ inputs.profile }})
         run: |
           ./mach build --use-crown --locked --profile ${{ inputs.profile }}  ${{ inputs.build-args }}
-          cp -r target/cargo-timings target/cargo-timings-macos
+          mv target/cargo-timings target/cargo-timings-macos
       - name: Smoketest
         uses: nick-fields/retry@v3
         with: # See https://github.com/servo/servo/issues/30757
@@ -172,23 +178,32 @@ jobs:
           max_attempts: 2
           command: ./etc/ci/macos_package_smoketest.sh target/${{ inputs.profile }}/servo-tech-demo.dmg
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-macos-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
+          if-no-files-found: error
       - name: Upload artifact for mach package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-dmg
         with:
           name: ${{ inputs.profile }}-binary-mac
           path: target/${{ inputs.profile }}/servo-tech-demo.dmg
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        id: artifact_ids
+        shell: bash
+        run: |
+          echo "artifact_ids=${{ steps.upload-dmg.outputs.artifact-id }}" >> $GITHUB_OUTPUT
       - name: Build package for target
-        run: gtar -czf target.tar.gz target/${{ inputs.profile }}/servo target/${{ inputs.profile }}/lib/*.dylib resources
+        run: gtar -czf target.tar.gz target/${{ inputs.profile }}/servoshell target/${{ inputs.profile }}/lib/*.dylib resources
       - name: Upload package for target
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ inputs.profile }}-binary-macos
           path: target.tar.gz
+          if-no-files-found: error
 
   wpt-2020:
     if: ${{ inputs.wpt }}
@@ -209,7 +224,7 @@ jobs:
       target: 'macos'
       profile: ${{ inputs.profile }}
       compressed-file-path: ${{ inputs.profile }}-binary-macos/target.tar.gz
-      binary-path: target/${{ inputs.profile }}/servo
+      binary-path: target/${{ inputs.profile }}/servoshell
       file-size: true
       speedometer: false
       dromaeo: false
@@ -242,4 +257,4 @@ jobs:
           toolchain: ${{ steps.msrv.outputs.rust_version }}
       - name: Compile libservo with MSRV
         run: |
-          cargo +${{ steps.msrv.outputs.rust_version }} build -p libservo --locked --all-targets
+          cargo +${{ steps.msrv.outputs.rust_version }} build -p servo --locked

.github/workflows/main.yml

@@ -27,6 +27,7 @@ jobs:
             python/servo/try_parser.py
             .github/actions/setup-python
             .python-version
+            uv.lock
           sparse-checkout-cone-mode: false
       - name: Setup Python
         uses: ./.github/actions/setup-python
@@ -35,7 +36,7 @@ jobs:
         run: |
           {
             echo 'result<<EOF'
-            python ./python/servo/try_parser.py ${{ github.event_name == 'pull_request' && 'linux-unit-tests lint' || github.event_name == 'push' && 'full macos bencher production-bencher coverage' || 'fail-fast full macos-arm-unit-tests' }}
+            python ./python/servo/try_parser.py ${{ github.event_name == 'pull_request' && 'linux-unit-tests lint' || github.event_name == 'push' && 'full macos bencher production-bencher coverage' || 'fail-fast full' }}
             echo EOF
            } >> $GITHUB_OUTPUT
 
@@ -70,7 +71,7 @@ jobs:
       - build
     steps:
       - name: Merge build timings
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: cargo-timings
           pattern: cargo-timings-*

.github/workflows/nightly.yml

@@ -1,329 +0,0 @@
-name: Release nightly
-
-on:
-  schedule:
-    # Run at 5:30 am, daily.
-    - cron: '15 5 * * *'
-  workflow_dispatch:
-
-env:
-  RUST_BACKTRACE: 1
-  SHELL: /bin/bash
-
-jobs:
-  create-draft-release:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Create Draft GH Release
-    runs-on: ubuntu-latest
-    steps:
-      - id: create-release
-        run: |
-          NIGHTLY_TAG=$(date "+%F")
-          RELEASE_URL=$(gh release create "${NIGHTLY_TAG}" \
-            --draft \
-            --title "${NIGHTLY_TAG}" \
-            --notes 'Nightly builds based on servo/servo@${{ github.sha }}' \
-            --repo ${NIGHTLY_REPO})
-          TEMP_TAG=$(basename "$RELEASE_URL")
-          RELEASE_ID=$( \
-            gh api -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "/repos/${NIGHTLY_REPO}/releases/tags/${TEMP_TAG}" \
-            | jq '.id' \
-          )
-          echo "RELEASE_ID=${RELEASE_ID}" >> ${GITHUB_OUTPUT}
-        env:
-          GITHUB_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-    outputs:
-      release-id: ${{ steps.create-release.outputs.RELEASE_ID }}
-
-  publish-nightly-release:
-    # This job is only useful when run on upstream servo.
-    if: always() && (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
-    name: Publish GH Release for nightly
-    runs-on: ubuntu-latest
-    steps:
-      - name: Publish as latest (success)
-        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
-        run: |
-          gh api \
-            --method PATCH \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            /repos/${NIGHTLY_REPO}/releases/${RELEASE_ID} \
-            -F draft=false
-      - name: Publish as latest (failure)
-        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
-        run: |
-          gh api \
-            --method PATCH \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            /repos/${NIGHTLY_REPO}/releases/${RELEASE_ID} \
-            -F prerelease=true -F draft=false
-    env:
-      GITHUB_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-      NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-      RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
-    needs:
-      - create-draft-release
-      - upload-linux
-      - upload-win
-      - upload-mac
-      - upload-mac-arm64
-      - upload-android
-      - upload-ohos
-
-  build-win:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (Windows)
-    uses: ./.github/workflows/windows.yml
-    with:
-      profile: "production"
-      upload_zip: true
-      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
-
-  upload-win:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    needs:
-      - create-draft-release
-      - build-win
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-windows
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-windows-zip
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly windows-msvc --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            Servo.exe \
-            Servo.zip
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-
-
-  build-mac:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (macOS)
-    uses: ./.github/workflows/mac.yml
-    with:
-      profile: "production"
-      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
-
-  upload-mac:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    needs:
-      - create-draft-release
-      - build-mac
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-mac
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly mac --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            servo-tech-demo.dmg
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-
-  build-mac-arm64:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (macOS Arm64)
-    uses: ./.github/workflows/mac-arm64.yml
-    with:
-      profile: "production"
-      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
-
-  upload-mac-arm64:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    needs:
-      - create-draft-release
-      - build-mac-arm64
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-mac-arm64
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly mac-arm64 --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            servo-tech-demo.dmg
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          # TODO: this appears unused, can we remove it?
-          GITHUB_HOMEBREW_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-
-  build-linux:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (Linux)
-    uses: ./.github/workflows/linux.yml
-    with:
-      profile: "production"
-      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
-
-  upload-linux:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    needs:
-      - create-draft-release
-      - build-linux
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-linux
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly linux --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            servo-tech-demo.tar.gz
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-
-  build-android:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (Android)
-    uses: ./.github/workflows/android.yml
-    with:
-      profile: "release"
-    secrets: inherit
-
-  upload-android:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      attestations: write
-    needs:
-      - create-draft-release
-      - build-android
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: release-binary-android-aarch64-linux-android
-      - uses: actions/download-artifact@v7
-        with:
-          name: release-library-android-aarch64-linux-android
-      - name: Generate artifact attestation for APK
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-path: servoapp.apk
-      - name: Generate artifact attestation for AAR
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-path: servoview.aar
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly android \
-            --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            servoapp.apk \
-            servoview.aar
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-
-
-  build-ohos:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    name: Build nightly (OpenHarmony)
-    uses: ./.github/workflows/ohos.yml
-    with:
-      profile: "production"
-      upload_library: true
-    secrets: inherit
-
-  upload-ohos:
-    # This job is only useful when run on upstream servo.
-    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      attestations: write
-    needs:
-      - create-draft-release
-      - build-ohos
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: '1'
-      - name: Setup Python
-        uses: ./.github/actions/setup-python
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-library-ohos-aarch64-unknown-linux-ohos
-      - name: Generate artifact attestation for shared library
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-path: libservoshell.so
-      - uses: actions/download-artifact@v7
-        with:
-          name: production-binary-ohos-aarch64-unknown-linux-ohos
-      - name: Generate artifact attestation for HAP
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-path: servoshell-default-signed.hap
-      - name: Upload nightly
-        run: |
-          ./mach upload-nightly ohos \
-            --secret-from-environment \
-            --github-release-id ${{ needs.create-draft-release.outputs.release-id }} \
-            libservoshell.so \
-            servoshell-default-signed.hap
-        env:
-          S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-          NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-          NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds

.github/workflows/ohos.yml

@@ -15,6 +15,9 @@ on:
         default: false
         type: boolean
     outputs:
+      artifact_ids:
+        value: ${{ jobs.build-openharmony.outputs.artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
       optional_job_status:
         description: "Status of optional jobs (as an object)"
         value: ${{ jobs.collect-job-results.outputs.collected_job_status }}
@@ -36,25 +39,28 @@ env:
   SHELL: /bin/bash
   CARGO_INCREMENTAL: 0
   BENCHER_PROJECT: ${{ vars.BENCHER_PROJECT || 'servo' }}
-  HITRACE_BENCH_VERSION: 0.9.0
+  HITRACE_BENCH_VERSION: 0.11.1
+  MITMDUMP_CACHE_KEY: mitmdump-ohos-cache-0.1
 
 jobs:
-  build:
+  build-openharmony:
     name: OpenHarmony Build
-    runs-on: ubuntu-22.04
+    timeout-minutes: 60
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         target: ["aarch64-unknown-linux-ohos", "x86_64-unknown-linux-ohos"]
     outputs:
+      artifact_ids: ${{ steps.artifact_ids.outputs.artifact_ids }}
       signed: ${{ steps.signing_config.outputs.signed }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: github.event_name != 'pull_request_target'
         with:
           fetch-depth: 2
       # This is necessary to checkout the pull request if this run was triggered via a
       # `pull_request_target` event.
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: github.event_name == 'pull_request_target'
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -63,18 +69,21 @@ jobs:
         run: cargo install --path support/crown
       - name: Setup Python
         uses: ./.github/actions/setup-python
+      - name: Change Mirror Priorities
+        uses: ./.github/actions/apt-mirrors
       - name: Bootstrap dependencies
-        run: sudo apt update && ./mach bootstrap --skip-lints --skip-nextest
+        timeout-minutes: 30
+        run: sudo apt update && ./mach bootstrap --yes --skip-lints --skip-nextest
       - name: Setup OpenHarmony SDK
         id: setup_sdk
-        uses: openharmony-rs/setup-ohos-sdk@v0.2.3
+        uses: openharmony-rs/setup-ohos-sdk@v0.2.4
         with:
-          version: "5.0.2"
+          version: "6.0.0.1" # api 20 in openharmony
           fixup-path: true
       - name: Install node for hvigor
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
       - name: Install hvigor modules
         run: |
           mkdir ~/hvigor-installation
@@ -99,34 +108,49 @@ jobs:
           OHOS_BASE_SDK_HOME: ${{ steps.setup_sdk.outputs.ohos-base-sdk-home }}
         run: |
           ./mach build --locked --target ${{ matrix.target }} --profile ${{ inputs.profile }}
-          cp -r target/cargo-timings target/cargo-timings-ohos-${{ matrix.target }}
+          mv target/cargo-timings target/cargo-timings-ohos-${{ matrix.target }}
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-ohos-${{ matrix.target }}-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
+          if-no-files-found: error
       - name: Upload shared library
         if: ${{ inputs.upload_library }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-library
         with:
           name: ${{ inputs.profile }}-library-ohos-${{ matrix.target }}
-          path: target/aarch64-unknown-linux-ohos/production/libservoshell.so
+          path: target/${{ matrix.target }}/${{ inputs.profile }}/libservoshell.so
+          if-no-files-found: error
       - name: Upload signed HAP artifact
         if: ${{ env.SERVO_OHOS_SIGNING_CONFIG != '' }} # Build output has different name if not signed.
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-hap-signed
         with:
           name: ${{ inputs.profile }}-binary-ohos-${{ matrix.target }}
           path: target/openharmony/${{ matrix.target }}/${{ inputs.profile }}/entry/build/default/outputs/default/servoshell-default-signed.hap
+          if-no-files-found: error
       - name: Upload unsigned HAP artifact
         if: ${{ env.SERVO_OHOS_SIGNING_CONFIG == '' }} # Build output has different name if not signed.
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-hap-unsigned
         with:
           name: ${{ inputs.profile }}-binary-ohos-${{ matrix.target }}
           path: target/openharmony/${{ matrix.target }}/${{ inputs.profile }}/entry/build/default/outputs/default/servoshell-default-unsigned.hap
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        # The implicit assumption here is that `upload_library` is true and the signed hap is uploaded,
+        # since this output will only be consumed by the release workflow.
+        if: matrix.target == 'aarch64-unknown-linux-ohos'
+        id: artifact_ids
+        shell: bash
+        run: |
+          echo "artifact_ids=${{steps.upload-library.outputs.artifact-id}},${{steps.upload-hap-signed.outputs.artifact-id}}" >> $GITHUB_OUTPUT
 
   bencher:
-    needs: ["build"]
+    needs: ["build-openharmony"]
     strategy:
       matrix:
         target: ["aarch64-unknown-linux-ohos", "x86_64-unknown-linux-ohos"]
@@ -135,7 +159,7 @@ jobs:
     with:
       target: ohos-${{ matrix.target }}
       profile: ${{ inputs.profile }}
-      compressed-file-path: ${{ inputs.profile }}-binary-ohos-${{ matrix.target }}/servoshell-default-${{ needs.build.outputs.signed && 'signed' || 'unsigned' }}.hap
+      compressed-file-path: ${{ inputs.profile }}-binary-ohos-${{ matrix.target }}/servoshell-default-${{ needs.build-openharmony.outputs.signed && 'signed' || 'unsigned' }}.hap
       binary-path: libs/${{ matrix.target == 'aarch64-unknown-linux-ohos' && 'arm64-v8a' || matrix.target == 'x86_64-unknown-linux-ohos' && 'x86_64' }}/libservoshell.so
       file-size: true
       speedometer: false
@@ -146,6 +170,7 @@ jobs:
   # if we figure out how to make hvigor build for harmonyos without the HOS commandline-tools installed.
   build-harmonyos-aarch64:
     name: HarmonyOS Build (aarch64)
+    timeout-minutes: 60
     runs-on: hos-builder
     if: github.repository == 'servo/servo'
     outputs:
@@ -165,81 +190,12 @@ jobs:
       - name: Build for aarch64 HarmonyOS
         run: |
           ./mach build --locked --target aarch64-unknown-linux-ohos --profile=${{ inputs.profile }} --flavor=harmonyos --no-default-features --features tracing,tracing-hitrace
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           # Upload the **unsigned** artifact - We don't have the signing materials in pull request workflows
           name: servoshell-hos-${{ inputs.profile }}.hap
           path: target/openharmony/aarch64-unknown-linux-ohos/${{ inputs.profile }}/entry/build/harmonyos/outputs/default/servoshell-default-unsigned.hap
-      - name: Save result as job output
-        id: result
-        if: always()
-        run: echo "JOB_STATUS=${{ job.status }}" | tee $GITHUB_OUTPUT
-
-  test-harmonyos-aarch64:
-    name: Test HarmonyOS aarch64
-    # Don't block servos Merge queue on this job failing.
-    # Since we just added this, there might be some hidden issues,
-    # so in the beginning we will just do a best effort approach but ignore errors.
-    continue-on-error: true
-    runs-on: hos-runner
-    if: github.repository == 'servo/servo' && needs.build-harmonyos-aarch64.outputs.job_status == 'success'
-    needs: build-harmonyos-aarch64
-    outputs:
-      job_status: ${{ steps.result.outputs.JOB_STATUS }}
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          # Name of the artifact to download.
-          # If unspecified, all artifacts for the run are downloaded.
-          name: servoshell-hos-${{ inputs.profile }}.hap
-      - name: Test hdc device
-        # First we ensure a device is actually connected and working.
-        run: hdc list targets && hdc shell echo hello world
-      - name: Sign the hap
-        run: |
-          ls -la
-          /usr/bin/sign-hos.sh servoshell-default-unsigned.hap servoshell-hos-signed.hap
-      - name: Install
-        run: |
-          # Uninstall first. hdc is not very reliable in terms of exiting with an error, so we uninstall first
-          # to make sure we don't use a previous version if installation failed for some reason.
-          hdc uninstall org.servo.servo
-          hdc install -r servoshell-hos-signed.hap
-      - name: Test loading servo.org
-        env:
-          TRACE_BUFFER_SZ_KB: "524288" # 512 MB
-        run: |
-          mkdir test_output
-          hdc shell aa force-stop org.servo.servo
-          # Hitrace allows us to save application and system traces, which is useful to analyze performance.
-          # The main reason however, is that we can use the application traces to determine if servo
-          # successfully reaches certain locations in the code, in particular if a page is successfully loaded.
-          hdc shell hitrace -b "${TRACE_BUFFER_SZ_KB}" app graphic ohos freq idle memory --trace_begin
-          # We start servo, tell it to load a website (servo.org).
-          hdc shell aa start -a EntryAbility -b org.servo.servo -U https://servo.org
-          servo_pid=$(hdc shell pidof org.servo.servo)
-          # We don't really know how long servo needs to load a webpage, so we just wait 10s.
-          sleep 10
-          # We dump the trace in ftrace format to disk
-          hdc shell hitrace -b "${TRACE_BUFFER_SZ_KB}" --trace_finish -o /data/local/tmp/ohtrace.txt
-          hdc shell snapshot_display -f /data/local/tmp/servo.jpeg
-          hdc file recv /data/local/tmp/servo.jpeg  test_output/servo_hos_screenshot.jpeg
-          hdc file recv /data/local/tmp/ohtrace.txt  test_output/servo.ftrace
-          # To limit the logsize we only save logs from servo.
-          hdc shell hilog --exit -D 0xE0C3 > test_output/servo.log
-      # todo: Also benchmark some other websites....
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          path: test_output
-          name: hos-${{ inputs.profile }}-test-output
-      - name: Check success
-        run: |
-          # would be empty if servo crashed.
-          servo_pid=$(hdc shell pidof org.servo.servo)
-          [[ $servo_pid =~ ^[0-9]+$ ]] || { echo "It looks like servo crashed!" ; exit 1; }
-          # If the grep fails, then the trace output for the "page loaded" prompt is missing
-          grep 'tracing_mark_write.*PageLoadEndedPrompt' test_output/servo.ftrace
+          if-no-files-found: error
       - name: Save result as job output
         id: result
         if: always()
@@ -247,17 +203,18 @@ jobs:
 
   bench-harmonyos-aarch64:
     name: Benching HarmonyOS aarch64
+    timeout-minutes: 40
     env:
       # This will ensure the scenario pyproject.toml is picked up and the correct venv used.
       UV_PROJECT: "etc/ci/scenario"
     continue-on-error: true
     runs-on: hos-runner
-    needs: test-harmonyos-aarch64
+    needs: build-harmonyos-aarch64
     outputs:
       job_status: ${{ steps.result.outputs.JOB_STATUS }}
     if: github.repository == 'servo/servo' && needs.build-harmonyos-aarch64.outputs.job_status == 'success'
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           # Name of the artifact to download.
           # If unspecified, all artifacts for the run are downloaded.
@@ -276,13 +233,13 @@ jobs:
           # to make sure we don't use a previous version if installation failed for some reason.
           hdc uninstall org.servo.servo
           hdc install -r servoshell-hos-signed.hap
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: github.event_name != 'pull_request_target'
         with:
           fetch-depth: 0
       # This is necessary to checkout the pull request if this run was triggered via a
       # `pull_request_target` event.
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         if: github.event_name == 'pull_request_target'
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -332,9 +289,32 @@ jobs:
       - name: Setup complete
         id: setup_complete
         run: echo "Setup complete"
+      - name: Get mitmproxy cache
+        id: mitmproxy-cache
+        uses: actions/cache@v5
+        with:
+          path: /tmp/mitmproxy-dump
+          key: ${{ env.MITMDUMP_CACHE_KEY }}
+      - name: Generate mitmproxy dump
+        if: steps.mitmproxy-cache.outputs.cache-hit != 'true'
+        run: uv run etc/ci/scenario/update_mitmproxy_dump.py /tmp/mitmproxy-dump
+      - name: Save Cache
+        if: steps.mitmproxy-cache.outputs.cache-hit != 'true'
+        id: cache-mitmproxy-save
+        uses: actions/cache/save@v5
+        with:
+          path: /tmp/mitmproxy-dump
+          key: ${{ env.MITMDUMP_CACHE_KEY }}
       - name: "Run benchmark"
         id: hitrace_bench
         run: hitrace-bench -r support/hitrace-bencher/runs.json --bencher -p ${{ inputs.profile }}
+      - name: Upload failure screenshots
+        if: ${{ steps.hitrace_bench.success == 'failure' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: bencher-${{ inputs.profile }}-failure-screenshot
+          path: "/tmp/servo.jpeg"
+          if-no-files-found: error
       - name: Run speedometer
         id: speedometer
         run: uv run ./etc/ci/scenario/servo_speedometer.py ${{ inputs.profile }}
@@ -349,19 +329,20 @@ jobs:
           hdc file recv /data/local/tmp/servo.jpeg speedometer_error_logs/servo_hos_screenshot.jpeg
           # Todo: Upload logs. This is currently not possible since the test-speedometer-ohos command
           # sets a log filter, which filters everything except JS console output.
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: ${{ !cancelled() && steps.speedometer.outcome == 'failure' }}
         with:
           name: ohos-speedometer-failure-${{ matrix.target }}-${{ inputs.profile }}
           path: speedometer_error_logs
+          if-no-files-found: error
       - name: Combining bencher files
         if: ${{ !cancelled() && steps.setup_complete.outcome == 'success' }}
         run: jq --compact-output --slurp add speedometer.json bench.json > combined-bencher.json
       - name: Uploading to bencher.dev
         # Post to bencher if at least one of the benchmarks succeeded.
-        if: | 
-          ${{ !cancelled() && steps.setup_complete.outcome == 'success' 
-                && (steps.hitrace_bench.outcome == 'success' 
+        if: |
+          ${{ !cancelled() && steps.setup_complete.outcome == 'success'
+                && (steps.hitrace_bench.outcome == 'success'
                       || steps.speedometer.outcome == 'success')
           }}
         # Note: That e.g. `--start-point` is ignored if it is an empty string,
@@ -383,6 +364,7 @@ jobs:
   scenario-test-harmonyos:
     name: Mossel Scenario test
     continue-on-error: true
+    timeout-minutes: 20
     runs-on: hos-runner
     if: github.repository == 'servo/servo' && needs.build-harmonyos-aarch64.outputs.job_status == 'success'
     needs: build-harmonyos-aarch64
@@ -392,7 +374,7 @@ jobs:
       # This will ensure the scenario pyproject.toml is picked up and the correct venv used.
       UV_PROJECT: "etc/ci/scenario"
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           # Name of the artifact to download.
           # If unspecified, all artifacts for the run are downloaded.
@@ -412,10 +394,26 @@ jobs:
           hdc uninstall org.servo.servo
           hdc install -r servoshell-hos-signed.hap
       - name: Checkout scenario scripts
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           sparse-checkout: |
             etc/ci/scenario
+      - name: Get mitmproxy cache
+        id: mitmproxy-cache
+        uses: actions/cache@v5
+        with:
+          path: /tmp/mitmproxy-dump
+          key: ${{ env.MITMDUMP_CACHE_KEY }}
+      - name: Generate mitmproxy dump
+        if: steps.mitmproxy-cache.outputs.cache-hit != 'true'
+        run: uv run etc/ci/scenario/update_mitmproxy_dump.py /tmp/mitmproxy-dump
+      - name: Save Cache
+        if: steps.mitmproxy-cache.outputs.cache-hit != 'true'
+        id: cache-mitmproxy-save
+        uses: actions/cache/save@v5
+        with:
+          path: /tmp/mitmproxy-dump
+          key: ${{ env.MITMDUMP_CACHE_KEY }}
       - name: Test loading servo.org
         run: uv run ./etc/ci/scenario/servo_test_open_page_servo.py
       - name: Test loading Mossel homepage
@@ -429,10 +427,11 @@ jobs:
         run: uv run ./etc/ci/scenario/servo_test_slide.py
       - name: Upload failure screenshots
         if: ${{ steps.install_hap.outcome == 'success' && failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: hos-${{ inputs.profile }}-scenario-failures-screenshots
           path: "servo_scenario_*_error.jpg"
+          if-no-files-found: error
       - name: Save result as job output
         id: result
         if: always()
@@ -444,17 +443,16 @@ jobs:
   collect-job-results:
     name: Collect Job Results
     runs-on: ubuntu-latest
-    needs: [build-harmonyos-aarch64, bench-harmonyos-aarch64, test-harmonyos-aarch64, scenario-test-harmonyos]
+    needs: [build-harmonyos-aarch64, bench-harmonyos-aarch64, scenario-test-harmonyos]
     outputs:
       collected_job_status: ${{ steps.result.outputs.JOB_RESULTS_JSON }}
     steps:
       - name: Save result as job output
         id: result
         run: |
-          JSON_FMT='{"build-harmonyos-aarch64":{"result":"%s"},"bench-harmonyos-aarch64":{"result":"%s"},"test-harmonyos-aarch64":{"result":"%s"},"scenario-test-harmonyos":{"result":"%s"}}'
+          JSON_FMT='{"build-harmonyos-aarch64":{"result":"%s"},"bench-harmonyos-aarch64":{"result":"%s"},"scenario-test-harmonyos":{"result":"%s"}}'
           printf "JOB_RESULTS_JSON=$JSON_FMT" \
                   "${{ needs.build-harmonyos-aarch64.outputs.job_status }}" \
                   "${{ needs.bench-harmonyos-aarch64.outputs.job_status }}" \
-                  "${{ needs.test-harmonyos-aarch64.outputs.job_status }}" \
                   "${{ needs.scenario-test-harmonyos.outputs.job_status }}" \
             >> $GITHUB_OUTPUT

.github/workflows/release.yml

@@ -0,0 +1,457 @@
+name: Release
+
+on:
+  schedule:
+    # Run at 22:15 pm, daily.
+    # To make sure it finishes in time before next WPT daily epoch run
+    - cron: '15 22 * * *'
+  workflow_dispatch:
+    inputs:
+      # Note: On scheduled runs `inputs.regular_release` will be `null`, which allows us to create
+      # defaults by using `${{ inputs.regular_release || 'my_default_value' }}` expressions.
+      regular_release:
+        description: '`true` to create a release on this repo, false to release to the nightly-releases repo'
+        type: boolean
+        default: false
+      release_tag:
+        required: true
+        type: string
+        description: 'The tag to create for the release'
+env:
+  RUST_BACKTRACE: 1
+  SHELL: /bin/bash
+  RELEASE_REPO: ${{ github.repository_owner }}/${{ inputs.regular_release && 'servo' || 'servo-nightly-builds' }}
+
+jobs:
+  create-draft-release:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Create Draft GH Release
+    runs-on: ubuntu-latest
+    environment: &publish-environment
+      name: publish
+      deployment: false
+    steps:
+      - id: create-release
+        run: |
+          if [[ "${{ inputs.release_tag }}" != "" ]]; then
+            RELEASE_TAG="${{ inputs.release_tag }}"
+            RELEASE_NOTES="Servo release ${{ inputs.release_tag }}"
+          else
+            RELEASE_TAG=$(date "+%F")
+            RELEASE_NOTES="Nightly build based on servo/servo@${{ github.sha }}"
+          fi
+          RELEASE_URL=$(gh release create "${RELEASE_TAG}" \
+            --draft \
+            --title "${RELEASE_TAG}" \
+            --notes "${RELEASE_NOTES}" \
+            --repo ${RELEASE_REPO})
+          TEMP_TAG=$(basename "$RELEASE_URL")
+          RELEASE_ID=$( \
+            gh api -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "/repos/${RELEASE_REPO}/releases/tags/${TEMP_TAG}" \
+            | jq '.id' \
+          )
+          echo "RELEASE_ID=${RELEASE_ID}" >> ${GITHUB_OUTPUT}
+          echo "RELEASE_TAG=${RELEASE_TAG}" >> ${GITHUB_OUTPUT}
+        env:
+          GITHUB_TOKEN: ${{ inputs.regular_release && github.token || secrets.NIGHTLY_REPO_TOKEN }}
+    outputs:
+      release-id: ${{ steps.create-release.outputs.RELEASE_ID }}
+      release-tag: ${{ steps.create-release.outputs.RELEASE_TAG }}
+
+  publish-nightly-release:
+    # We only auto-publish nightly releases, so we do not use this job for regular releases.
+    if: |
+      always() 
+        && (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    name: Publish GH Release
+    runs-on: ubuntu-latest
+    environment: *publish-environment
+    steps:
+      - name: Publish as latest (success)
+        if: ${{ !contains(needs.*.result, 'failure') && (!contains(needs.*.result, 'cancelled') && !cancelled()) }}
+        run: |
+          gh api \
+            --method PATCH \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            /repos/${RELEASE_REPO}/releases/${RELEASE_ID} \
+            -F draft=false
+      - name: Publish as latest (failure)
+        if: ${{ contains(needs.*.result, 'failure') || (contains(needs.*.result, 'cancelled') || cancelled()) }}
+        run: |
+          gh api \
+            --method PATCH \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            /repos/${RELEASE_REPO}/releases/${RELEASE_ID} \
+            -F prerelease=true -F draft=false
+    env:
+      GITHUB_TOKEN: ${{ inputs.regular_release && github.token || secrets.NIGHTLY_REPO_TOKEN }}
+      RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+    needs:
+      - create-draft-release
+      - upload-vendored-source
+      - upload-linux-nightly
+      - upload-win-nightly
+      - upload-mac-nightly
+      - upload-mac-arm64-nightly
+      - upload-android-nightly
+      - upload-ohos-nightly
+
+  build-win:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build production release (Windows)
+    uses: ./.github/workflows/windows.yml
+    with:
+      profile: "production"
+      upload_zip: true
+      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
+
+  upload-vendored-source:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Upload vendored source archive
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
+    environment:
+      name: publish
+      deployment: false
+    env:
+      ARTIFACT_BASENAME: "servo-${{ needs.create-draft-release.outputs.release-tag }}-src-vendored"
+      ARTIFACT_FILENAME: "servo-${{ needs.create-draft-release.outputs.release-tag }}-src-vendored.tar.gz"
+    needs:
+      - create-draft-release
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+      - name: Generate vendored archive
+        run: |
+          python3 etc/vendor_servo.py --filename "${ARTIFACT_BASENAME}"
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-path: ${{ env.ARTIFACT_FILENAME }}
+      - name: Upload vendored archive to release
+        run: |
+          gh release upload "${{ needs.create-draft-release.outputs.release-tag }}" \
+            "${ARTIFACT_FILENAME}" \
+            --repo "${RELEASE_REPO}"
+        env:
+          GITHUB_TOKEN: ${{ inputs.regular_release && github.token || secrets.NIGHTLY_REPO_TOKEN }}
+
+  upload-win-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: &nightly-upload-permissions
+      id-token: write
+      attestations: write
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-win
+    env:
+      ARTIFACT_IDS: ${{ needs.build-win.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: windows-msvc
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: &upload-release-steps
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: |
+            .github
+            etc/ci
+          fetch-depth: 1
+      - name: Setup Python
+        uses: ./.github/actions/setup-python
+      - name: Validate artifact IDs
+        run: |
+          if [[ -z "${ARTIFACT_IDS}" ]]; then
+            echo "Error: No artifact IDs provided."
+            echo "Help: Check the build job's outputs.artifact_ids value."
+            echo "If you recently renamed the build job without updating the corresponding output reference,"
+            echo "that is likely the cause of this error."
+            exit 1
+          fi
+      - uses: actions/download-artifact@v8
+        with:
+          artifact-ids: ${{ env.ARTIFACT_IDS }}
+          merge-multiple: true
+          path: release-artifacts
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-path: release-artifacts/*
+      - name: Upload release artifacts
+        run: |
+          ./etc/ci/upload_nightly.py "${ARTIFACT_PLATFORM}" \
+            --secret-from-environment \
+            --github-release-id "${GITHUB_RELEASE_ID}" \
+            release-artifacts/*
+
+  upload-win-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: &release-upload-permissions
+      id-token: write
+      attestations: write
+      # Necessary for the github token to upload artifacts to the release.
+      contents: write
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-win
+    env:
+      ARTIFACT_IDS: ${{ needs.build-win.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: windows-msvc
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+
+  build-mac:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build production release (macOS)
+    uses: ./.github/workflows/mac.yml
+    with:
+      profile: "production"
+      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
+
+  upload-mac-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: *nightly-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-mac
+    env:
+      ARTIFACT_IDS: ${{ needs.build-mac.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: mac
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  upload-mac-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: *release-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-mac
+    env:
+      ARTIFACT_IDS: ${{ needs.build-mac.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: mac
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  build-mac-arm64:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build production release (macOS Arm64)
+    uses: ./.github/workflows/mac-arm64.yml
+    with:
+      profile: "production"
+      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
+
+  upload-mac-arm64-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: *nightly-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-mac-arm64
+    env:
+      ARTIFACT_IDS: ${{ needs.build-mac-arm64.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: mac-arm64
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  upload-mac-arm64-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: *release-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-mac-arm64
+    env:
+      ARTIFACT_IDS: ${{ needs.build-mac-arm64.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: mac-arm64
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  build-linux:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build production release (Linux)
+    uses: ./.github/workflows/linux.yml
+    with:
+      profile: "production"
+      force-github-hosted-runner: true  # <https://github.com/servo/servo/issues/33296>
+
+  upload-linux-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: *nightly-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-linux
+    env:
+      ARTIFACT_IDS: ${{ needs.build-linux.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: linux
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  upload-linux-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: *release-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-linux
+    env:
+      ARTIFACT_IDS: ${{ needs.build-linux.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: linux
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  build-android:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build release (Android)
+    uses: ./.github/workflows/android.yml
+    with:
+      profile: "release"
+    secrets: inherit
+
+  upload-android-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: *nightly-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-android
+    env:
+      ARTIFACT_IDS: ${{ needs.build-android.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: android
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  upload-android-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: *release-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-android
+    env:
+      ARTIFACT_IDS: ${{ needs.build-android.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: android
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+
+  build-ohos:
+    # This job is only useful when run on upstream servo.
+    if: github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch'
+    name: Build production release (OpenHarmony)
+    uses: ./.github/workflows/ohos.yml
+    with:
+      profile: "production"
+      upload_library: true
+    secrets: inherit
+
+  upload-ohos-nightly:
+    # Only run scheduled nightly builds on upstream servo.
+    if: |
+      (github.repository == 'servo/servo' || github.event_name == 'workflow_dispatch')
+        && (inputs.regular_release || false) == false
+    runs-on: ubuntu-latest
+    permissions: *nightly-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-ohos
+    env:
+      ARTIFACT_IDS: ${{ needs.build-ohos.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: ohos
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo-nightly-builds
+      RELEASE_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps
+
+  upload-ohos-release:
+    if: github.event_name == 'workflow_dispatch' && inputs.regular_release
+    runs-on: ubuntu-latest
+    permissions: *release-upload-permissions
+    environment: *publish-environment
+    needs:
+      - create-draft-release
+      - build-ohos
+    env:
+      ARTIFACT_IDS: ${{ needs.build-ohos.outputs.artifact_ids }}
+      ARTIFACT_PLATFORM: ohos
+      GITHUB_RELEASE_ID: ${{ needs.create-draft-release.outputs.release-id }}
+      RELEASE_REPO: ${{ github.repository_owner }}/servo
+      RELEASE_REPO_TOKEN: ${{ github.token }}
+      S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
+    steps: *upload-release-steps

.github/workflows/scheduled-wpt-import.yml

@@ -29,15 +29,17 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: wpt-full-logs-linux
       - name: Setup Python
         uses: ./.github/actions/setup-python
+      - name: Change Mirror Priorities
+        uses: ./.github/actions/apt-mirrors
       - name: Prep environment
         run: |
           sudo apt update
-          ./mach bootstrap --skip-lints --skip-nextest
+          ./mach bootstrap --yes --skip-lints --skip-nextest
       - name: Add upstream remote
         run: |
           git config --local user.email "ghbot+wpt-sync@servo.org"
@@ -54,6 +56,7 @@ jobs:
           echo "CURRENT_DATE=$CURRENT_DATE" >> $GITHUB_ENV
           ./mach update-wpt linux/raw/*.log
           git add tests/wpt/meta
+          uv lock
           git commit -a --amend -s --no-edit
       - name: Push changes
         uses: ad-m/github-push-action@master

.github/workflows/try-label.yml

@@ -15,7 +15,7 @@ jobs:
       try_string: ${{ steps.try_string.outputs.result }}
     steps:
       - name: Collect Labels
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: try_string
         with:
           result-encoding: string
@@ -72,6 +72,7 @@ jobs:
             python/servo/try_parser.py
             .github/actions/setup-python
             .python-version
+            uv.lock
           sparse-checkout-cone-mode: false
       - name: Setup Python
         uses: ./.github/actions/setup-python
@@ -86,7 +87,7 @@ jobs:
            } >> $GITHUB_OUTPUT
       - name: Comment Run Start
         if: ${{ steps.try_string.outputs.result }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |

.github/workflows/try.yml

@@ -42,6 +42,7 @@ jobs:
             python/servo/try_parser.py
             .github/actions/setup-python
             .python-version
+            uv.lock
           sparse-checkout-cone-mode: false
       - name: Setup Python
         uses: ./.github/actions/setup-python
@@ -55,7 +56,7 @@ jobs:
            } >> $GITHUB_OUTPUT
       - name: Configuration
         id: configuration
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             // When triggered via a push try the `try` branch, search the last commit for a configuration object.
@@ -127,7 +128,7 @@ jobs:
     steps:
       - name: Merge build timings
         continue-on-error: true
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: cargo-timings
           pattern: cargo-timings-*

.github/workflows/windows.yml

@@ -31,6 +31,11 @@ on:
         required: false
         default: false
         type: boolean
+    outputs:
+      artifact_ids:
+        value: ${{ jobs.build.outputs.release_artifact_ids }}
+        description: Comma-separated list of artifact IDs for the release artifacts
+
   workflow_dispatch:
     inputs:
       profile:
@@ -78,7 +83,7 @@ jobs:
     steps:
       - name: Runner select
         id: select
-        uses: servo/ci-runners/actions/runner-select@44317e3cd86c5ff2ef0b08878b90da246bc237da
+        uses: servo/ci-runners/actions/runner-select@f0b81b95522256c64ee207b4236ec71fc23b99a1
         with:
           GITHUB_TOKEN: ${{ github.token }}
           github-hosted-runner-label: windows-2022
@@ -95,8 +100,10 @@ jobs:
       - runner-select
     name: Windows Build [${{ needs.runner-select.outputs.unique-id }}]
     runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
+    outputs:
+      release_artifact_ids: ${{ steps.artifact_ids.outputs.release_artifact_ids }}
     steps:
-      - uses: servo/ci-runners/actions/checkout@44317e3cd86c5ff2ef0b08878b90da246bc237da
+      - uses: servo/ci-runners/actions/checkout@f0b81b95522256c64ee207b4236ec71fc23b99a1
 
       - name: ccache
         # FIXME: “Error: Restoring cache failed: Error: Unable to locate executable file: sh.”
@@ -142,7 +149,7 @@ jobs:
       - name: Build (${{ inputs.profile }})
         run: |
           .\mach build --use-crown --locked --profile ${{ inputs.profile }} ${{ inputs.build-args }}
-          cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse
+          mv C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows
       - name: Copy resources
         # GitHub-hosted runners sometimes check out the repo on D: drive.
         if: ${{ runner.environment != 'self-hosted' && startsWith(github.workspace, 'D:\') }}
@@ -181,28 +188,42 @@ jobs:
         if: ${{ false && inputs.unit-tests }}  # FIXME #39273
         run: .\mach test-devtools --profile ${{ inputs.profile }}
       - name: Archive build timing
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cargo-timings-windows-${{ inputs.profile }}
           # Using a wildcard here ensures that the archive includes the path.
           path: C:\\a\\servo\\servo\\target\\cargo-timings-*
+          if-no-files-found: error
       - name: Build mach package
         run: .\mach package --profile ${{ inputs.profile }}
       # These files are available
       # MSI Installer: C:\a\servo\servo\target\${{ inputs.profile }}\msi\Installer.msi
-      # Bundle: C:\a\servo\servo\target\${{ inputs.profile }}\msi\Servo.exe
-      # Zip: C:\a\servo\servo\target\${{ inputs.profile }}\msi\Servo.zip
+      # Bundle: C:\a\servo\servo\target\${{ inputs.profile }}\msi\ServoShell.exe
+      # Zip: C:\a\servo\servo\target\${{ inputs.profile }}\msi\ServoShell.zip
       - name: Upload artifact for mach package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-exe
         with:
           name: ${{ inputs.profile }}-binary-windows
-          path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\Servo.exe
+          path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\ServoShell.exe
+          if-no-files-found: error
       - name: Upload artifact for mach package (zip)
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
+        id: upload-zip
         if: ${{ inputs.upload_zip }}
         with:
           name: ${{ inputs.profile }}-binary-windows-zip
-          path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\Servo.zip
+          path: C:\\a\\servo\\servo\\target\\${{ inputs.profile }}\\msi\\ServoShell.zip
+          if-no-files-found: error
+      - name: Collect artifact IDs needed by the release workflow
+        id: artifact_ids
+        shell: bash
+        run: |
+          ARTIFACT_IDS="${{steps.upload-exe.outputs.artifact-id}}"
+          if [[ -n "${{steps.upload-zip.outputs.artifact-id}}" ]]; then
+            ARTIFACT_IDS="${ARTIFACT_IDS},${{steps.upload-zip.outputs.artifact-id}}"
+          fi
+          echo "release_artifact_ids=${ARTIFACT_IDS}" >> $GITHUB_OUTPUT
 
   bencher:
     needs: ["build"]
@@ -212,7 +233,7 @@ jobs:
       target: 'windows'
       profile: ${{ inputs.profile }}
       compressed-file-path: ''
-      binary-path: ${{ inputs.profile }}-binary-windows/Servo.exe
+      binary-path: ${{ inputs.profile }}-binary-windows/ServoShell.exe
       file-size: true
       speedometer: false
       dromaeo: false
@@ -245,4 +266,4 @@ jobs:
           toolchain: ${{ steps.msrv.outputs.rust_version }}
       - name: Compile libservo with MSRV
         run: |
-          cargo +${{ steps.msrv.outputs.rust_version }} build -p libservo --locked --all-targets
+          cargo +${{ steps.msrv.outputs.rust_version }} build -p servo --locked

.gitignore

@@ -29,6 +29,10 @@ servo.pftrace
 /glfw
 webrender-captures/
 /screenshots
+/etc/notarization/
+
+# Python setuptools
+/servo.egg-info
 
 # Allow CSV files to be used as resources in tests
 !/tests/**/*.csv
@@ -73,4 +77,4 @@ support/macos/Brewfile.lock.json
 .envrc
 
 # Justfiles
-justfile
+justfile

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "components/media/examples",
     "components/xpath",
     "ports/servoshell",
     "tests/unit/*",
@@ -9,8 +10,11 @@ default-members = ["ports/servoshell"]
 exclude = [".cargo", "support/crown"]
 
 [workspace.package]
-version = "0.0.1"
+version = "0.1.0"
 authors = ["The Servo Project Developers"]
+repository = "https://github.com/servo/servo"
+# A generic description for packages that don't have a meaningful description yet.
+description = "A component of the servo web-engine."
 license = "MPL-2.0"
 edition = "2024"
 publish = false
@@ -23,6 +27,7 @@ publish = false
 rust-version = "1.86.0"
 
 [workspace.dependencies]
+accesskit = { version = "0.24.0", features = ["serde"] }
 accountable-refcell = "0.2.2"
 aes = "0.8.4"
 aes-gcm = "0.10.3"
@@ -31,97 +36,94 @@ app_units = "0.7"
 arboard = "3"
 argon2 = { version = "0.5", features = ["alloc"] }
 arrayvec = "0.7"
-async-tungstenite = { version = "0.32", features = ["tokio-rustls-webpki-roots"] }
+async-tungstenite = { version = "0.34", features = ["tokio-rustls-webpki-roots"] }
 atomic_refcell = "0.1.13"
-aws-lc-rs = { version = "1.15", default-features = false, features = ["aws-lc-sys"] }
-background_hang_monitor_api = { path = "components/shared/background_hang_monitor" }
+aws-lc-rs = { version = "1.16", default-features = false, features = ["aws-lc-sys"] }
 backtrace = "0.3"
-base = { path = "components/shared/base" }
 base64 = "0.22.1"
 base64ct = { version = "1.8", features = ["alloc"] }
-# bincode 1.3.3 is the last known good version of bincode 1.
-# The crate was declared finished and won't receive further updates by the author.
-# Since the git history was rewritten by the author, any bump of this crate should
-# be reviewed carefully by doing a manual diff based on the crates.io version,
-# before doing **any** bump to this dependency to rule out a supply chain attack.
-bincode = "=1.3.3"
-bitflags = "2.10"
-bluetooth_traits = { path = "components/shared/bluetooth" }
+bitflags = "2.11"
 brotli = "8.0.2"
 bytemuck = "1"
 byteorder = "1.5"
-canvas_traits = { path = "components/shared/canvas" }
 cbc = "0.1.2"
 cfg-if = "1.0.4"
 chacha20poly1305 = "0.10"
 chardetng = "0.1"
 chrono = { version = "0.4", features = ["serde"] }
 cipher = { version = "0.4.4", features = ["alloc"] }
-compositing_traits = { path = "components/shared/compositing" }
-constellation_traits = { path = "components/shared/constellation" }
-content-security-policy = { git = "https://github.com/servo/rust-content-security-policy", branch = "servo-csp", features = ["serde"] }
+content-security-policy = { version = "0.8.0", features = ["serde"] }
 cookie = { package = "cookie", version = "0.18" }
 crossbeam-channel = "0.5"
 cssparser = { version = "0.36", features = ["serde"] }
 ctr = "0.9.2"
 data-url = "0.3"
 der = { version = "0.7", features = ["alloc", "derive"] }
-devtools_traits = { path = "components/shared/devtools" }
 digest = "0.10"
 dpi = "0.1"
 dwrote = "0.11.5"
 ecdsa = "0.16"
 elliptic-curve = "0.13"
-embedder_traits = { path = "components/shared/embedder" }
 encoding_rs = { version = "0.8", features = ["serde"] }
 env_logger = "0.11"
 euclid = "0.22"
 flate2 = "1.1"
-fonts_traits = { path = "components/shared/fonts" }
 freetype-sys = "0.20"
+futures = { version = "0.3", default-features = false }
+futures-core = { version = "0.3", default-features = false }
+futures-util = { version = "0.3", default-features = false }
 gleam = "0.15"
+glib = "0.22"
+glib-sys = "0.22"
 glow = "0.16.0"
-gstreamer = { version = "0.24", features = ["v1_18"] }
-gstreamer-base = "0.24"
-gstreamer-gl = "0.24"
-gstreamer-gl-sys = "0.24"
-gstreamer-sys = "0.24"
-gstreamer-video = "0.24"
+gstreamer = { version = "0.25", features = ["v1_18"] }
+gstreamer-app = "0.25"
+gstreamer-audio = "0.25"
+gstreamer-base = "0.25"
+gstreamer-gl = "0.25"
+gstreamer-gl-egl = "0.25"
+gstreamer-gl-sys = "0.25"
+gstreamer-gl-wayland = "0.25"
+gstreamer-gl-x11 = "0.25"
+gstreamer-play = "0.25"
+gstreamer-sdp = "0.25"
+gstreamer-sys = "0.25"
+gstreamer-video = "0.25"
+gstreamer-webrtc = { version = "0.25", features = ["v1_18"] }
 harfbuzz-sys = "0.6.1"
 headers = "0.4"
-hitrace = "0.1.6"
+hitrace = { version = "0.1.6", features = ["api-19", "tracing-rs"] }
 hkdf = "0.12"
-html5ever = "0.36.1"
+html5ever = "0.39"
 http = "1.4"
 http-body-util = "0.1"
-hyper = "1.8"
+hyper = "1.9"
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "logging", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1", features = ["client-legacy", "http2", "tokio", "client-proxy"] }
-hyper_serde = { path = "components/hyper_serde" }
 icu_locid = "1.5.0"
+icu_properties = "1.5.0"
 icu_segmenter = "1.5.0"
 image = { version = "0.25", default-features = false, features = ["avif", "rayon", "bmp", "gif", "ico", "jpeg", "png", "webp"] }
 imsz = "0.4"
 indexmap = { version = "2.11.4", features = ["std"] }
-ipc-channel = "0.20.2"
+inventory = { version = "0.3.24" }
+ipc-channel = "0.21"
 itertools = "0.14"
-js = { package = "mozjs", version = "=0.14.5", default-features = false, features = ["libz-sys", "intl"] }
+js = { package = "mozjs", version = "=0.15.8", default-features = false, features = ["libz-sys", "intl"] }
 keyboard-types = { version = "0.8.3", features = ["serde", "webdriver"] }
 kurbo = { version = "0.12", features = ["euclid"] }
-layout_api = { path = "components/shared/layout" }
 libc = "0.2"
 log = "0.4.29"
 mach2 = "0.6"
-malloc_size_of = { package = "servo_malloc_size_of", path = "components/malloc_size_of" }
 malloc_size_of_derive = "0.1"
-markup5ever = "0.36.1"
-memmap2 = "0.9.9"
+markup5ever = "0.39"
+memmap2 = "0.9.10"
 mime = "0.3.13"
+mime-multipart-hyper1 = "0.10.0"
 mime_guess = "2.0.5"
 ml-dsa = "0.0.4"
 ml-kem = { version = "0.2", features = ["deterministic"] }
-mozangle = "0.5.3"
-net_traits = { path = "components/shared/net" }
+mozangle = "0.5.5"
 nix = "0.30"
 nom = "8.0.0"
 nom-rfc8288 = "0.4.0"
@@ -129,6 +131,10 @@ num-bigint-dig = "0.8"
 num-derive = "0.4.2"
 num-traits = "0.2"
 num_cpus = "1.17.0"
+objc2 = "0.6.4"
+objc2-core-foundation = "0.3.2"
+objc2-core-graphics = "0.3.2"
+objc2-core-text = "0.3.2"
 ocb3 = "0.1.0"
 openxr = "0.20"
 p256 = { version = "0.13", features = ["ecdh"] }
@@ -138,8 +144,8 @@ parking_lot = { version = "0.12", features = ["serde"] }
 peniko = "0.5"
 percent-encoding = "2.3"
 pkcs8 = { version = "0.10", features = ["rand_core"] }
+postcard = { version = "1.1.3", default-features = false, features = ["use-std"] }
 proc-macro2 = "1"
-profile_traits = { path = "components/shared/profile" }
 quote = "1"
 rand = "0.9"
 raw-window-handle = "0.6"
@@ -148,43 +154,37 @@ read-fonts = "0.35.0"
 regex = "1.12"
 resvg = "0.45.0"
 rsa = { version = "0.9.10", features = ["sha1", "sha2"] }
-rustc-hash = "2.1.1"
+rustc-hash = "2.1.2"
 rustls = { version = "0.23", default-features = false, features = ["logging", "std", "tls12"] }
-rustls-pki-types = "1.13"
+rustls-pki-types = "1.14"
 rustls-platform-verifier = "0.6.2"
-script_traits = { path = "components/shared/script" }
-sea-query = { version = "1.0.0-rc.29", default-features = false, features = ["backend-sqlite", "derive"] }
+sea-query = { version = "1.0.0-rc.31", default-features = false, features = ["backend-sqlite", "derive"] }
 sea-query-rusqlite = { version = "0.8.0-rc.15" }
 sec1 = "0.7"
-selectors = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
+selectors = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
 serde = "1.0.228"
 serde_bytes = "0.11"
 serde_core = "1.0.226"
 serde_json = "1.0"
-servo-media = { git = "https://github.com/servo/media" }
-servo-media-dummy = { git = "https://github.com/servo/media" }
-servo-media-gstreamer = { git = "https://github.com/servo/media" }
-servo-tracing = { path = "components/servo_tracing" }
-servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
+servo_arc = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
 sha1 = "0.10"
 sha2 = "0.10"
 sha3 = "0.10"
 skrifa = "0.37.0"
 smallvec = { version = "1.15", features = ["serde", "union"] }
-storage_traits = { path = "components/shared/storage" }
 string_cache = "0.9"
-strum = { version = "0.27", features = ["derive"] }
-stylo = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
-stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
-stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
-stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
-stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
-stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-12-01" }
+strum = { version = "0.28", features = ["derive"] }
+stylo = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
+stylo_atoms = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
+stylo_dom = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
+stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
+stylo_static_prefs = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
+stylo_traits = { git = "https://github.com/servo/stylo", rev = "ddf2109bdfff62c83a14e3a3c7dc1c6130653283" }
 surfman = { version = "0.11.0", features = ["chains"] }
 syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
 synstructure = "0.13"
-taffy = { version = "0.9.2", default-features = false, features = ["calc", "detailed_layout_info", "grid", "std"] }
-tendril = { version = "0.4.1", features = ["encoding_rs"] }
+taffy = { version = "0.10", default-features = false, features = ["calc", "detailed_layout_info", "grid", "std"] }
+tendril = { version = "0.5", features = ["encoding_rs"] }
 tikv-jemalloc-sys = "0.6.1"
 tikv-jemallocator = "0.6.1"
 time = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] }
@@ -195,35 +195,107 @@ tokio-util = { version = "0.7.18", default-features = false }
 tower = { version = "0.5", default-features = false, features = ["util"] }
 tracing = "0.1.44"
 tracing-perfetto = "0.1.5"
-tracing-subscriber = "0.3.22"
-tungstenite = "0.28"
+tracing-subscriber = "0.3.23"
+tungstenite = "0.29"
 unicode-bidi = "0.3.18"
+unicode_categories = "0.1.1"
 unicode-properties = { version = "0.1.4", features = ["emoji"] }
 unicode-script = "0.5"
-unicode-segmentation = "1.12.0"
+unicode-segmentation = "1.13.2"
 url = "2.5"
 urlpattern = "0.3"
 utf-8 = "0.7"
-uuid = { version = "1.19.0", features = ["v4", "v5"] }
+uuid = { version = "1.23.0", features = ["v4", "v5"] }
 vello = "0.6"
 vello_cpu = "0.0.4"
 webdriver = "0.53.0"
-webgpu_traits = { path = "components/shared/webgpu" }
 webpki-roots = "1.0"
-webrender = { git = "https://github.com/servo/webrender", branch = "0.68", features = ["capture"] }
-webrender_api = { git = "https://github.com/servo/webrender", branch = "0.68" }
-webxr-api = { path = "components/shared/webxr" }
+webrender = { version = "0.68", features = ["capture"] }
+webrender_api = "0.68"
 wgpu-core = "26"
 wgpu-types = "26"
 winapi = "0.3"
 windows-sys = "0.61"
-winit = "0.30.12"
+winit = "0.30.13"
 wio = "0.2"
-wr_malloc_size_of = { git = "https://github.com/servo/webrender", branch = "0.68" }
+wr_malloc_size_of = "0.2.2"
 x25519-dalek = { version = "2.0.1", features = ["static_secrets"] }
 xi-unicode = "0.3.0"
-xml5ever = "0.36.1"
-xpath = { path = "components/xpath" }
+xml5ever = "0.39"
+
+############################################################################################
+## Workspace-local dependencies
+############################################################################################
+# All local path dependencies in the servo workspace, that use the workspace version, should
+# be listed here, between the `Begin` and `End` comments, so that we can easily find and
+# update the version requirements when bumping the workspace version.
+# Begin workspace-version dependencies - Don't change this comment, we grep for it in scripts!
+deny_public_fields = { package = "servo-deny-public-fields", version = "0.1.0", path = "components/deny_public_fields" }
+devtools = { package = "servo-devtools", version = "0.1.0", path = "components/devtools" }
+devtools_traits = { package = "servo-devtools-traits", version = "0.1.0", path = "components/shared/devtools" }
+dom_struct = { package = "servo-dom-struct", version = "0.1.0", path = "components/dom_struct" }
+embedder_traits = { package = "servo-embedder-traits", version = "0.1.0", path = "components/shared/embedder" }
+fonts = { package = "servo-fonts", version = "0.1.0", path = "components/fonts" }
+fonts_traits = { package = "servo-fonts-traits", version = "0.1.0", path = "components/shared/fonts" }
+hyper_serde = { package = "servo-hyper-serde", version = "0.1.0", path = "components/hyper_serde" }
+jstraceable_derive = { package = "servo-jstraceable-derive", version = "0.1.0", path = "components/jstraceable_derive" }
+layout = { package = "servo-layout", version = "0.1.0", path = "components/layout" }
+layout_api = { package = "servo-layout-api", version = "0.1.0", path = "components/shared/layout" }
+malloc_size_of = { package = "servo-malloc-size-of", version = "0.1.0", path = "components/malloc_size_of" }
+media = { package = "servo-media-thread", version = "0.1.0", path = "components/media/media-thread" }
+metrics = { package = "servo-metrics", version = "0.1.0", path = "components/metrics" }
+net = { package = "servo-net", version = "0.1.0", path = "components/net" }
+net_traits = { package = "servo-net-traits", version = "0.1.0", path = "components/shared/net" }
+paint = { package = "servo-paint", version = "0.1.0", path = "components/paint" }
+paint_api = { package = "servo-paint-api", version = "0.1.0", path = "components/shared/paint" }
+pixels = { package = "servo-pixels", version = "0.1.0", path = "components/pixels" }
+profile = { package = "servo-profile", version = "0.1.0", path = "components/profile" }
+profile_traits = { package = "servo-profile-traits", version = "0.1.0", path = "components/shared/profile" }
+script = { package = "servo-script", version = "0.1.0", path = "components/script" }
+script_bindings = { package = "servo-script-bindings", version = "0.1.0", path = "components/script_bindings" }
+script_traits = { package = "servo-script-traits", version = "0.1.0", path = "components/shared/script" }
+servo = { version = "0.1.0", path = "components/servo", default-features = false }
+servo-allocator = { version = "0.1.0", path = "components/allocator" }
+servo-background-hang-monitor = { version = "0.1.0", path = "components/background_hang_monitor" }
+servo-background-hang-monitor-api = { version = "0.1.0", path = "components/shared/background_hang_monitor" }
+servo-base = { version = "0.1.0", path = "components/shared/base" }
+servo-bluetooth = { version = "0.1.0", path = "components/bluetooth" }
+servo-bluetooth-traits = { version = "0.1.0", path = "components/shared/bluetooth" }
+servo-canvas = { version = "0.1.0", path = "components/canvas" }
+servo-canvas-traits = { version = "0.1.0", path = "components/shared/canvas" }
+servo-config = { version = "0.1.0", path = "components/config" }
+servo-config-macro = { version = "0.1.0", path = "components/config/macro" }
+servo-constellation = { version = "0.1.0", path = "components/constellation" }
+servo-constellation-traits = { version = "0.1.0", path = "components/shared/constellation" }
+servo-default-resources = { version = "0.1.0", path = "components/default-resources" }
+servo-geometry = { version = "0.1.0", path = "components/geometry" }
+servo-media = { version = "0.1.0", path = "components/media/servo-media" }
+servo-media-audio = { version = "0.1.0", path = "components/media/audio" }
+servo-media-auto = { version = "0.1.0", path = "components/media/backends/auto" }
+servo-media-derive = { version = "0.1.0", path = "components/media/servo-media-derive" }
+servo-media-dummy = { version = "0.1.0", path = "components/media/backends/dummy" }
+servo-media-gstreamer = { version = "0.1.0", path = "components/media/backends/gstreamer" }
+servo-media-gstreamer-render = { version = "0.1.0", path = "components/media/backends/gstreamer/render" }
+servo-media-gstreamer-render-android = { version = "0.1.0", path = "components/media/backends/gstreamer/render-android" }
+servo-media-gstreamer-render-unix = { version = "0.1.0", path = "components/media/backends/gstreamer/render-unix" }
+servo-media-ohos = { version = "0.1.0", path = "components/media/backends/ohos" }
+servo-media-player = { version = "0.1.0", path = "components/media/player" }
+servo-media-streams = { version = "0.1.0", path = "components/media/streams" }
+servo-media-traits = { version = "0.1.0", path = "components/media/traits" }
+servo-media-webrtc = { version = "0.1.0", path = "components/media/webrtc" }
+servo-tracing = { version = "0.1.0", path = "components/servo_tracing" }
+servo-url = { version = "0.1.0", path = "components/url" }
+storage = { package = "servo-storage", version = "0.1.0", path = "components/storage" }
+storage_traits = { package = "servo-storage-traits", version = "0.1.0", path = "components/shared/storage" }
+timers = { package = "servo-timers", version = "0.1.0", path = "components/timers" }
+webdriver_server = { package = "servo-webdriver-server", version = "0.1.0", path = "components/webdriver_server" }
+webgl = { package = "servo-webgl", version = "0.1.0", path = "components/webgl", default-features = false }
+webgpu = { package = "servo-webgpu", version = "0.1.0", path = "components/webgpu" }
+webgpu_traits = { package = "servo-webgpu-traits", version = "0.1.0", path = "components/shared/webgpu" }
+webxr = { package = "servo-webxr", version = "0.1.0", path = "components/webxr" }
+webxr-api = { package = "servo-webxr-api", version = "0.1.0", path = "components/shared/webxr" }
+xpath = { package = "servo-xpath", version = "0.1.0", path = "components/xpath" }
+# End workspace-version dependencies - Don't change this comment, we grep for it in scripts!
 
 # RSA key generation could be very slow without compilation
 # optimizations, in development mode. Without optimizations, WPT might
@@ -290,6 +362,26 @@ codegen-units = 1
 # web_atoms = { path = "../html5ever/web_atoms" }
 # xml5ever = { path = "../html5ever/xml5ever" }
 # tendril = { path = "../html5ever/tendril" }
+
+# For WebRender:
+#
+# webrender = { path = "../webrender/webrender" }
+# webrender_api = { path = "../webrender/webrender_api" }
+# wr_malloc_size_of = { path = "../webrender/wr_malloc_size_of" }
+#
+# Or for mozjs:
+#
+# mozjs = { path = "../mozjs/mozjs" }
+# mozjs_sys = { path = "../mozjs/mozjs-sys" }
+#
+# Or for CSP crate:
+# content-security-policy = { path = "../rust-content-security-policy" }
+#
+# Pending egui bumping their accesskit version: https://github.com/emilk/egui/pull/7850
+# This is only used in servoshell.
+# TODO: When these are no longer needed remove the exception in deny.toml as well.
+egui = { git = "https://github.com/emilk/egui.git", rev = "5d8f393335e051785b4fd3af9ef92eda5b61177f" }
+egui-winit = { git = "https://github.com/emilk/egui.git", rev = "5d8f393335e051785b4fd3af9ef92eda5b61177f" }
 #
 # Or for Stylo:
 #
@@ -298,27 +390,13 @@ codegen-units = 1
 # servo_arc = { path = "../stylo/servo_arc" }
 # stylo = { path = "../stylo/style" }
 # stylo_atoms = { path = "../stylo/stylo_atoms" }
-# stylo_config = { path = "../stylo/stylo_config" }
 # stylo_dom = { path = "../stylo/stylo_dom" }
 # stylo_malloc_size_of = { path = "../stylo/malloc_size_of" }
+# stylo_static_prefs = { path = "../stylo/stylo_static_prefs" }
 # stylo_traits = { path = "../stylo/style_traits" }
 #
-# Or for WebRender:
-#
-# [patch."https://github.com/servo/webrender"]
-# webrender = { path = "../webrender/webrender" }
-# webrender_api = { path = "../webrender/webrender_api" }
-# wr_malloc_size_of = { path = "../webrender/wr_malloc_size_of" }
-#
 # Or for another Git dependency:
 #
 # [patch."https://github.com/servo/<repository>"]
 # <crate> = { path = "/path/to/local/checkout" }
 #
-# [patch."https://github.com/servo/rust-content-security-policy"]
-# content-security-policy = { path = "../rust-content-security-policy" }
-#
-# Or for mozjs:
-#
-# mozjs = { path = "../mozjs/mozjs" }
-# mozjs_sys = { path = "../mozjs/mozjs-sys" }

Info.plist

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleExecutable</key>
-	<string>servo</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Servo</string>
-	<key>CFBundleIconFile</key>
-	<string>servo.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.servo.Servo</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Servo</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.0.4</string>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSQuitAlwaysKeepsWindows</key>
-	<false/>
-	<key>CFBundleSupportedPlatforms</key>
-    <array>
-        <string>MacOSX</string>
-    </array>
-</dict>
-</plist>

SECURITY.md

@@ -1,4 +1,3 @@
 # Security Policy
 
-Given that Servo does not yet have customers or products, we are comfortable accepting the security related issues as [GitHub security reports](https://github.com/servo/servo/security/advisories/new) for now.
-
+Please submit security related issues as [GitHub security reports](https://github.com/servo/servo/security/advisories/new).

components/allocator/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "servo_allocator"
+name = "servo-allocator"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
 path = "lib.rs"

components/background_hang_monitor/Cargo.toml

@@ -1,28 +1,30 @@
 [package]
-name = "background_hang_monitor"
+name = "servo-background-hang-monitor"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
-name = "background_hang_monitor"
+name = "servo_background_hang_monitor"
 path = "lib.rs"
 test = false
 doctest = false
 
 [dependencies]
-background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
-base = { workspace = true }
 crossbeam-channel = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
 rustc-demangle = { version = "0.1", optional = true }
 rustc-hash = { workspace = true }
 serde_json = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2 = { workspace = true, optional = true }

components/background_hang_monitor/background_hang_monitor.rs

@@ -11,10 +11,10 @@ use background_hang_monitor_api::{
     BackgroundHangMonitorExitSignal, BackgroundHangMonitorRegister, HangAlert, HangAnnotation,
     HangMonitorAlert, MonitoredComponentId,
 };
-use base::generic_channel::{GenericReceiver, GenericSender, RoutedReceiver};
 use crossbeam_channel::{Receiver, Sender, after, never, select, unbounded};
 use log::{error, warn};
 use rustc_hash::FxHashMap;
+use servo_base::generic_channel::{GenericReceiver, GenericSender, RoutedReceiver};
 
 use crate::SamplerImpl;
 use crate::sampler::{NativeStack, Sampler};

components/background_hang_monitor/lib.rs

@@ -36,6 +36,8 @@ pub use self::background_hang_monitor::*;
             target_env = "musl"
         )
     ),
+    all(target_os = "windows", target_arch = "aarch64"),
+    target_os = "freebsd"
 ))]
 pub(crate) use crate::sampler::DummySampler as SamplerImpl;
 #[cfg(all(

components/background_hang_monitor/tests/hang_monitor_tests.rs

@@ -9,13 +9,13 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;
 
-use background_hang_monitor::HangMonitorRegister;
 use background_hang_monitor_api::{
     BackgroundHangMonitorControlMsg, BackgroundHangMonitorExitSignal, HangAlert, HangAnnotation,
     HangMonitorAlert, MonitoredComponentId, MonitoredComponentType, ScriptHangAnnotation,
 };
-use base::generic_channel;
-use base::id::TEST_SCRIPT_EVENT_LOOP_ID;
+use servo_background_hang_monitor::HangMonitorRegister;
+use servo_base::generic_channel;
+use servo_base::id::TEST_SCRIPT_EVENT_LOOP_ID;
 
 static SERIAL: Mutex<()> = Mutex::new(());
 

components/bluetooth/Cargo.toml

@@ -1,37 +1,33 @@
 [package]
-name = "bluetooth"
+name = "servo-bluetooth"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
-name = "bluetooth"
+name = "servo_bluetooth"
 path = "lib.rs"
 
 [dependencies]
-base = { workspace = true }
 bitflags = { workspace = true }
-bluetooth_traits = { workspace = true }
 blurmock = { version = "0.1.2", optional = true }
+btleplug = { version = "0.12", optional = true }
 embedder_traits = { workspace = true }
+futures = { workspace = true, features = ["executor"] }
 log = { workspace = true }
 rand = { workspace = true }
-servo_config = { path = "../config" }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true }
+servo-config = { workspace = true }
+tokio = { workspace = true, features = ["rt", "time", "sync"], optional = true }
 uuid = { workspace = true }
 
-[target.'cfg(target_os = "linux")'.dependencies]
-blurz = { version = "0.3", optional = true }
-
-[target.'cfg(target_os = "android")'.dependencies]
-blurdroid = { version = "0.1.2", optional = true }
-
-[target.'cfg(target_os = "macos")'.dependencies]
-blurmac = { path = "../../third_party/blurmac", optional = true }
-
 [features]
 default = ["bluetooth-test"]
 bluetooth-test = ["blurmock"]
-native-bluetooth = ["bluetooth-test", "blurdroid", "blurmac", "blurz"]
+native-bluetooth = ["bluetooth-test", "btleplug", "tokio"]

components/bluetooth/adapter.rs

@@ -5,99 +5,81 @@
 use std::error::Error;
 use std::sync::Arc;
 
-#[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-use blurdroid::bluetooth_adapter::Adapter as BluetoothAdapterAndroid;
-#[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-use blurdroid::bluetooth_device::Device as BluetoothDeviceAndroid;
-#[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-use blurdroid::bluetooth_discovery_session::DiscoverySession as BluetoothDiscoverySessionAndroid;
-#[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-use blurmac::BluetoothAdapter as BluetoothAdapterMac;
-#[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-use blurmac::BluetoothDevice as BluetoothDeviceMac;
-#[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-use blurmac::BluetoothDiscoverySession as BluetoothDiscoverySessionMac;
 #[cfg(feature = "bluetooth-test")]
 use blurmock::fake_adapter::FakeBluetoothAdapter;
 #[cfg(feature = "bluetooth-test")]
 use blurmock::fake_device::FakeBluetoothDevice;
 #[cfg(feature = "bluetooth-test")]
 use blurmock::fake_discovery_session::FakeBluetoothDiscoverySession;
-#[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-use blurz::bluetooth_adapter::BluetoothAdapter as BluetoothAdapterBluez;
-#[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-use blurz::bluetooth_device::BluetoothDevice as BluetoothDeviceBluez;
-#[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-use blurz::bluetooth_discovery_session::BluetoothDiscoverySession as BluetoothDiscoverySessionBluez;
+#[cfg(feature = "native-bluetooth")]
+use btleplug::api::{Central, CentralState, Manager};
+#[cfg(feature = "native-bluetooth")]
+use btleplug::platform::{Adapter, Manager as PlatformManager};
 
 use super::bluetooth::{BluetoothDevice, BluetoothDiscoverySession};
-#[cfg(not(any(
-    all(target_os = "linux", feature = "native-bluetooth"),
-    all(target_os = "android", feature = "native-bluetooth"),
-    all(target_os = "macos", feature = "native-bluetooth")
-)))]
-use super::empty::BluetoothDevice as BluetoothDeviceEmpty;
-#[cfg(not(any(
-    all(target_os = "linux", feature = "native-bluetooth"),
-    all(target_os = "android", feature = "native-bluetooth"),
-    all(target_os = "macos", feature = "native-bluetooth")
-)))]
-use super::empty::BluetoothDiscoverySession as BluetoothDiscoverySessionEmpty;
-#[cfg(not(any(
-    all(target_os = "linux", feature = "native-bluetooth"),
-    all(target_os = "android", feature = "native-bluetooth"),
-    all(target_os = "macos", feature = "native-bluetooth")
-)))]
-use super::empty::EmptyAdapter as BluetoothAdapterEmpty;
-use super::macros::get_inner_and_call;
-#[cfg(feature = "bluetooth-test")]
-use super::macros::get_inner_and_call_test_func;
+use crate::macros::get_inner_and_call_test_func;
+
+#[cfg(feature = "native-bluetooth")]
+#[derive(Clone, Debug)]
+pub struct BtleplugAdapter {
+    adapter: Adapter,
+}
+
+#[cfg(feature = "native-bluetooth")]
+impl BtleplugAdapter {
+    pub async fn new() -> Result<Self, Box<dyn Error>> {
+        let manager = PlatformManager::new().await?;
+        let adapters = manager.adapters().await?;
+        let adapter = adapters
+            .into_iter()
+            .next()
+            .ok_or_else(|| btleplug::Error::NoAdapterAvailable)?;
+        Ok(BtleplugAdapter { adapter })
+    }
+
+    pub async fn get_address(&self) -> Result<String, Box<dyn Error>> {
+        Ok(self.adapter.adapter_info().await?)
+    }
+
+    pub async fn is_powered(&self) -> Result<bool, Box<dyn Error>> {
+        let state = self.adapter.adapter_state().await?;
+        Ok(state == CentralState::PoweredOn)
+    }
+
+    pub async fn get_devices(&self) -> Result<Vec<BluetoothDevice>, Box<dyn Error>> {
+        let peripherals = self.adapter.peripherals().await?;
+        Ok(peripherals
+            .into_iter()
+            .map(|p| BluetoothDevice::Btleplug(super::bluetooth::BtleplugDevice { peripheral: p }))
+            .collect())
+    }
+
+    pub fn create_discovery_session(&self) -> Result<BluetoothDiscoverySession, Box<dyn Error>> {
+        Ok(BluetoothDiscoverySession::Btleplug(
+            super::bluetooth::BtleplugDiscoverySession {
+                adapter: self.adapter.clone(),
+            },
+        ))
+    }
+}
 
 #[derive(Clone, Debug)]
 pub enum BluetoothAdapter {
-    #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-    Bluez(Arc<BluetoothAdapterBluez>),
-    #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-    Android(Arc<BluetoothAdapterAndroid>),
-    #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-    Mac(Arc<BluetoothAdapterMac>),
-    #[cfg(not(any(
-        all(target_os = "linux", feature = "native-bluetooth"),
-        all(target_os = "android", feature = "native-bluetooth"),
-        all(target_os = "macos", feature = "native-bluetooth")
-    )))]
-    Empty(Arc<BluetoothAdapterEmpty>),
+    #[cfg(feature = "native-bluetooth")]
+    Btleplug(BtleplugAdapter),
     #[cfg(feature = "bluetooth-test")]
     Mock(Arc<FakeBluetoothAdapter>),
 }
 
 impl BluetoothAdapter {
-    #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-    pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
-        let bluez_adapter = BluetoothAdapterBluez::init()?;
-        Ok(Self::Bluez(Arc::new(bluez_adapter)))
+    #[cfg(feature = "native-bluetooth")]
+    pub async fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
+        Ok(Self::Btleplug(BtleplugAdapter::new().await?))
     }
 
-    #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
+    #[cfg(not(feature = "native-bluetooth"))]
     pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
-        let blurdroid_adapter = BluetoothAdapterAndroid::get_adapter()?;
-        Ok(Self::Android(Arc::new(blurdroid_adapter)))
-    }
-
-    #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-    pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
-        let mac_adapter = BluetoothAdapterMac::init()?;
-        Ok(Self::Mac(Arc::new(mac_adapter)))
-    }
-
-    #[cfg(not(any(
-        all(target_os = "linux", feature = "native-bluetooth"),
-        all(target_os = "android", feature = "native-bluetooth"),
-        all(target_os = "macos", feature = "native-bluetooth")
-    )))]
-    pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
-        let adapter = BluetoothAdapterEmpty::init()?;
-        Ok(Self::Empty(Arc::new(adapter)))
+        Err(Box::from("Bluetooth not supported on this platform"))
     }
 
     #[cfg(feature = "bluetooth-test")]
@@ -105,62 +87,30 @@ impl BluetoothAdapter {
         Ok(Self::Mock(FakeBluetoothAdapter::new_empty()))
     }
 
-    pub fn get_id(&self) -> String {
-        get_inner_and_call!(self, BluetoothAdapter, get_id)
+    pub async fn get_address(&self) -> Result<String, Box<dyn Error>> {
+        match self {
+            #[cfg(feature = "native-bluetooth")]
+            Self::Btleplug(inner) => inner.get_address().await,
+            #[cfg(feature = "bluetooth-test")]
+            Self::Mock(inner) => inner.get_address(),
+        }
     }
 
-    pub fn get_devices(&self) -> Result<Vec<BluetoothDevice>, Box<dyn Error>> {
+    pub async fn is_powered(&self) -> Result<bool, Box<dyn Error>> {
         match self {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            BluetoothAdapter::Bluez(inner) => {
-                let device_list = inner.get_device_list()?;
-                Ok(device_list
-                    .into_iter()
-                    .map(|device| BluetoothDevice::Bluez(BluetoothDeviceBluez::new(device).into()))
-                    .collect())
-            },
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            BluetoothAdapter::Android(inner) => {
-                let device_list = inner.get_device_list()?;
-                Ok(device_list
-                    .into_iter()
-                    .map(|device| {
-                        BluetoothDevice::Android(BluetoothDeviceAndroid::new_empty(
-                            self.0.clone(),
-                            device,
-                        ))
-                    })
-                    .collect())
-            },
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            BluetoothAdapter::Mac(inner) => {
-                let device_list = inner.get_device_list()?;
-                Ok(device_list
-                    .into_iter()
-                    .map(|device| {
-                        BluetoothDevice::Mac(Arc::new(BluetoothDeviceMac::new(
-                            inner.clone(),
-                            device,
-                        )))
-                    })
-                    .collect())
-            },
-            #[cfg(not(any(
-                all(target_os = "linux", feature = "native-bluetooth"),
-                all(target_os = "android", feature = "native-bluetooth"),
-                all(target_os = "macos", feature = "native-bluetooth")
-            )))]
-            BluetoothAdapter::Empty(inner) => {
-                let device_list = inner.get_device_list()?;
-                Ok(device_list
-                    .into_iter()
-                    .map(|device| {
-                        BluetoothDevice::Empty(Arc::new(BluetoothDeviceEmpty::new(device)))
-                    })
-                    .collect())
-            },
+            #[cfg(feature = "native-bluetooth")]
+            Self::Btleplug(inner) => inner.is_powered().await,
             #[cfg(feature = "bluetooth-test")]
-            BluetoothAdapter::Mock(inner) => {
+            Self::Mock(inner) => inner.is_powered(),
+        }
+    }
+
+    pub async fn get_devices(&self) -> Result<Vec<BluetoothDevice>, Box<dyn Error>> {
+        match self {
+            #[cfg(feature = "native-bluetooth")]
+            Self::Btleplug(inner) => inner.get_devices().await,
+            #[cfg(feature = "bluetooth-test")]
+            Self::Mock(inner) => {
                 let device_list = inner.get_device_list()?;
                 Ok(device_list
                     .into_iter()
@@ -172,157 +122,34 @@ impl BluetoothAdapter {
         }
     }
 
-    pub fn get_device(&self, address: String) -> Result<Option<BluetoothDevice>, Box<dyn Error>> {
-        let devices = self.get_devices()?;
-        for device in devices {
-            if device.get_address()? == address {
-                return Ok(Some(device));
-            }
+    pub fn create_discovery_session(&self) -> Result<BluetoothDiscoverySession, Box<dyn Error>> {
+        match self {
+            #[cfg(feature = "native-bluetooth")]
+            Self::Btleplug(inner) => inner.create_discovery_session(),
+            #[cfg(feature = "bluetooth-test")]
+            Self::Mock(inner) => Ok(BluetoothDiscoverySession::Mock(Arc::new(
+                FakeBluetoothDiscoverySession::create_session(inner.clone())?,
+            ))),
         }
-        Ok(None)
     }
 
     pub fn create_mock_device(&self, _device: String) -> Result<BluetoothDevice, Box<dyn Error>> {
         match self {
             #[cfg(feature = "bluetooth-test")]
-            BluetoothAdapter::Mock(inner) => Ok(BluetoothDevice::Mock(
-                FakeBluetoothDevice::new_empty(inner.clone(), _device),
-            )),
-            _ => Err(Box::from(
-                "Error! Test functions are not supported on real devices!",
-            )),
+            Self::Mock(inner) => Ok(BluetoothDevice::Mock(FakeBluetoothDevice::new_empty(
+                inner.clone(),
+                _device,
+            ))),
+            #[cfg(feature = "native-bluetooth")]
+            _ => Err(Box::from("Test functions not supported on real devices")),
         }
     }
 
-    pub fn create_discovery_session(&self) -> Result<BluetoothDiscoverySession, Box<dyn Error>> {
-        let discovery_session = match self {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            #[allow(clippy::arc_with_non_send_sync)] // Problem with underlying library
-            BluetoothAdapter::Bluez(inner) => BluetoothDiscoverySession::Bluez(Arc::new(
-                BluetoothDiscoverySessionBluez::create_session(inner.get_id())?,
-            )),
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            BluetoothAdapter::Android(inner) => BluetoothDiscoverySession::Android(Arc::new(
-                BluetoothDiscoverySessionAndroid::create_session(inner.clone())?,
-            )),
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            BluetoothAdapter::Mac(_) => {
-                BluetoothDiscoverySession::Mac(Arc::new(BluetoothDiscoverySessionMac {}))
-            },
-            #[cfg(not(any(
-                all(target_os = "linux", feature = "native-bluetooth"),
-                all(target_os = "android", feature = "native-bluetooth"),
-                all(target_os = "macos", feature = "native-bluetooth")
-            )))]
-            BluetoothAdapter::Empty(_) => {
-                BluetoothDiscoverySession::Empty(Arc::new(BluetoothDiscoverySessionEmpty {}))
-            },
-            #[cfg(feature = "bluetooth-test")]
-            BluetoothAdapter::Mock(inner) => BluetoothDiscoverySession::Mock(Arc::new(
-                FakeBluetoothDiscoverySession::create_session(inner.clone())?,
-            )),
-        };
-        Ok(discovery_session)
-    }
-
-    pub fn get_address(&self) -> Result<String, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_address)
-    }
-
-    pub fn get_name(&self) -> Result<String, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_name)
-    }
-
-    pub fn get_alias(&self) -> Result<String, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_alias)
-    }
-
-    pub fn get_class(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_class)
-    }
-
-    pub fn is_powered(&self) -> Result<bool, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, is_powered)
-    }
-
-    pub fn is_discoverable(&self) -> Result<bool, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, is_discoverable)
-    }
-
-    pub fn is_pairable(&self) -> Result<bool, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, is_pairable)
-    }
-
-    pub fn get_pairable_timeout(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_pairable_timeout)
-    }
-
-    pub fn get_discoverable_timeout(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_discoverable_timeout)
-    }
-
-    pub fn is_discovering(&self) -> Result<bool, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, is_discovering)
-    }
-
-    pub fn get_uuids(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_uuids)
-    }
-
-    pub fn get_vendor_id_source(&self) -> Result<String, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_vendor_id_source)
-    }
-
-    pub fn get_vendor_id(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_vendor_id)
-    }
-
-    pub fn get_product_id(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_product_id)
-    }
-
-    pub fn get_device_id(&self) -> Result<u32, Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_device_id)
-    }
-
-    pub fn get_modalias(&self) -> Result<(String, u32, u32, u32), Box<dyn Error>> {
-        get_inner_and_call!(self, BluetoothAdapter, get_modalias)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_id(&self, id: String) -> Result<(), Box<dyn Error>> {
-        match self {
-            #[cfg(feature = "bluetooth-test")]
-            BluetoothAdapter::Mock(inner) => {
-                inner.set_id(id);
-                Ok(())
-            },
-            _ => Err(Box::from(
-                "Error! Test functions are not supported on real devices!",
-            )),
-        }
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_address(&self, address: String) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_address, address)
-    }
-
     #[cfg(feature = "bluetooth-test")]
     pub fn set_name(&self, name: String) -> Result<(), Box<dyn Error>> {
         get_inner_and_call_test_func!(self, BluetoothAdapter, set_name, name)
     }
 
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_alias(&self, alias: String) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_alias, alias)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_class(&self, class: u32) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_class, class)
-    }
-
     #[cfg(feature = "bluetooth-test")]
     pub fn set_powered(&self, powered: bool) -> Result<(), Box<dyn Error>> {
         get_inner_and_call_test_func!(self, BluetoothAdapter, set_powered, powered)
@@ -342,64 +169,4 @@ impl BluetoothAdapter {
     pub fn set_discoverable(&self, discoverable: bool) -> Result<(), Box<dyn Error>> {
         get_inner_and_call_test_func!(self, BluetoothAdapter, set_discoverable, discoverable)
     }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_pairable(&self, pairable: bool) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_pairable, pairable)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_pairable_timeout(&self, timeout: u32) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_pairable_timeout, timeout)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_can_start_discovery(&self, can_start_discovery: bool) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(
-            self,
-            BluetoothAdapter,
-            set_can_start_discovery,
-            can_start_discovery
-        )
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_discoverable_timeout(&self, timeout: u32) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_discoverable_timeout, timeout)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_discovering(&self, discovering: bool) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_discovering, discovering)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_can_stop_discovery(&self, can_stop_discovery: bool) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(
-            self,
-            BluetoothAdapter,
-            set_can_stop_discovery,
-            can_stop_discovery
-        )
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_uuids(&self, uuids: Vec<String>) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_uuids, uuids)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_modalias(&self, modalias: String) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_modalias, modalias)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn get_ad_datas(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, get_ad_datas)
-    }
-
-    #[cfg(feature = "bluetooth-test")]
-    pub fn set_ad_datas(&self, ad_datas: Vec<String>) -> Result<(), Box<dyn Error>> {
-        get_inner_and_call_test_func!(self, BluetoothAdapter, set_ad_datas, ad_datas)
-    }
 }

components/bluetooth/empty.rs

@@ -1,377 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use std::collections::HashMap;
-use std::error::Error;
-use std::sync::Arc;
-
-const NOT_SUPPORTED_ERROR: &str = "Error! Not supported platform!";
-
-#[derive(Clone, Debug)]
-pub struct EmptyAdapter {}
-
-impl EmptyAdapter {
-    pub fn init() -> Result<EmptyAdapter, Box<dyn Error>> {
-        Ok(EmptyAdapter::new())
-    }
-
-    fn new() -> EmptyAdapter {
-        EmptyAdapter {}
-    }
-
-    pub fn get_id(&self) -> String {
-        String::new()
-    }
-
-    pub fn get_device_list(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_address(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_name(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_alias(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_alias(&self, _value: String) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_class(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_powered(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_powered(&self, _value: bool) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_discoverable(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_discoverable(&self, _value: bool) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_pairable(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_pairable(&self, _value: bool) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_pairable_timeout(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_pairable_timeout(&self, _value: u32) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_discoverable_timeout(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_discoverable_timeout(&self, _value: u32) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_discovering(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_uuids(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_vendor_id_source(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_vendor_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_product_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_device_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_modalias(&self) -> Result<(String, u32, u32, u32), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct BluetoothDiscoverySession {}
-
-impl BluetoothDiscoverySession {
-    pub fn create_session(
-        _adapter: Arc<EmptyAdapter>,
-    ) -> Result<BluetoothDiscoverySession, Box<dyn Error>> {
-        Ok(BluetoothDiscoverySession {})
-    }
-
-    pub fn start_discovery(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn stop_discovery(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct BluetoothDevice {}
-
-impl BluetoothDevice {
-    pub fn new(_device: String) -> BluetoothDevice {
-        BluetoothDevice {}
-    }
-
-    pub fn get_id(&self) -> String {
-        String::new()
-    }
-
-    pub fn get_address(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_name(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_icon(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_class(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_appearance(&self) -> Result<u16, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_uuids(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_paired(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_connected(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_trusted(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_blocked(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_alias(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn set_alias(&self, _value: String) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_legacy_pairing(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_vendor_id_source(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_vendor_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_product_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_device_id(&self) -> Result<u32, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_modalias(&self) -> Result<(String, u32, u32, u32), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_rssi(&self) -> Result<i16, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_tx_power(&self) -> Result<i16, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_manufacturer_data(&self) -> Result<HashMap<u16, Vec<u8>>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_service_data(&self) -> Result<HashMap<String, Vec<u8>>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_gatt_services(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn connect(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn disconnect(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn connect_profile(&self, _uuid: String) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn disconnect_profile(&self, _uuid: String) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn pair(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn cancel_pairing(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct BluetoothGATTService {}
-
-impl BluetoothGATTService {
-    pub fn new(_service: String) -> BluetoothGATTService {
-        BluetoothGATTService {}
-    }
-
-    pub fn get_id(&self) -> String {
-        String::new()
-    }
-
-    pub fn get_uuid(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_primary(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_includes(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_gatt_characteristics(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct BluetoothGATTCharacteristic {}
-
-impl BluetoothGATTCharacteristic {
-    pub fn new(_characteristic: String) -> BluetoothGATTCharacteristic {
-        BluetoothGATTCharacteristic {}
-    }
-
-    pub fn get_id(&self) -> String {
-        String::new()
-    }
-
-    pub fn get_uuid(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_value(&self) -> Result<Vec<u8>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn is_notifying(&self) -> Result<bool, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_flags(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_gatt_descriptors(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn read_value(&self) -> Result<Vec<u8>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn write_value(&self, _values: Vec<u8>) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn start_notify(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn stop_notify(&self) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct BluetoothGATTDescriptor {}
-
-impl BluetoothGATTDescriptor {
-    pub fn new(_descriptor: String) -> BluetoothGATTDescriptor {
-        BluetoothGATTDescriptor {}
-    }
-
-    pub fn get_id(&self) -> String {
-        String::new()
-    }
-
-    pub fn get_uuid(&self) -> Result<String, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_value(&self) -> Result<Vec<u8>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn get_flags(&self) -> Result<Vec<String>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn read_value(&self) -> Result<Vec<u8>, Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-
-    pub fn write_value(&self, _values: Vec<u8>) -> Result<(), Box<dyn Error>> {
-        Err(Box::from(NOT_SUPPORTED_ERROR))
-    }
-}

components/bluetooth/lib.rs

@@ -4,12 +4,6 @@
 
 pub mod adapter;
 pub mod bluetooth;
-#[cfg(not(any(
-    all(target_os = "linux", feature = "native-bluetooth"),
-    all(target_os = "android", feature = "native-bluetooth"),
-    all(target_os = "macos", feature = "native-bluetooth")
-)))]
-mod empty;
 mod macros;
 pub mod test;
 
@@ -19,21 +13,23 @@ use std::string::String;
 use std::thread;
 use std::time::Duration;
 
-use base::generic_channel::{self, GenericReceiver, GenericSender};
-use base::id::WebViewId;
 use bitflags::bitflags;
-use bluetooth_traits::blocklist::{Blocklist, uuid_is_blocklisted};
-use bluetooth_traits::scanfilter::{
+use embedder_traits::{BluetoothDeviceDescription, EmbedderMsg, EmbedderProxy};
+use log::warn;
+use rand::{self, Rng};
+#[cfg(not(feature = "native-bluetooth"))]
+use servo_base::generic_channel::GenericReceiver;
+use servo_base::generic_channel::{self, GenericSender};
+use servo_base::id::WebViewId;
+use servo_bluetooth_traits::blocklist::{Blocklist, uuid_is_blocklisted};
+use servo_bluetooth_traits::scanfilter::{
     BluetoothScanfilter, BluetoothScanfilterSequence, RequestDeviceoptions,
 };
-use bluetooth_traits::{
+use servo_bluetooth_traits::{
     BluetoothCharacteristicMsg, BluetoothDescriptorMsg, BluetoothDeviceMsg, BluetoothError,
     BluetoothRequest, BluetoothResponse, BluetoothResponseResult, BluetoothResult,
     BluetoothServiceMsg, GATTType,
 };
-use embedder_traits::{EmbedderMsg, EmbedderProxy};
-use log::warn;
-use rand::{self, Rng};
 use servo_config::pref;
 
 use crate::bluetooth::{
@@ -75,6 +71,47 @@ pub trait BluetoothThreadFactory {
 }
 
 impl BluetoothThreadFactory for GenericSender<BluetoothRequest> {
+    #[cfg(feature = "native-bluetooth")]
+    fn new(embedder_proxy: EmbedderProxy) -> GenericSender<BluetoothRequest> {
+        let (sender, receiver) = generic_channel::channel().unwrap();
+
+        thread::Builder::new()
+            .name("Bluetooth".to_owned())
+            .spawn(move || {
+                let runtime = tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .expect("Failed to create bluetooth tokio runtime");
+
+                let adapter = runtime.block_on(async {
+                    if pref!(dom_bluetooth_enabled) {
+                        BluetoothAdapter::new().await.ok()
+                    } else {
+                        BluetoothAdapter::new_mock().ok()
+                    }
+                });
+
+                // Bridge: GenericReceiver -> tokio mpsc channel
+                let (async_sender, async_receiver) = tokio::sync::mpsc::unbounded_channel();
+                thread::Builder::new()
+                    .name("BluetoothTokioBridge".to_owned())
+                    .spawn(move || {
+                        while let Ok(message) = receiver.recv() {
+                            if async_sender.send(message).is_err() {
+                                break;
+                            }
+                        }
+                    })
+                    .expect("BT Tokio Bridge thread spawning failed");
+
+                let mut manager = BluetoothManager::new(adapter, embedder_proxy);
+                runtime.block_on(manager.start(async_receiver));
+            })
+            .expect("Thread spawning failed");
+        sender
+    }
+
+    #[cfg(not(feature = "native-bluetooth"))]
     fn new(embedder_proxy: EmbedderProxy) -> GenericSender<BluetoothRequest> {
         let (sender, receiver) = generic_channel::channel().unwrap();
         let adapter = if pref!(dom_bluetooth_enabled) {
@@ -86,7 +123,7 @@ impl BluetoothThreadFactory for GenericSender<BluetoothRequest> {
         thread::Builder::new()
             .name("Bluetooth".to_owned())
             .spawn(move || {
-                BluetoothManager::new(receiver, adapter, embedder_proxy).start();
+                BluetoothManager::new(adapter, embedder_proxy).start_sync(receiver);
             })
             .expect("Thread spawning failed");
         sender
@@ -94,21 +131,21 @@ impl BluetoothThreadFactory for GenericSender<BluetoothRequest> {
 }
 
 /// <https://webbluetoothcg.github.io/web-bluetooth/#matches-a-filter>
-fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> bool {
+async fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> bool {
     if filter.is_empty_or_invalid() {
         return false;
     }
 
     // Step 1.
     if let Some(name) = filter.get_name() {
-        if device.get_name().ok() != Some(name.to_string()) {
+        if device.get_name().await.ok() != Some(name.to_string()) {
             return false;
         }
     }
 
     // Step 2.
     if !filter.get_name_prefix().is_empty() {
-        if let Ok(device_name) = device.get_name() {
+        if let Ok(device_name) = device.get_name().await {
             if !device_name.starts_with(filter.get_name_prefix()) {
                 return false;
             }
@@ -119,7 +156,7 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
 
     // Step 3.
     if !filter.get_services().is_empty() {
-        if let Ok(device_uuids) = device.get_uuids() {
+        if let Ok(device_uuids) = device.get_uuids().await {
             for service in filter.get_services() {
                 if !device_uuids.iter().any(|x| x == service) {
                     return false;
@@ -130,7 +167,7 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
 
     // Step 4.
     if let Some(manufacturer_data) = filter.get_manufacturer_data() {
-        let advertised_manufacturer_data = match device.get_manufacturer_data() {
+        let advertised_manufacturer_data = match device.get_manufacturer_data().await {
             Ok(data) => data,
             Err(_) => return false,
         };
@@ -147,7 +184,7 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
 
     // Step 5.
     if let Some(service_data) = filter.get_service_data() {
-        let advertised_service_data = match device.get_service_data() {
+        let advertised_service_data = match device.get_service_data().await {
             Ok(data) => data,
             Err(_) => return false,
         };
@@ -185,12 +222,28 @@ fn data_filter_matches(data: &[u8], prefix: &[u8], mask: &[u8]) -> bool {
     true
 }
 
-fn matches_filters(device: &BluetoothDevice, filters: &BluetoothScanfilterSequence) -> bool {
+async fn matches_filters(device: &BluetoothDevice, filters: &BluetoothScanfilterSequence) -> bool {
     if filters.has_empty_or_invalid_filter() {
         return false;
     }
+    for f in filters.iter() {
+        if matches_filter(device, f).await {
+            return true;
+        }
+    }
+    false
+}
 
-    filters.iter().any(|f| matches_filter(device, f))
+/// Async sleep that works in both tokio and non-tokio (mock) contexts.
+async fn async_sleep(duration: Duration) {
+    #[cfg(feature = "native-bluetooth")]
+    {
+        tokio::time::sleep(duration).await;
+    }
+    #[cfg(not(feature = "native-bluetooth"))]
+    {
+        thread::sleep(duration);
+    }
 }
 
 fn is_mock_adapter(adapter: &BluetoothAdapter) -> bool {
@@ -198,7 +251,6 @@ fn is_mock_adapter(adapter: &BluetoothAdapter) -> bool {
 }
 
 pub struct BluetoothManager {
-    receiver: GenericReceiver<BluetoothRequest>,
     adapter: Option<BluetoothAdapter>,
     address_to_id: HashMap<String, String>,
     service_to_device: HashMap<String, String>,
@@ -214,12 +266,10 @@ pub struct BluetoothManager {
 
 impl BluetoothManager {
     pub fn new(
-        receiver: GenericReceiver<BluetoothRequest>,
         adapter: Option<BluetoothAdapter>,
         embedder_proxy: EmbedderProxy,
     ) -> BluetoothManager {
         BluetoothManager {
-            receiver,
             adapter,
             address_to_id: HashMap::new(),
             service_to_device: HashMap::new(),
@@ -234,58 +284,82 @@ impl BluetoothManager {
         }
     }
 
-    fn start(&mut self) {
-        while let Ok(msg) = self.receiver.recv() {
-            match msg {
-                BluetoothRequest::RequestDevice(options, sender) => {
-                    let _ = sender.send(self.request_device(options));
-                },
-                BluetoothRequest::GATTServerConnect(device_id, sender) => {
-                    let _ = sender.send(self.gatt_server_connect(device_id));
-                },
-                BluetoothRequest::GATTServerDisconnect(device_id, sender) => {
-                    let _ = sender.send(self.gatt_server_disconnect(device_id));
-                },
-                BluetoothRequest::GetGATTChildren(id, uuid, single, child_type, sender) => {
-                    let _ = sender.send(self.get_gatt_children(id, uuid, single, child_type));
-                },
-                BluetoothRequest::ReadValue(id, sender) => {
-                    let _ = sender.send(self.read_value(id));
-                },
-                BluetoothRequest::WriteValue(id, value, sender) => {
-                    let _ = sender.send(self.write_value(id, value));
-                },
-                BluetoothRequest::EnableNotification(id, enable, sender) => {
-                    let _ = sender.send(self.enable_notification(id, enable));
-                },
-                BluetoothRequest::WatchAdvertisements(id, sender) => {
-                    let _ = sender.send(self.watch_advertisements(id));
-                },
-                BluetoothRequest::Test(data_set_name, sender) => {
-                    let _ = sender.send(self.test(data_set_name));
-                },
-                BluetoothRequest::SetRepresentedToNull(
-                    service_ids,
-                    characteristic_ids,
-                    descriptor_ids,
-                ) => self.remove_ids_from_caches(service_ids, characteristic_ids, descriptor_ids),
-                BluetoothRequest::IsRepresentedDeviceNull(id, sender) => {
-                    let _ = sender.send(!self.device_is_cached(&id));
-                },
-                BluetoothRequest::GetAvailability(sender) => {
-                    let _ = sender.send(self.get_availability());
-                },
-                BluetoothRequest::MatchesFilter(id, filters, sender) => {
-                    let _ = sender.send(self.device_matches_filter(&id, &filters));
-                },
-                BluetoothRequest::Exit => break,
+    /// Async message loop.
+    /// The tokio runtime is always active, so btleplug's background tasks run continuously.
+    #[cfg(feature = "native-bluetooth")]
+    async fn start(&mut self, mut rx: tokio::sync::mpsc::UnboundedReceiver<BluetoothRequest>) {
+        while let Some(msg) = rx.recv().await {
+            if self.handle_message(msg).await {
+                break;
             }
         }
     }
 
+    /// Synchronous message loop.
+    #[cfg(not(feature = "native-bluetooth"))]
+    fn start_sync(&mut self, receiver: GenericReceiver<BluetoothRequest>) {
+        // For mock-only builds, we don't have a tokio runtime.
+        // Create a minimal one just to call async methods (which are fast for mock).
+        while let Ok(msg) = receiver.recv() {
+            let should_exit = futures::executor::block_on(self.handle_message(msg));
+            if should_exit {
+                break;
+            }
+        }
+    }
+
+    /// Handle a single message. Returns true if the event loop should exit.
+    async fn handle_message(&mut self, msg: BluetoothRequest) -> bool {
+        match msg {
+            BluetoothRequest::RequestDevice(options, sender) => {
+                let _ = sender.send(self.request_device(options).await);
+            },
+            BluetoothRequest::GATTServerConnect(device_id, sender) => {
+                let _ = sender.send(self.gatt_server_connect(device_id).await);
+            },
+            BluetoothRequest::GATTServerDisconnect(device_id, sender) => {
+                let _ = sender.send(self.gatt_server_disconnect(device_id).await);
+            },
+            BluetoothRequest::GetGATTChildren(id, uuid, single, child_type, sender) => {
+                let _ = sender.send(self.get_gatt_children(id, uuid, single, child_type).await);
+            },
+            BluetoothRequest::ReadValue(id, sender) => {
+                let _ = sender.send(self.read_value(id).await);
+            },
+            BluetoothRequest::WriteValue(id, value, sender) => {
+                let _ = sender.send(self.write_value(id, value).await);
+            },
+            BluetoothRequest::EnableNotification(id, enable, sender) => {
+                let _ = sender.send(self.enable_notification(id, enable).await);
+            },
+            BluetoothRequest::WatchAdvertisements(id, sender) => {
+                let _ = sender.send(self.watch_advertisements(id));
+            },
+            BluetoothRequest::Test(data_set_name, sender) => {
+                let _ = sender.send(self.test(data_set_name).await);
+            },
+            BluetoothRequest::SetRepresentedToNull(
+                service_ids,
+                characteristic_ids,
+                descriptor_ids,
+            ) => self.remove_ids_from_caches(service_ids, characteristic_ids, descriptor_ids),
+            BluetoothRequest::IsRepresentedDeviceNull(id, sender) => {
+                let _ = sender.send(!self.device_is_cached(&id));
+            },
+            BluetoothRequest::GetAvailability(sender) => {
+                let _ = sender.send(self.get_availability().await);
+            },
+            BluetoothRequest::MatchesFilter(id, filters, sender) => {
+                let _ = sender.send(self.device_matches_filter(&id, &filters).await);
+            },
+            BluetoothRequest::Exit => return true,
+        }
+        false
+    }
+
     // Test
 
-    fn test(&mut self, data_set_name: String) -> BluetoothResult<()> {
+    async fn test(&mut self, data_set_name: String) -> BluetoothResult<()> {
         self.address_to_id.clear();
         self.service_to_device.clear();
         self.characteristic_to_service.clear();
@@ -296,7 +370,7 @@ impl BluetoothManager {
         self.cached_descriptors.clear();
         self.allowed_services.clear();
         self.adapter = BluetoothAdapter::new_mock().ok();
-        match test::test(self, data_set_name) {
+        match test::test(self, data_set_name).await {
             Ok(_) => Ok(()),
             Err(error) => Err(BluetoothError::Type(error.to_string())),
         }
@@ -326,13 +400,20 @@ impl BluetoothManager {
 
     // Adapter
 
-    pub fn get_or_create_adapter(&mut self) -> Option<BluetoothAdapter> {
-        let adapter_valid = self
-            .adapter
-            .as_ref()
-            .is_some_and(|a| a.get_address().is_ok());
+    pub async fn get_or_create_adapter(&mut self) -> Option<BluetoothAdapter> {
+        let adapter_valid = match self.adapter.as_ref() {
+            Some(a) => a.get_address().await.is_ok(),
+            None => false,
+        };
         if !adapter_valid {
-            self.adapter = BluetoothAdapter::new().ok();
+            #[cfg(feature = "native-bluetooth")]
+            {
+                self.adapter = BluetoothAdapter::new().await.ok();
+            }
+            #[cfg(not(feature = "native-bluetooth"))]
+            {
+                self.adapter = BluetoothAdapter::new().ok();
+            }
         }
 
         let adapter = self.adapter.as_ref()?;
@@ -344,10 +425,10 @@ impl BluetoothManager {
         self.adapter.clone()
     }
 
-    fn get_adapter(&mut self) -> BluetoothResult<BluetoothAdapter> {
-        match self.get_or_create_adapter() {
+    async fn get_adapter(&mut self) -> BluetoothResult<BluetoothAdapter> {
+        match self.get_or_create_adapter().await {
             Some(adapter) => {
-                if !adapter.is_powered().unwrap_or(false) {
+                if !adapter.is_powered().await.unwrap_or(false) {
                     return Err(BluetoothError::NotFound);
                 }
                 Ok(adapter)
@@ -358,8 +439,11 @@ impl BluetoothManager {
 
     // Device
 
-    fn get_and_cache_devices(&mut self, adapter: &mut BluetoothAdapter) -> Vec<BluetoothDevice> {
-        let devices = adapter.get_devices().unwrap_or_default();
+    async fn get_and_cache_devices(
+        &mut self,
+        adapter: &mut BluetoothAdapter,
+    ) -> Vec<BluetoothDevice> {
+        let devices = adapter.get_devices().await.unwrap_or_default();
         for device in &devices {
             if let Ok(address) = device.get_address() {
                 #[allow(clippy::map_entry)] // False positive, the fix creates a borrowing error
@@ -375,18 +459,18 @@ impl BluetoothManager {
         self.cached_devices.values().cloned().collect()
     }
 
-    fn get_device(
+    async fn get_device(
         &mut self,
         adapter: &mut BluetoothAdapter,
         device_id: &str,
     ) -> Option<&BluetoothDevice> {
         return_if_cached!(self.cached_devices, device_id);
-        self.get_and_cache_devices(adapter);
+        self.get_and_cache_devices(adapter).await;
         return_if_cached!(self.cached_devices, device_id);
         None
     }
 
-    fn select_device(
+    async fn select_device(
         &mut self,
         webview_id: WebViewId,
         devices: Vec<BluetoothDevice>,
@@ -401,12 +485,18 @@ impl BluetoothManager {
             return None;
         }
 
-        let mut dialog_rows: Vec<String> = vec![];
+        let mut device_descriptions = Vec::with_capacity(devices.len());
         for device in devices {
-            dialog_rows.extend_from_slice(&[
-                device.get_address().unwrap_or("".to_string()),
-                device.get_name().unwrap_or("".to_string()),
-            ]);
+            let address = device.get_address().unwrap_or_default();
+            let name = device.get_name().await.unwrap_or_else(|_| {
+                let short = if address.len() > 8 {
+                    &address[..8]
+                } else {
+                    &address
+                };
+                format!("Unknown ({}...)", short)
+            });
+            device_descriptions.push(BluetoothDeviceDescription { address, name });
         }
 
         let (ipc_sender, ipc_receiver) =
@@ -414,7 +504,7 @@ impl BluetoothManager {
         self.embedder_proxy
             .send(EmbedderMsg::GetSelectedBluetoothDevice(
                 webview_id,
-                dialog_rows,
+                device_descriptions,
                 ipc_sender,
             ));
 
@@ -449,27 +539,27 @@ impl BluetoothManager {
             self.address_to_id.values().any(|v| v == device_id)
     }
 
-    fn device_matches_filter(
+    async fn device_matches_filter(
         &mut self,
         device_id: &str,
         filters: &BluetoothScanfilterSequence,
     ) -> BluetoothResult<bool> {
-        let mut adapter = self.get_adapter()?;
-        match self.get_device(&mut adapter, device_id) {
-            Some(device) => Ok(matches_filters(device, filters)),
+        let mut adapter = self.get_adapter().await?;
+        match self.get_device(&mut adapter, device_id).await {
+            Some(device) => Ok(matches_filters(device, filters).await),
             None => Ok(false),
         }
     }
 
     // Service
 
-    fn get_and_cache_gatt_services(
+    async fn get_and_cache_gatt_services(
         &mut self,
         adapter: &mut BluetoothAdapter,
         device_id: &str,
     ) -> Vec<BluetoothGATTService> {
-        let mut services = match self.get_device(adapter, device_id) {
-            Some(d) => d.get_gatt_services().unwrap_or_default(),
+        let mut services = match self.get_device(adapter, device_id).await {
+            Some(d) => d.get_gatt_services().await.unwrap_or_default(),
             None => vec![],
         };
 
@@ -488,14 +578,14 @@ impl BluetoothManager {
         services
     }
 
-    fn get_gatt_service(
+    async fn get_gatt_service(
         &mut self,
         adapter: &mut BluetoothAdapter,
         service_id: &str,
     ) -> Option<&BluetoothGATTService> {
         return_if_cached!(self.cached_services, service_id);
         let device_id = self.service_to_device.get(service_id)?.clone();
-        self.get_and_cache_gatt_services(adapter, &device_id);
+        self.get_and_cache_gatt_services(adapter, &device_id).await;
         return_if_cached!(self.cached_services, service_id);
         None
     }
@@ -507,12 +597,12 @@ impl BluetoothManager {
 
     // Characteristic
 
-    fn get_and_cache_gatt_characteristics(
+    async fn get_and_cache_gatt_characteristics(
         &mut self,
         adapter: &mut BluetoothAdapter,
         service_id: &str,
     ) -> Vec<BluetoothGATTCharacteristic> {
-        let mut characteristics = match self.get_gatt_service(adapter, service_id) {
+        let mut characteristics = match self.get_gatt_service(adapter, service_id).await {
             Some(s) => s.get_gatt_characteristics().unwrap_or_default(),
             None => vec![],
         };
@@ -528,7 +618,7 @@ impl BluetoothManager {
         characteristics
     }
 
-    fn get_gatt_characteristic(
+    async fn get_gatt_characteristic(
         &mut self,
         adapter: &mut BluetoothAdapter,
         characteristic_id: &str,
@@ -538,7 +628,8 @@ impl BluetoothManager {
             .characteristic_to_service
             .get(characteristic_id)?
             .clone();
-        self.get_and_cache_gatt_characteristics(adapter, &service_id);
+        self.get_and_cache_gatt_characteristics(adapter, &service_id)
+            .await;
         return_if_cached!(self.cached_characteristics, characteristic_id);
         None
     }
@@ -571,12 +662,15 @@ impl BluetoothManager {
 
     // Descriptor
 
-    fn get_and_cache_gatt_descriptors(
+    async fn get_and_cache_gatt_descriptors(
         &mut self,
         adapter: &mut BluetoothAdapter,
         characteristic_id: &str,
     ) -> Vec<BluetoothGATTDescriptor> {
-        let mut descriptors = match self.get_gatt_characteristic(adapter, characteristic_id) {
+        let mut descriptors = match self
+            .get_gatt_characteristic(adapter, characteristic_id)
+            .await
+        {
             Some(c) => c.get_gatt_descriptors().unwrap_or_default(),
             None => vec![],
         };
@@ -592,7 +686,7 @@ impl BluetoothManager {
         descriptors
     }
 
-    fn get_gatt_descriptor(
+    async fn get_gatt_descriptor(
         &mut self,
         adapter: &mut BluetoothAdapter,
         descriptor_id: &str,
@@ -602,7 +696,8 @@ impl BluetoothManager {
             .descriptor_to_characteristic
             .get(descriptor_id)?
             .clone();
-        self.get_and_cache_gatt_descriptors(adapter, &characteristic_id);
+        self.get_and_cache_gatt_descriptors(adapter, &characteristic_id)
+            .await;
         return_if_cached!(self.cached_descriptors, descriptor_id);
         None
     }
@@ -610,29 +705,37 @@ impl BluetoothManager {
     // Methods
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#request-bluetooth-devices>
-    fn request_device(&mut self, options: RequestDeviceoptions) -> BluetoothResponseResult {
+    async fn request_device(&mut self, options: RequestDeviceoptions) -> BluetoothResponseResult {
         // Step 6.
-        let mut adapter = self.get_adapter()?;
+        let mut adapter = self.get_adapter().await?;
 
         // Step 7.
         // Note: There are no requiredServiceUUIDS, we scan for all devices.
         if let Ok(ref session) = adapter.create_discovery_session() {
-            if session.start_discovery().is_ok() && !is_mock_adapter(&adapter) {
-                thread::sleep(Duration::from_millis(DISCOVERY_TIMEOUT_MS));
+            if session.start_discovery().await.is_ok() && !is_mock_adapter(&adapter) {
+                async_sleep(Duration::from_millis(DISCOVERY_TIMEOUT_MS)).await;
             }
-
-            let _ = session.stop_discovery();
+            let _ = session.stop_discovery().await;
         }
 
-        let mut matched_devices = self.get_and_cache_devices(&mut adapter);
+        let mut matched_devices = self.get_and_cache_devices(&mut adapter).await;
 
         // Step 8.
         if !options.is_accepting_all_devices() {
-            matched_devices.retain(|d| matches_filters(d, options.get_filters()));
+            let mut filtered = Vec::new();
+            for d in matched_devices {
+                if matches_filters(&d, options.get_filters()).await {
+                    filtered.push(d);
+                }
+            }
+            matched_devices = filtered;
         }
 
         // Step 9.
-        if let Some(address) = self.select_device(options.webview_id(), matched_devices, &adapter) {
+        if let Some(address) = self
+            .select_device(options.webview_id(), matched_devices, &adapter)
+            .await
+        {
             let device_id = match self.address_to_id.get(&address) {
                 Some(id) => id.clone(),
                 None => return Err(BluetoothError::NotFound),
@@ -642,10 +745,10 @@ impl BluetoothManager {
                 services = services_set | &services;
             }
             self.allowed_services.insert(device_id.clone(), services);
-            if let Some(device) = self.get_device(&mut adapter, &device_id) {
+            if let Some(device) = self.get_device(&mut adapter, &device_id).await {
                 let message = BluetoothDeviceMsg {
                     id: device_id,
-                    name: device.get_name().ok(),
+                    name: device.get_name().await.ok(),
                 };
                 return Ok(BluetoothResponse::RequestDevice(message));
             }
@@ -656,28 +759,28 @@ impl BluetoothManager {
     }
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-connect>
-    fn gatt_server_connect(&mut self, device_id: String) -> BluetoothResponseResult {
+    async fn gatt_server_connect(&mut self, device_id: String) -> BluetoothResponseResult {
         // Step 2.
         if !self.device_is_cached(&device_id) {
             return Err(BluetoothError::Network);
         }
-        let mut adapter = self.get_adapter()?;
+        let mut adapter = self.get_adapter().await?;
 
         // Step 5.1.1.
-        match self.get_device(&mut adapter, &device_id) {
+        match self.get_device(&mut adapter, &device_id).await {
             Some(d) => {
-                if d.is_connected().unwrap_or(false) {
+                if d.is_connected().await.unwrap_or(false) {
                     return Ok(BluetoothResponse::GATTServerConnect(true));
                 }
-                let _ = d.connect();
+                let _ = d.connect().await;
                 for _ in 0..MAXIMUM_TRANSACTION_TIME {
-                    if d.is_connected().unwrap_or(false) {
+                    if d.is_connected().await.unwrap_or(false) {
                         return Ok(BluetoothResponse::GATTServerConnect(true));
                     } else {
                         if is_mock_adapter(&adapter) {
                             break;
                         }
-                        thread::sleep(Duration::from_millis(CONNECTION_TIMEOUT_MS));
+                        async_sleep(Duration::from_millis(CONNECTION_TIMEOUT_MS)).await;
                     }
                     // TODO: Step 5.1.4: Use the exchange MTU procedure.
                 }
@@ -689,18 +792,18 @@ impl BluetoothManager {
     }
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-disconnect>
-    fn gatt_server_disconnect(&mut self, device_id: String) -> BluetoothResult<()> {
-        let mut adapter = self.get_adapter()?;
-        match self.get_device(&mut adapter, &device_id) {
+    async fn gatt_server_disconnect(&mut self, device_id: String) -> BluetoothResult<()> {
+        let mut adapter = self.get_adapter().await?;
+        match self.get_device(&mut adapter, &device_id).await {
             Some(d) => {
                 // Step 2.
-                if !d.is_connected().unwrap_or(true) {
+                if !d.is_connected().await.unwrap_or(true) {
                     return Ok(());
                 }
-                let _ = d.disconnect();
+                let _ = d.disconnect().await;
                 for _ in 0..MAXIMUM_TRANSACTION_TIME {
-                    if d.is_connected().unwrap_or(true) {
-                        thread::sleep(Duration::from_millis(CONNECTION_TIMEOUT_MS))
+                    if d.is_connected().await.unwrap_or(true) {
+                        async_sleep(Duration::from_millis(CONNECTION_TIMEOUT_MS)).await;
                     } else {
                         return Ok(());
                     }
@@ -712,14 +815,14 @@ impl BluetoothManager {
     }
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#getgattchildren>
-    fn get_gatt_children(
+    async fn get_gatt_children(
         &mut self,
         id: String,
         uuid: Option<String>,
         single: bool,
         child_type: GATTType,
     ) -> BluetoothResponseResult {
-        let mut adapter = self.get_adapter()?;
+        let mut adapter = self.get_adapter().await?;
         match child_type {
             GATTType::PrimaryService => {
                 // Step 5.
@@ -736,7 +839,7 @@ impl BluetoothManager {
                         return Err(BluetoothError::Security);
                     }
                 }
-                let mut services = self.get_and_cache_gatt_services(&mut adapter, &id);
+                let mut services = self.get_and_cache_gatt_services(&mut adapter, &id).await;
                 if let Some(uuid) = uuid {
                     services.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
@@ -752,6 +855,7 @@ impl BluetoothManager {
                         }
                     }
                 }
+
                 // Step 7.
                 if services_vec.is_empty() {
                     return Err(BluetoothError::NotFound);
@@ -765,8 +869,9 @@ impl BluetoothManager {
                     return Err(BluetoothError::InvalidState);
                 }
                 // Step 6.
-                let mut characteristics =
-                    self.get_and_cache_gatt_characteristics(&mut adapter, &id);
+                let mut characteristics = self
+                    .get_and_cache_gatt_characteristics(&mut adapter, &id)
+                    .await;
                 if let Some(uuid) = uuid {
                     characteristics.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
@@ -812,7 +917,7 @@ impl BluetoothManager {
                     Some(device) => device,
                     None => return Err(BluetoothError::NotFound),
                 };
-                let primary_service = match self.get_gatt_service(&mut adapter, &id) {
+                let primary_service = match self.get_gatt_service(&mut adapter, &id).await {
                     Some(s) => s,
                     None => return Err(BluetoothError::NotFound),
                 };
@@ -845,7 +950,7 @@ impl BluetoothManager {
                     return Err(BluetoothError::InvalidState);
                 }
                 // Step 6.
-                let mut descriptors = self.get_and_cache_gatt_descriptors(&mut adapter, &id);
+                let mut descriptors = self.get_and_cache_gatt_descriptors(&mut adapter, &id).await;
                 if let Some(uuid) = uuid {
                     descriptors.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
@@ -870,23 +975,25 @@ impl BluetoothManager {
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-readvalue>
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-readvalue>
-    fn read_value(&mut self, id: String) -> BluetoothResponseResult {
+    async fn read_value(&mut self, id: String) -> BluetoothResponseResult {
         // (Characteristic) Step 5.2: Missing because it is optional.
         // (Descriptor)     Step 5.1: Missing because it is optional.
-        let mut adapter = self.get_adapter()?;
+        let mut adapter = self.get_adapter().await?;
 
         // (Characteristic) Step 5.3.
-        let mut value = self
-            .get_gatt_characteristic(&mut adapter, &id)
-            .map(|c| c.read_value().unwrap_or_default());
+        let mut value = match self.get_gatt_characteristic(&mut adapter, &id).await {
+            Some(c) => Some(c.read_value().await.unwrap_or_default()),
+            None => None,
+        };
 
         // (Characteristic) TODO: Step 5.4: Handle all the errors returned from the read_value call.
 
         // (Descriptor) Step 5.2.
         if value.is_none() {
-            value = self
-                .get_gatt_descriptor(&mut adapter, &id)
-                .map(|d| d.read_value().unwrap_or_default());
+            value = match self.get_gatt_descriptor(&mut adapter, &id).await {
+                Some(d) => Some(d.read_value().await.unwrap_or_default()),
+                None => None,
+            };
         }
 
         // (Descriptor) TODO: Step 5.3: Handle all the errors returned from the read_value call.
@@ -904,36 +1011,36 @@ impl BluetoothManager {
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-writevalue>
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-writevalue>
-    fn write_value(&mut self, id: String, value: Vec<u8>) -> BluetoothResponseResult {
+    async fn write_value(&mut self, id: String, value: Vec<u8>) -> BluetoothResponseResult {
         // (Characteristic) Step 7.2: Missing because it is optional.
         // (Descriptor)     Step 7.1: Missing because it is optional.
-        let mut adapter = self.get_adapter()?;
+        let mut adapter = self.get_adapter().await?;
 
         // (Characteristic) Step 7.3.
-        let mut result = self
-            .get_gatt_characteristic(&mut adapter, &id)
-            .map(|c| c.write_value(value.clone()));
+        let mut result = match self.get_gatt_characteristic(&mut adapter, &id).await {
+            Some(c) => Some(c.write_value(value.clone()).await),
+            None => None,
+        };
 
         // (Characteristic) TODO: Step 7.4: Handle all the errors returned from the write_value call.
 
         // (Descriptor) Step 7.2.
         if result.is_none() {
-            result = self
-                .get_gatt_descriptor(&mut adapter, &id)
-                .map(|d| d.write_value(value.clone()));
+            result = match self.get_gatt_descriptor(&mut adapter, &id).await {
+                Some(d) => Some(d.write_value(value.clone()).await),
+                None => None,
+            };
         }
 
         // (Descriptor) TODO: Step 7.3: Handle all the errors returned from the write_value call.
 
         match result {
-            Some(v) => match v {
-                // (Characteristic) Step 7.5.3.
-                // (Descriptor) Step 7.4.3.
-                Ok(_) => Ok(BluetoothResponse::WriteValue(value)),
+            // (Characteristic) Step 7.5.3.
+            // (Descriptor) Step 7.4.3.
+            Some(Ok(_)) => Ok(BluetoothResponse::WriteValue(value)),
 
-                // (Characteristic) Step 7.1.
-                Err(_) => Err(BluetoothError::NotSupported),
-            },
+            // (Characteristic) Step 7.1.
+            Some(Err(_)) => Err(BluetoothError::NotSupported),
 
             // (Characteristic) Step 6.
             // (Descriptor)     Step 6.
@@ -943,7 +1050,7 @@ impl BluetoothManager {
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-startnotifications>
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-stopnotifications>
-    fn enable_notification(&mut self, id: String, enable: bool) -> BluetoothResponseResult {
+    async fn enable_notification(&mut self, id: String, enable: bool) -> BluetoothResponseResult {
         // (StartNotifications) Step 3 - 4.
         // (StopNotifications) Step 1 - 2.
         if !self.characteristic_is_cached(&id) {
@@ -951,16 +1058,16 @@ impl BluetoothManager {
         }
 
         // (StartNotification) TODO: Step 7: Missing because it is optional.
-        let mut adapter = self.get_adapter()?;
-        match self.get_gatt_characteristic(&mut adapter, &id) {
+        let mut adapter = self.get_adapter().await?;
+        match self.get_gatt_characteristic(&mut adapter, &id).await {
             Some(c) => {
                 let result = if enable {
                     // (StartNotification) Step 8.
                     // TODO: Handle all the errors returned from the start_notify call.
-                    c.start_notify()
+                    c.start_notify().await
                 } else {
                     // (StopNotification) Step 4.
-                    c.stop_notify()
+                    c.stop_notify().await
                 };
                 match result {
                     // (StartNotification) Step 11.
@@ -984,9 +1091,9 @@ impl BluetoothManager {
     }
 
     /// <https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-getavailability>
-    fn get_availability(&mut self) -> BluetoothResponseResult {
+    async fn get_availability(&mut self) -> BluetoothResponseResult {
         Ok(BluetoothResponse::GetAvailability(
-            self.get_adapter().is_ok(),
+            self.get_adapter().await.is_ok(),
         ))
     }
 }

components/bluetooth/macros.rs

@@ -2,81 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-macro_rules! get_inner_and_call(
-    ($enum_value: expr, $enum_type: ident, $function_name: ident) => {
-        match $enum_value {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            &$enum_type::Bluez(ref bluez) => bluez.$function_name(),
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            &$enum_type::Android(ref android) => android.$function_name(),
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            &$enum_type::Mac(ref mac) => mac.$function_name(),
-            #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
-                          all(target_os = "android", feature = "native-bluetooth"),
-                          all(target_os = "macos", feature = "native-bluetooth"))))]
-            &$enum_type::Empty(ref empty) => empty.$function_name(),
-            #[cfg(feature = "bluetooth-test")]
-            &$enum_type::Mock(ref fake) => fake.$function_name(),
-        }
-    };
-
-    (@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident) => {
-        match $enum_value {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            &$enum_type::Bluez(ref bluez) => bluez.$function_name(None),
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            &$enum_type::Android(ref android) => android.$function_name(),
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            &$enum_type::Mac(ref mac) => mac.$function_name(),
-            #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
-                          all(target_os = "android", feature = "native-bluetooth"),
-                          all(target_os = "macos", feature = "native-bluetooth"))))]
-            &$enum_type::Empty(ref empty) => empty.$function_name(),
-            #[cfg(feature = "bluetooth-test")]
-            &$enum_type::Mock(ref fake) => fake.$function_name(),
-        }
-    };
-
-    ($enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => {
-        match $enum_value {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            &$enum_type::Bluez(ref bluez) => bluez.$function_name($value),
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            &$enum_type::Android(ref android) => android.$function_name($value),
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            &$enum_type::Mac(ref mac) => mac.$function_name($value),
-            #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
-                          all(target_os = "android", feature = "native-bluetooth"),
-                          all(target_os = "macos", feature = "native-bluetooth"))))]
-            &$enum_type::Empty(ref empty) => empty.$function_name($value),
-            #[cfg(feature = "bluetooth-test")]
-            &$enum_type::Mock(ref fake) => fake.$function_name($value),
-        }
-    };
-
-    (@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => {
-        match $enum_value {
-            #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
-            &$enum_type::Bluez(ref bluez) => bluez.$function_name($value, None),
-            #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
-            &$enum_type::Android(ref android) => android.$function_name($value),
-            #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
-            &$enum_type::Mac(ref mac) => mac.$function_name($value),
-            #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
-                          all(target_os = "android", feature = "native-bluetooth"),
-                          all(target_os = "macos", feature = "native-bluetooth"))))]
-            &$enum_type::Empty(ref empty) => empty.$function_name($value),
-            #[cfg(feature = "bluetooth-test")]
-            &$enum_type::Mock(ref fake) => fake.$function_name($value),
-        }
-    };
-);
-
 #[cfg(feature = "bluetooth-test")]
 macro_rules! get_inner_and_call_test_func {
     ($enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => {
         match $enum_value {
             &$enum_type::Mock(ref fake) => fake.$function_name($value),
+            #[cfg(feature = "native-bluetooth")]
             _ => Err(Box::from(
                 "Error! Test functions are not supported on real devices!",
             )),
@@ -86,6 +17,7 @@ macro_rules! get_inner_and_call_test_func {
     ($enum_value: expr, $enum_type: ident, $function_name: ident) => {
         match $enum_value {
             &$enum_type::Mock(ref fake) => fake.$function_name(),
+            #[cfg(feature = "native-bluetooth")]
             _ => Err(Box::from(
                 "Error! Test functions are not supported on real devices!",
             )),
@@ -93,6 +25,5 @@ macro_rules! get_inner_and_call_test_func {
     };
 }
 
-pub(crate) use get_inner_and_call;
 #[cfg(feature = "bluetooth-test")]
 pub(crate) use get_inner_and_call_test_func;

components/bluetooth/test.rs

@@ -512,8 +512,11 @@ fn create_glucose_heart_rate_devices(adapter: &BluetoothAdapter) -> Result<(), B
     Ok(())
 }
 
-pub fn test(manager: &mut BluetoothManager, data_set_name: String) -> Result<(), Box<dyn Error>> {
-    let may_existing_adapter = manager.get_or_create_adapter();
+pub async fn test(
+    manager: &mut BluetoothManager,
+    data_set_name: String,
+) -> Result<(), Box<dyn Error>> {
+    let may_existing_adapter = manager.get_or_create_adapter().await;
     let adapter = match may_existing_adapter.as_ref() {
         Some(adapter) => adapter,
         None => return Err(Box::from(ADAPTER_ERROR.to_string())),

components/canvas/Cargo.toml

@@ -1,14 +1,16 @@
 [package]
-name = "canvas"
+name = "servo-canvas"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
-name = "canvas"
+name = "servo_canvas"
 path = "lib.rs"
 
 [features]
@@ -16,23 +18,23 @@ tracing = ["dep:tracing"]
 vello = ["dep:vello", "dep:pollster", "dep:futures-intrusive"]
 
 [dependencies]
-base = { workspace = true }
 bytemuck = { workspace = true, features = ["extern_crate_alloc"] }
-canvas_traits = { workspace = true }
-compositing_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
-fonts = { path = "../fonts" }
+fonts = { workspace = true }
 futures-intrusive = { version = "0.5", optional = true }
 kurbo = { workspace = true }
 log = { workspace = true }
+paint_api = { workspace = true }
 peniko = { workspace = true }
-pixels = { path = "../pixels" }
-profile_traits = { workspace = true }
+pixels = { workspace = true }
 pollster = { version = "0.4", optional = true }
+profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
+servo-base = { workspace = true }
+servo-canvas-traits = { workspace = true }
+servo-config = { workspace = true }
 servo-tracing = { workspace = true }
-servo_config = { path = "../config" }
 stylo = { workspace = true }
 tracing = { workspace = true, optional = true }
 vello = { workspace = true, optional = true }

components/canvas/backend.rs

@@ -2,12 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use canvas_traits::canvas::{
+use euclid::default::{Point2D, Rect, Size2D, Transform2D};
+use paint_api::SerializableImageData;
+use pixels::Snapshot;
+use servo_canvas_traits::canvas::{
     CompositionOptions, FillOrStrokeStyle, FillRule, LineOptions, Path, ShadowOptions, TextRun,
 };
-use compositing_traits::SerializableImageData;
-use euclid::default::{Point2D, Rect, Size2D, Transform2D};
-use pixels::Snapshot;
 use webrender_api::ImageDescriptor;
 
 use crate::canvas_data::Filter;

components/canvas/canvas_data.rs

@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use base::Epoch;
-use canvas_traits::canvas::*;
-use compositing_traits::CrossProcessPaintApi;
 use euclid::default::{Point2D, Rect, Size2D, Transform2D};
+use paint_api::CrossProcessPaintApi;
 use pixels::Snapshot;
+use servo_base::Epoch;
+use servo_canvas_traits::canvas::*;
 use webrender_api::ImageKey;
 
 use crate::backend::GenericDrawTarget;
@@ -41,7 +41,7 @@ impl<DrawTarget: GenericDrawTarget> CanvasData<DrawTarget> {
 
     pub(crate) fn set_image_key(&mut self, image_key: ImageKey) {
         let (descriptor, data) = self.draw_target.image_descriptor_and_serializable_data();
-        self.paint_api.add_image(image_key, descriptor, data);
+        self.paint_api.add_image(image_key, descriptor, data, false);
 
         if let Some(old_image_key) = self.image_key.replace(image_key) {
             self.paint_api.delete_image(old_image_key);
@@ -318,7 +318,7 @@ impl<DrawTarget: GenericDrawTarget> CanvasData<DrawTarget> {
 
         let (descriptor, data) = {
             let _span =
-                profile_traits::trace_span!("image_descriptor_and_serializable_data",).entered();
+                profile_traits::trace_span!("image_descriptor_and_serializable_data").entered();
             self.draw_target.image_descriptor_and_serializable_data()
         };
 

components/canvas/canvas_paint_thread.rs

@@ -5,16 +5,16 @@
 use std::borrow::ToOwned;
 use std::{f32, thread};
 
-use base::generic_channel::GenericSender;
-use base::{Epoch, generic_channel};
-use canvas_traits::ConstellationCanvasMsg;
-use canvas_traits::canvas::*;
-use compositing_traits::CrossProcessPaintApi;
 use crossbeam_channel::{Sender, select, unbounded};
 use euclid::default::{Rect, Size2D, Transform2D};
 use log::warn;
+use paint_api::CrossProcessPaintApi;
 use pixels::Snapshot;
 use rustc_hash::FxHashMap;
+use servo_base::generic_channel::GenericSender;
+use servo_base::{Epoch, generic_channel};
+use servo_canvas_traits::ConstellationCanvasMsg;
+use servo_canvas_traits::canvas::*;
 use webrender_api::ImageKey;
 
 use crate::canvas_data::*;
@@ -30,7 +30,7 @@ impl CanvasPaintThread {
         CanvasPaintThread {
             canvases: FxHashMap::default(),
             next_canvas_id: CanvasId(0),
-            paint_api: paint_api.clone(),
+            paint_api,
         }
     }
 

components/canvas/peniko_conversions.rs

@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use canvas_traits::canvas::*;
 use peniko::ImageAlphaType;
 use pixels::{Alpha, SnapshotPixelFormat};
+use servo_canvas_traits::canvas::*;
 use style::color::AbsoluteColor;
 
 use crate::backend::Convert;
@@ -144,7 +144,7 @@ impl Convert<ImageAlphaType> for Alpha {
 
 impl Convert<peniko::Brush> for FillOrStrokeStyle {
     fn convert(self) -> peniko::Brush {
-        use canvas_traits::canvas::FillOrStrokeStyle::*;
+        use servo_canvas_traits::canvas::FillOrStrokeStyle::*;
         match self {
             Color(absolute_color) => peniko::Brush::Solid(absolute_color.convert()),
             LinearGradient(style) => {

components/canvas/vello_backend.rs

@@ -16,16 +16,16 @@ use std::collections::HashMap;
 use std::num::NonZeroUsize;
 use std::rc::Rc;
 
-use base::generic_channel::GenericSharedMemory;
-use canvas_traits::canvas::{
-    CompositionOptions, CompositionOrBlending, CompositionStyle, FillOrStrokeStyle, FillRule,
-    LineOptions, Path, ShadowOptions, TextRun,
-};
-use compositing_traits::SerializableImageData;
 use euclid::default::{Point2D, Rect, Size2D, Transform2D};
 use fonts::FontIdentifier;
 use kurbo::Shape as _;
+use paint_api::SerializableImageData;
 use pixels::{Snapshot, SnapshotAlphaMode, SnapshotPixelFormat};
+use servo_base::generic_channel::GenericSharedMemory;
+use servo_canvas_traits::canvas::{
+    CompositionOptions, CompositionOrBlending, CompositionStyle, FillOrStrokeStyle, FillRule,
+    LineOptions, Path, ShadowOptions, TextRun,
+};
 use vello::wgpu::{
     BackendOptions, Backends, Buffer, BufferDescriptor, BufferUsages, COPY_BYTES_PER_ROW_ALIGNMENT,
     CommandEncoderDescriptor, Device, Extent3d, Instance, InstanceDescriptor, InstanceFlags,

components/canvas/vello_cpu_backend.rs

@@ -6,16 +6,16 @@ use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use base::generic_channel::GenericSharedMemory;
-use canvas_traits::canvas::{
-    CompositionOptions, CompositionOrBlending, CompositionStyle, FillOrStrokeStyle, FillRule,
-    LineOptions, Path, ShadowOptions, TextRun,
-};
-use compositing_traits::SerializableImageData;
 use euclid::default::{Point2D, Rect, Size2D, Transform2D};
 use fonts::FontIdentifier;
 use kurbo::Shape;
+use paint_api::SerializableImageData;
 use pixels::{Snapshot, SnapshotAlphaMode, SnapshotPixelFormat};
+use servo_base::generic_channel::GenericSharedMemory;
+use servo_canvas_traits::canvas::{
+    CompositionOptions, CompositionOrBlending, CompositionStyle, FillOrStrokeStyle, FillRule,
+    LineOptions, Path, ShadowOptions, TextRun,
+};
 use vello_cpu::{kurbo, peniko};
 use webrender_api::{ImageDescriptor, ImageDescriptorFlags};
 
@@ -511,7 +511,7 @@ fn snapshot_as_pixmap(mut snapshot: Snapshot) -> Arc<vello_cpu::Pixmap> {
 
 impl Convert<vello_cpu::PaintType> for FillOrStrokeStyle {
     fn convert(self) -> vello_cpu::PaintType {
-        use canvas_traits::canvas::FillOrStrokeStyle::*;
+        use servo_canvas_traits::canvas::FillOrStrokeStyle::*;
         match self {
             Color(absolute_color) => vello_cpu::PaintType::Solid(absolute_color.convert()),
             LinearGradient(style) => {

components/compositing/Cargo.toml

@@ -1,62 +0,0 @@
-[package]
-name = "compositing"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-publish.workspace = true
-rust-version.workspace = true
-
-[lib]
-name = "compositing"
-path = "lib.rs"
-
-[features]
-default = []
-tracing = ["dep:tracing"]
-webgpu = ["dep:webgpu"]
-webxr = ["dep:webxr", "dep:webxr-api"]
-
-[lints.clippy]
-unwrap_used = "deny"
-panic = "deny"
-
-[dependencies]
-base = { workspace = true }
-bincode = { workspace = true }
-bitflags = { workspace = true }
-canvas_traits = { workspace = true }
-compositing_traits = { workspace = true }
-constellation_traits = { workspace = true }
-crossbeam-channel = { workspace = true }
-dpi = { workspace = true }
-embedder_traits = { workspace = true }
-euclid = { workspace = true }
-gleam = { workspace = true }
-image = { workspace = true }
-ipc-channel = { workspace = true }
-log = { workspace = true }
-media = { path = "../media" }
-malloc_size_of = { workspace = true }
-profile_traits = { workspace = true }
-rayon = { workspace = true }
-rustc-hash = { workspace = true }
-servo-tracing = { workspace = true }
-servo_allocator = { path = "../allocator" }
-servo_config = { path = "../config" }
-servo_geometry = { path = "../geometry" }
-smallvec = { workspace = true }
-stylo_traits = { workspace = true }
-surfman = { workspace = true }
-timers = { path = "../timers" }
-tracing = { workspace = true, optional = true }
-webgl = { path = "../webgl" }
-webgpu = { path = "../webgpu", optional = true }
-webrender = { workspace = true }
-webrender_api = { workspace = true }
-webxr = { path = "../webxr", optional = true }
-webxr-api = { workspace = true, optional = true }
-wr_malloc_size_of = { workspace = true }
-
-[dev-dependencies]
-surfman = { workspace = true }

components/compositing/largest_contentful_paint_calculator.rs

@@ -1,103 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use base::cross_process_instant::CrossProcessInstant;
-use base::id::WebViewId;
-use compositing_traits::largest_contentful_paint_candidate::{
-    LCPCandidate, LargestContentfulPaint,
-};
-use rustc_hash::{FxHashMap, FxHashSet};
-use webrender_api::PipelineId;
-
-/// Holds the [`LargestContentfulPaintsContainer`] for each pipeline.
-#[derive(Default)]
-pub(crate) struct LargestContentfulPaintCalculator {
-    lcp_containers: FxHashMap<PipelineId, LargestContentfulPaintsContainer>,
-    disabled_lcp_for_webviews: FxHashSet<WebViewId>,
-}
-
-impl LargestContentfulPaintCalculator {
-    pub(crate) fn new() -> Self {
-        Self {
-            lcp_containers: Default::default(),
-            disabled_lcp_for_webviews: Default::default(),
-        }
-    }
-
-    pub(crate) fn append_lcp_candidate(
-        &mut self,
-        webview_id: WebViewId,
-        pipeline_id: PipelineId,
-        candidate: LCPCandidate,
-    ) -> bool {
-        if self.disabled_lcp_for_webviews.contains(&webview_id) {
-            return false;
-        }
-        self.lcp_containers
-            .entry(pipeline_id)
-            .or_default()
-            .lcp_candidates
-            .push(candidate);
-        true
-    }
-
-    pub(crate) fn remove_lcp_candidates_for_pipeline(&mut self, pipeline_id: PipelineId) {
-        self.lcp_containers.remove(&pipeline_id);
-    }
-
-    pub(crate) fn calculate_largest_contentful_paint(
-        &mut self,
-        paint_time: CrossProcessInstant,
-        pipeline_id: PipelineId,
-    ) -> Option<LargestContentfulPaint> {
-        self.lcp_containers
-            .get_mut(&pipeline_id)
-            .and_then(|container| container.calculate_largest_contentful_paint(paint_time))
-    }
-
-    pub(crate) fn disable_for_webview(&mut self, webview_id: WebViewId) {
-        self.disabled_lcp_for_webviews.insert(webview_id);
-    }
-
-    pub(crate) fn note_webview_removed(&mut self, webview_id: WebViewId) {
-        self.disabled_lcp_for_webviews.remove(&webview_id);
-    }
-}
-
-/// Holds the LCP candidates and the latest LCP for a specific pipeline.
-#[derive(Default)]
-struct LargestContentfulPaintsContainer {
-    /// List of candidates for Largest Contentful Paint in this pipeline.
-    lcp_candidates: Vec<LCPCandidate>,
-    /// The most recent Largest Contentful Paint, if any.
-    latest_lcp: Option<LargestContentfulPaint>,
-}
-
-impl LargestContentfulPaintsContainer {
-    fn calculate_largest_contentful_paint(
-        &mut self,
-        paint_time: CrossProcessInstant,
-    ) -> Option<LargestContentfulPaint> {
-        if self.lcp_candidates.is_empty() {
-            return self.latest_lcp;
-        }
-
-        let candidates = std::mem::take(&mut self.lcp_candidates);
-        if let Some(max_candidate) = candidates.into_iter().max_by_key(|c| c.area) {
-            match self.latest_lcp {
-                None => {
-                    self.latest_lcp = Some(LargestContentfulPaint::from(max_candidate, paint_time));
-                },
-                Some(ref latest_lcp) => {
-                    if max_candidate.area > latest_lcp.area {
-                        self.latest_lcp =
-                            Some(LargestContentfulPaint::from(max_candidate, paint_time));
-                    }
-                },
-            }
-        }
-
-        self.latest_lcp
-    }
-}

components/compositing/lib.rs

@@ -1,57 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-#![deny(unsafe_code)]
-
-use std::cell::Cell;
-use std::rc::Rc;
-
-use base::generic_channel::RoutedReceiver;
-use compositing_traits::{PaintMessage, PaintProxy};
-use constellation_traits::EmbedderToConstellationMessage;
-use crossbeam_channel::Sender;
-use embedder_traits::{EventLoopWaker, ShutdownState};
-use profile_traits::{mem, time};
-#[cfg(feature = "webxr")]
-use webxr::WebXrRegistry;
-
-pub use crate::paint::{Paint, WebRenderDebugOption};
-
-#[macro_use]
-mod tracing;
-
-mod largest_contentful_paint_calculator;
-mod paint;
-mod painter;
-mod pinch_zoom;
-mod pipeline_details;
-mod refresh_driver;
-mod render_notifier;
-mod screenshot;
-mod touch;
-mod webrender_external_images;
-mod webview_renderer;
-
-/// Data used to initialize the `Paint` subsystem.
-pub struct InitialPaintState {
-    /// A channel to `Paint`.
-    pub paint_proxy: PaintProxy,
-    /// A port on which messages inbound to `Paint` can be received.
-    pub receiver: RoutedReceiver<PaintMessage>,
-    /// A channel to the constellation.
-    pub embedder_to_constellation_sender: Sender<EmbedderToConstellationMessage>,
-    /// A channel to the time profiler thread.
-    pub time_profiler_chan: time::ProfilerChan,
-    /// A channel to the memory profiler thread.
-    pub mem_profiler_chan: mem::ProfilerChan,
-    /// A shared state which tracks whether Servo has started or has finished
-    /// shutting down.
-    pub shutdown_state: Rc<Cell<ShutdownState>>,
-    /// An [`EventLoopWaker`] used in order to wake up the embedder when it is
-    /// time to paint.
-    pub event_loop_waker: Box<dyn EventLoopWaker>,
-    /// If WebXR is enabled, a [`WebXrRegistry`] to register WebXR threads.
-    #[cfg(feature = "webxr")]
-    pub webxr_registry: Box<dyn WebXrRegistry>,
-}

components/config/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "servo_config"
+name = "servo-config"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
 name = "servo_config"
@@ -14,6 +16,5 @@ path = "lib.rs"
 [dependencies]
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-servo_config_macro = { path = "macro" }
-servo_url = { path = "../url" }
-stylo_config = { workspace = true }
+servo-config-macro = { workspace = true }
+stylo_static_prefs = { workspace = true }

components/config/lib.rs

@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+//! This crate provides two mechanisms for configuring the behaviour of the Servo engine.
+//!  - The [`opts`] module exposes a set of global flags that are initialized once
+//!    and cannot be changed at runtime.
+//!  - The [`prefs`] module provides a mechanism to get and set global preference
+//!    values that can be changed at runtime.
+
 #![deny(unsafe_code)]
 
 pub mod opts;

components/config/macro/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "servo_config_macro"
+name = "servo-config-macro"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
 name = "servo_config_macro"

components/config/macro/lib.rs

@@ -22,6 +22,12 @@ fn servo_preferences_derive(input: synstructure::Structure) -> TokenStream {
         unimplemented!()
     };
 
+    let mut exists_match_cases = quote!();
+    for field in named_fields.named.iter() {
+        let name = field.ident.as_ref().unwrap();
+        exists_match_cases.extend(quote!(stringify!(#name) => true,))
+    }
+
     let mut get_match_cases = quote!();
     for field in named_fields.named.iter() {
         let name = field.ident.as_ref().unwrap();
@@ -34,15 +40,35 @@ fn servo_preferences_derive(input: synstructure::Structure) -> TokenStream {
         set_match_cases.extend(quote!(stringify!(#name) => self.#name = value.try_into().unwrap(),))
     }
 
+    let mut type_of_match_cases = quote!();
+    for field in named_fields.named.iter() {
+        let name = field.ident.as_ref().unwrap();
+        let ty = &field.ty;
+        type_of_match_cases.extend(quote!(stringify!(#name) => std::any::type_name::<#ty>(),))
+    }
+
     let mut comparisons = quote!();
     for field in named_fields.named.iter() {
         let name = field.ident.as_ref().unwrap();
         comparisons.extend(quote!(if self.#name != other.#name { changes.push((stringify!(#name), self.#name.clone().into(),)) }))
     }
 
+    let mut all_fields = quote!();
+    for field in named_fields.named.iter() {
+        let name = field.ident.as_ref().unwrap();
+        all_fields.extend(quote!(stringify!(#name),));
+    }
+
     let structure_name = &ast.ident;
     quote! {
         impl #structure_name {
+            pub fn exists(name: &str) -> bool {
+                match name {
+                    #exists_match_cases
+                    _ => { false }
+                }
+            }
+
             pub fn get_value(&self, name: &str) -> PrefValue {
                 match name {
                     #get_match_cases
@@ -57,11 +83,24 @@ fn servo_preferences_derive(input: synstructure::Structure) -> TokenStream {
                 }
             }
 
+            pub fn type_of(name: &str) -> &'static str {
+                match name {
+                    #type_of_match_cases
+                    _ => { panic!("Unknown preference: {:?}", name); }
+                }
+            }
+
             pub fn diff(&self, other: &Self) -> Vec<(&'static str, PrefValue)> {
                 let mut changes = vec![];
                 #comparisons
                 changes
             }
+
+            pub fn all_fields() -> Vec<&'static str> {
+                vec![
+                    #all_fields
+                ]
+            }
         }
     }
 }

components/config/opts.rs

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-//! Configuration options for a single run of the servo application. Created
-//! from command line arguments.
+//! Options are global configuration options that are initialized once and cannot be changed at
+//! runtime.
 
 use std::default::Default;
 use std::path::PathBuf;
@@ -11,28 +11,21 @@ use std::process;
 use std::sync::OnceLock;
 
 use serde::{Deserialize, Serialize};
-use servo_url::ServoUrl;
 
-/// Global flags for Servo, currently set on the command line.
+/// The set of global options supported by Servo. The values for these can be configured during
+/// initialization of Servo and cannot be changed later at runtime.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Opts {
-    /// `None` to disable the time profiler or `Some` to enable it with:
+    /// `None` to disable the time profiler or `Some` to enable it with either:
     ///
     ///  - an interval in seconds to cause it to produce output on that interval.
-    ///    (`i.e. -p 5`).
     ///  - a file path to write profiling info to a TSV file upon Servo's termination.
-    ///    (`i.e. -p out.tsv`).
     pub time_profiling: Option<OutputOptions>,
 
     /// When the profiler is enabled, this is an optional path to dump a self-contained HTML file
     /// visualizing the traces as a timeline.
     pub time_profiler_trace_path: Option<String>,
 
-    /// True to turn off incremental layout.
-    pub nonincremental_layout: bool,
-
-    pub user_stylesheets: Vec<(Vec<u8>, ServoUrl)>,
-
     /// True to exit on thread failure instead of displaying about:failure.
     pub hard_fail: bool,
 
@@ -83,15 +76,12 @@ pub struct Opts {
 
     /// Unminify Css.
     pub unminify_css: bool,
-
-    /// Print Progressive Web Metrics to console.
-    pub print_pwm: bool,
 }
 
-/// Debug options for Servo, currently set on the command line with -Z
+/// Debug options for Servo.
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct DiagnosticsLogging {
-    /// List all the debug options.
+    /// Print all the debug options supported by Servo to the standard output.
     pub help: bool,
 
     /// Print the DOM after each restyle.
@@ -127,6 +117,9 @@ pub struct DiagnosticsLogging {
 
     /// Log garbage collection passes and their durations.
     pub gc_profile: bool,
+
+    /// Log Progressive Web Metrics.
+    pub progressive_web_metrics: bool,
 }
 
 impl DiagnosticsLogging {
@@ -174,6 +167,7 @@ impl DiagnosticsLogging {
         print_option("relayout-event", "Log when relayout occurs");
         print_option("profile-script-events", "Log script event processing time");
         print_option("gc-profile", "Log garbage collection statistics");
+        print_option("progressive-web-metrics", "Log Progressive Web Metrics");
         println!();
 
         process::exit(0);
@@ -197,6 +191,7 @@ impl DiagnosticsLogging {
                 "gc-profile" => self.gc_profile = true,
                 "profile-script-events" => self.profile_script_events = true,
                 "relayout-event" => self.relayout_event = true,
+                "progressive-web-metrics" => self.progressive_web_metrics = true,
                 "" => {},
                 _ => return Err(format!("Unknown diagnostic option: {option}")),
             };
@@ -206,9 +201,9 @@ impl DiagnosticsLogging {
     }
 }
 
+/// The destination for the time profiler reports.
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum OutputOptions {
-    /// Database connection config (hostname, name, user, pass)
     FileName(String),
     Stdout(f64),
 }
@@ -218,8 +213,6 @@ impl Default for Opts {
         Self {
             time_profiling: None,
             time_profiler_trace_path: None,
-            nonincremental_layout: false,
-            user_stylesheets: Vec::new(),
             hard_fail: true,
             multiprocess: false,
             force_ipc: false,
@@ -235,7 +228,6 @@ impl Default for Opts {
             unminify_js: false,
             local_script_source: None,
             unminify_css: false,
-            print_pwm: false,
         }
     }
 }
@@ -248,16 +240,16 @@ static OPTIONS: OnceLock<Opts> = OnceLock::new();
 /// Initialize options.
 ///
 /// Should only be called once at process startup.
-/// Must be called before the first call to [get].
+/// Must be called before the first call to [`get`].
 pub fn initialize_options(opts: Opts) {
     OPTIONS.set(opts).expect("Already initialized");
 }
 
 /// Get the servo options
 ///
-/// If the servo options have not been initialized by calling [initialize_options], then the
-/// options will be initialized to default values. Outside of tests the options should
-/// be explicitly initialized.
+/// If the servo options have not been initialized by calling [`initialize_options`], then the
+/// options will be initialized to default values. Outside of tests the options should be
+/// explicitly initialized.
 #[inline]
 pub fn get() -> &'static Opts {
     // In unit-tests using default options reduces boilerplate.

components/config/pref_util.rs

@@ -5,6 +5,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
+/// The types of preference values in Servo.
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum PrefValue {
     Float(f64),
@@ -16,6 +17,8 @@ pub enum PrefValue {
 }
 
 impl PrefValue {
+    /// Parse the `input` string as a preference value. Defaults to a `PrefValue::Str` if the input
+    /// cannot be parsed as valid value of one of the other types.
     pub fn from_booleanish_str(input: &str) -> Self {
         match input {
             "false" => PrefValue::Bool(false),

components/config/prefs.rs

@@ -2,8 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+//! Preferences are the global configuration options that can be changed at runtime.
+
 use std::env::consts::ARCH;
 use std::sync::{RwLock, RwLockReadGuard};
+use std::time::Duration;
 
 use serde::{Deserialize, Serialize};
 use servo_config_macro::ServoPreferences;
@@ -12,7 +15,12 @@ pub use crate::pref_util::PrefValue;
 
 static PREFERENCES: RwLock<Preferences> = RwLock::new(Preferences::const_default());
 
+/// A trait to be implemented by components that wish to be notified about runtime changes to the
+/// global preferences for the current process.
 pub trait PreferencesObserver: Send + Sync {
+    /// This method is called when the global preferences have been updated. The argument to the
+    /// method is an array of tuples where the first component is the name of the preference and
+    /// the second component is the new value of the preference.
     fn prefs_changed(&self, _changes: &[(&'static str, PrefValue)]) {}
 }
 
@@ -24,34 +32,36 @@ pub fn get() -> RwLockReadGuard<'static, Preferences> {
     PREFERENCES.read().unwrap()
 }
 
+/// Subscribe to notifications about changes to the global preferences for the current process.
 pub fn add_observer(observer: Box<dyn PreferencesObserver>) {
     OBSERVERS.write().unwrap().push(observer);
 }
 
+/// Update the values of the global preferences for the current process. This also notifies the
+/// observers previously added using [`add_observer`].
 pub fn set(preferences: Preferences) {
     // Map between Stylo preference names and Servo preference names as the This should be
     // kept in sync with components/script/dom/bindings/codegen/run.py which generates the
     // DOM CSS style accessors.
-    stylo_config::set_bool("layout.unimplemented", preferences.layout_unimplemented);
-    stylo_config::set_i32("layout.threads", preferences.layout_threads as i32);
-    stylo_config::set_bool("layout.flexbox.enabled", preferences.layout_flexbox_enabled);
-    stylo_config::set_bool("layout.columns.enabled", preferences.layout_columns_enabled);
-    stylo_config::set_bool("layout.grid.enabled", preferences.layout_grid_enabled);
-    stylo_config::set_bool(
-        "layout.css.transition-behavior.enabled",
-        preferences.layout_css_transition_behavior_enabled,
+    stylo_static_prefs::set_pref!("layout.unimplemented", preferences.layout_unimplemented);
+    stylo_static_prefs::set_pref!("layout.threads", preferences.layout_threads as i32);
+    stylo_static_prefs::set_pref!("layout.columns.enabled", preferences.layout_columns_enabled);
+    stylo_static_prefs::set_pref!("layout.grid.enabled", preferences.layout_grid_enabled);
+    stylo_static_prefs::set_pref!(
+        "layout.css.attr.enabled",
+        preferences.layout_css_attr_enabled
     );
-    stylo_config::set_bool(
+    stylo_static_prefs::set_pref!(
         "layout.writing-mode.enabled",
-        preferences.layout_writing_mode_enabled,
+        preferences.layout_writing_mode_enabled
     );
-    stylo_config::set_bool(
+    stylo_static_prefs::set_pref!(
         "layout.container-queries.enabled",
-        preferences.layout_container_queries_enabled,
+        preferences.layout_container_queries_enabled
     );
-    stylo_config::set_bool(
+    stylo_static_prefs::set_pref!(
         "layout.variable_fonts.enabled",
-        preferences.layout_variable_fonts_enabled,
+        preferences.layout_variable_fonts_enabled
     );
 
     let changed = preferences.diff(&PREFERENCES.read().unwrap());
@@ -72,6 +82,7 @@ macro_rules! pref {
     };
 }
 
+/// The set of global preferences supported by Servo.
 #[derive(Clone, Deserialize, Serialize, ServoPreferences)]
 pub struct Preferences {
     pub fonts_default: String,
@@ -80,12 +91,14 @@ pub struct Preferences {
     pub fonts_monospace: String,
     pub fonts_default_size: i64,
     pub fonts_default_monospace_size: i64,
+    /// The amount of time that a half cycle of a text caret blink takes in milliseconds.
+    /// If this value is less than or equal to zero, then caret blink is disabled.
+    pub editing_caret_blink_time: i64,
     pub css_animations_testing_enabled: bool,
     /// Start the devtools server at startup
     pub devtools_server_enabled: bool,
-    /// Port number to start a server to listen to remote Firefox devtools connections.
-    /// 0 for random port.
-    pub devtools_server_port: i64,
+    /// The address:port the devtools server listens to, default to 127.0.0.1:7000.
+    pub devtools_server_listen_address: String,
     // feature: WebGPU | #24706 | Web/API/WebGPU_API
     pub dom_webgpu_enabled: bool,
     /// List of comma-separated backends to be used by wgpu.
@@ -94,6 +107,7 @@ pub struct Preferences {
     pub dom_abort_controller_enabled: bool,
     // feature: Adopted Stylesheet | #38132 | Web/API/Document/adoptedStyleSheets
     pub dom_adoptedstylesheet_enabled: bool,
+    pub dom_allow_preloading_module_descendants: bool,
     // feature: Clipboard API | #36084 | Web/API/Clipboard_API
     pub dom_async_clipboard_enabled: bool,
     pub dom_bluetooth_enabled: bool,
@@ -110,7 +124,6 @@ pub struct Preferences {
     /// - vello_cpu
     pub dom_canvas_backend: String,
     pub dom_clipboardevent_enabled: bool,
-    pub dom_command_invokers_enabled: bool,
     pub dom_composition_event_enabled: bool,
     // feature: CookieStore | #37674 | Web/API/CookieStore
     pub dom_cookiestore_enabled: bool,
@@ -120,6 +133,8 @@ pub struct Preferences {
     pub dom_crypto_subtle_enabled: bool,
     pub dom_document_dblclick_timeout: i64,
     pub dom_document_dblclick_dist: i64,
+    // feature: Document.execCommand | #25005 | Web/API/Document/execCommand
+    pub dom_exec_command_enabled: bool,
     // feature: CSS Font Loading API | #29376 | Web/API/CSS_Font_Loading_API
     pub dom_fontface_enabled: bool,
     pub dom_fullscreen_test: bool,
@@ -153,7 +168,6 @@ pub struct Preferences {
     pub dom_serviceworker_timeout_seconds: i64,
     pub dom_servo_helpers_enabled: bool,
     pub dom_servoparser_async_html_tokenizer_enabled: bool,
-    pub dom_testable_crash_enabled: bool,
     pub dom_testbinding_enabled: bool,
     pub dom_testbinding_prefcontrolled_enabled: bool,
     pub dom_testbinding_prefcontrolled2_enabled: bool,
@@ -168,6 +182,8 @@ pub struct Preferences {
     pub dom_testperf_enabled: bool,
     // https://testutils.spec.whatwg.org#availability
     pub dom_testutils_enabled: bool,
+    /// <https://html.spec.whatwg.org/multipage/#transient-activation-duration>
+    pub dom_transient_activation_duration_ms: i64,
     /// Enable WebGL2 APIs.
     // feature: WebGL2 | #41394 | Web/API/WebGL2RenderingContext
     pub dom_webgl2_enabled: bool,
@@ -192,7 +208,7 @@ pub struct Preferences {
     pub dom_webxr_sessionavailable: bool,
     pub dom_webxr_unsafe_assume_user_intent: bool,
     pub dom_worklet_enabled: bool,
-    pub dom_worklet_blockingsleep: bool,
+    pub dom_worklet_blockingsleep_enabled: bool,
     pub dom_worklet_testing_enabled: bool,
     pub dom_worklet_timeout_ms: i64,
     /// <https://drafts.csswg.org/cssom-view/#the-visualviewport-interface>
@@ -211,25 +227,19 @@ pub struct Preferences {
     pub image_key_batch_size: i64,
     /// Whether or not the DOM inspector should show shadow roots of user-agent shadow trees
     pub inspector_show_servo_internal_shadow_roots: bool,
+    /// A locale tag (eg. es-ES) to use for language negotiation instead of the system locale.
+    /// An empty string represents no override.
+    /// TODO: Option<> support in PrefValue
+    pub intl_locale_override: String,
     pub js_asmjs_enabled: bool,
-    pub js_asyncstack: bool,
     pub js_baseline_interpreter_enabled: bool,
     /// Whether to disable the jit within SpiderMonkey
     pub js_disable_jit: bool,
     pub js_baseline_jit_enabled: bool,
     pub js_baseline_jit_unsafe_eager_compilation_enabled: bool,
-    pub js_discard_system_source: bool,
-    pub js_dump_stack_on_debuggee_would_run: bool,
     pub js_ion_enabled: bool,
-    pub js_ion_offthread_compilation_enabled: bool,
     pub js_ion_unsafe_eager_compilation_enabled: bool,
-    pub js_mem_gc_allocation_threshold_mb: i64,
-    pub js_mem_gc_allocation_threshold_factor: i64,
-    pub js_mem_gc_allocation_threshold_avoid_interrupt_factor: i64,
     pub js_mem_gc_compacting_enabled: bool,
-    pub js_mem_gc_decommit_threshold_mb: i64,
-    pub js_mem_gc_dynamic_heap_growth_enabled: bool,
-    pub js_mem_gc_dynamic_mark_slice_enabled: bool,
     pub js_mem_gc_empty_chunk_count_min: i64,
     pub js_mem_gc_high_frequency_heap_growth_max: i64,
     pub js_mem_gc_high_frequency_heap_growth_min: i64,
@@ -245,14 +255,11 @@ pub struct Preferences {
     pub js_mem_max: i64,
     pub js_native_regex_enabled: bool,
     pub js_offthread_compilation_enabled: bool,
-    pub js_shared_memory: bool,
-    pub js_throw_on_asmjs_validation_failure: bool,
-    pub js_throw_on_debuggee_would_run: bool,
     pub js_timers_minimum_duration: i64,
     pub js_wasm_baseline_enabled: bool,
     pub js_wasm_enabled: bool,
     pub js_wasm_ion_enabled: bool,
-    pub js_werror_enabled: bool,
+    // feature: Largest Contentful Paint | #42000 | Web/API/LargestContentfulPaint
     pub largest_contentful_paint_enabled: bool,
     pub layout_animations_test_enabled: bool,
     // feature: CSS Multicol | #22397 | Web/CSS/Guides/Multicol_layout
@@ -260,9 +267,7 @@ pub struct Preferences {
     // feature: CSS Grid | #34479 | Web/CSS/Guides/Grid_layout
     pub layout_grid_enabled: bool,
     pub layout_container_queries_enabled: bool,
-    pub layout_css_transition_behavior_enabled: bool,
-    // feature: CSS Flexbox | #12453 | Web/CSS/Guides/Flexible_box_layout
-    pub layout_flexbox_enabled: bool,
+    pub layout_css_attr_enabled: bool,
     pub layout_style_sharing_cache_enabled: bool,
     pub layout_threads: i64,
     pub layout_unimplemented: bool,
@@ -295,11 +300,14 @@ pub struct Preferences {
     /// Notice that this is not equal to the number of different urls in the cache.
     pub network_http_cache_size: u64,
     pub network_local_directory_listing_enabled: bool,
-    pub network_mime_sniff: bool,
     /// Force the use of `rust-webpki` verification for CA roots. If this is false (the
     /// default), then `rustls-platform-verifier` will be used, except on Android where
     /// `rust-webpki` is always used.
     pub network_use_webpki_roots: bool,
+    /// The length of the session history, in navigations, for each `WebView. Back-forward
+    /// cache entries that are more than `session_history_max_length` steps in the future or
+    /// `session_history_max_length` steps in the past will be discarded. Navigating forward
+    /// or backward to that entry will cause the entire page to be reloaded.
     pub session_history_max_length: i64,
     /// The background color of shell's viewport. This will be used by OpenGL's `glClearColor`.
     pub shell_background_color_rgba: [f64; 4],
@@ -323,16 +331,20 @@ pub struct Preferences {
     /// Whether or not the viewport meta tag is enabled.
     pub viewport_meta_enabled: bool,
     pub log_filter: String,
+    /// Whether the accessibility code is enabled.
+    pub accessibility_enabled: bool,
 }
 
 impl Preferences {
     const fn const_default() -> Self {
         Self {
             css_animations_testing_enabled: false,
+            editing_caret_blink_time: 600,
             devtools_server_enabled: false,
-            devtools_server_port: 0,
+            devtools_server_listen_address: String::new(),
             dom_abort_controller_enabled: true,
             dom_adoptedstylesheet_enabled: false,
+            dom_allow_preloading_module_descendants: false,
             dom_allow_scripts_to_close_windows: false,
             dom_async_clipboard_enabled: false,
             dom_bluetooth_enabled: false,
@@ -341,13 +353,13 @@ impl Preferences {
             dom_canvas_text_enabled: true,
             dom_canvas_backend: String::new(),
             dom_clipboardevent_enabled: true,
-            dom_command_invokers_enabled: false,
             dom_composition_event_enabled: false,
             dom_cookiestore_enabled: false,
             dom_credential_management_enabled: false,
             dom_crypto_subtle_enabled: true,
             dom_document_dblclick_dist: 1,
             dom_document_dblclick_timeout: 300,
+            dom_exec_command_enabled: false,
             dom_fontface_enabled: false,
             dom_fullscreen_test: false,
             dom_gamepad_enabled: true,
@@ -369,7 +381,6 @@ impl Preferences {
             dom_serviceworker_timeout_seconds: 60,
             dom_servo_helpers_enabled: false,
             dom_servoparser_async_html_tokenizer_enabled: false,
-            dom_testable_crash_enabled: false,
             dom_testbinding_enabled: false,
             dom_testbinding_prefcontrolled2_enabled: false,
             dom_testbinding_prefcontrolled_enabled: false,
@@ -383,6 +394,7 @@ impl Preferences {
             dom_testing_html_input_element_select_files_enabled: false,
             dom_testperf_enabled: false,
             dom_testutils_enabled: false,
+            dom_transient_activation_duration_ms: 5000,
             dom_webgl2_enabled: false,
             dom_webgpu_enabled: false,
             dom_webgpu_wgpu_backend: String::new(),
@@ -402,11 +414,12 @@ impl Preferences {
             dom_webxr_sessionavailable: false,
             dom_webxr_test: false,
             dom_webxr_unsafe_assume_user_intent: false,
-            dom_worklet_blockingsleep: false,
+            dom_worklet_blockingsleep_enabled: false,
             dom_worklet_enabled: false,
             dom_worklet_testing_enabled: false,
             dom_worklet_timeout_ms: 10,
             dom_visual_viewport_enabled: false,
+            accessibility_enabled: false,
             fonts_default: String::new(),
             fonts_default_monospace_size: 13,
             fonts_default_size: 16,
@@ -419,24 +432,15 @@ impl Preferences {
             gfx_texture_swizzling_enabled: true,
             image_key_batch_size: 10,
             inspector_show_servo_internal_shadow_roots: false,
+            intl_locale_override: String::new(),
             js_asmjs_enabled: true,
-            js_asyncstack: false,
             js_baseline_interpreter_enabled: true,
             js_baseline_jit_enabled: true,
             js_baseline_jit_unsafe_eager_compilation_enabled: false,
             js_disable_jit: false,
-            js_discard_system_source: false,
-            js_dump_stack_on_debuggee_would_run: false,
             js_ion_enabled: true,
-            js_ion_offthread_compilation_enabled: true,
             js_ion_unsafe_eager_compilation_enabled: false,
-            js_mem_gc_allocation_threshold_avoid_interrupt_factor: 100,
-            js_mem_gc_allocation_threshold_factor: 100,
-            js_mem_gc_allocation_threshold_mb: 30,
             js_mem_gc_compacting_enabled: true,
-            js_mem_gc_decommit_threshold_mb: 32,
-            js_mem_gc_dynamic_heap_growth_enabled: true,
-            js_mem_gc_dynamic_mark_slice_enabled: true,
             js_mem_gc_empty_chunk_count_min: 1,
             js_mem_gc_high_frequency_heap_growth_max: 300,
             js_mem_gc_high_frequency_heap_growth_min: 150,
@@ -452,20 +456,15 @@ impl Preferences {
             js_mem_max: -1,
             js_native_regex_enabled: true,
             js_offthread_compilation_enabled: true,
-            js_shared_memory: true,
-            js_throw_on_asmjs_validation_failure: false,
-            js_throw_on_debuggee_would_run: false,
             js_timers_minimum_duration: 1000,
             js_wasm_baseline_enabled: true,
             js_wasm_enabled: true,
             js_wasm_ion_enabled: true,
-            js_werror_enabled: false,
             largest_contentful_paint_enabled: false,
             layout_animations_test_enabled: false,
             layout_columns_enabled: false,
             layout_container_queries_enabled: false,
-            layout_css_transition_behavior_enabled: true,
-            layout_flexbox_enabled: true,
+            layout_css_attr_enabled: false,
             layout_grid_enabled: false,
             layout_style_sharing_cache_enabled: true,
             // TODO(mrobinson): This should likely be based on the number of processors.
@@ -485,7 +484,6 @@ impl Preferences {
             network_http_no_proxy: String::new(),
             network_http_cache_size: 5000,
             network_local_directory_listing_enabled: true,
-            network_mime_sniff: false,
             network_use_webpki_roots: false,
             session_history_max_length: 20,
             shell_background_color_rgba: [1.0, 1.0, 1.0, 1.0],
@@ -501,6 +499,16 @@ impl Preferences {
             log_filter: String::new(),
         }
     }
+
+    /// The amount of time that a half cycle of a text caret blink takes. If blinking is disabled
+    /// this returns `None`.
+    pub fn editing_caret_blink_time(&self) -> Option<Duration> {
+        if self.editing_caret_blink_time > 0 {
+            Some(Duration::from_millis(self.editing_caret_blink_time as u64))
+        } else {
+            None
+        }
+    }
 }
 
 impl Default for Preferences {

components/constellation/Cargo.toml

@@ -1,69 +1,70 @@
 [package]
-name = "constellation"
+name = "servo-constellation"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
-name = "constellation"
+name = "servo_constellation"
 path = "lib.rs"
 
 [features]
 default = []
-bluetooth = ["bluetooth_traits"]
+bluetooth = ["servo-bluetooth-traits"]
 gamepad = ["embedder_traits/gamepad"]
-tracing = ["dep:tracing", "canvas/tracing"]
-vello = ["canvas/vello"]
-webgpu = ["script_traits/webgpu"]
+tracing = ["dep:tracing", "servo-canvas/tracing"]
+vello = ["servo-canvas/vello"]
+webgpu = ["dep:webgpu", "dep:webgpu_traits", "script_traits/webgpu"]
 
 [lints.clippy]
 unwrap_used = "deny"
 panic = "deny"
 
 [dependencies]
-background_hang_monitor = { path = "../background_hang_monitor" }
-background_hang_monitor_api = { workspace = true }
+accesskit = { workspace = true }
 backtrace = { workspace = true }
-base = { workspace = true }
-bluetooth_traits = { workspace = true, optional = true }
-canvas = { path = "../canvas" }
-canvas_traits = { workspace = true }
-compositing_traits = { workspace = true }
-constellation_traits = { workspace = true }
+base64 = { workspace = true }
 content-security-policy = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
-fonts = { path = "../fonts" }
+fonts = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
 layout_api = { workspace = true }
 log = { workspace = true }
-media = { path = "../media" }
-net = { path = "../net" }
+media = { workspace = true }
+net = { workspace = true }
 net_traits = { workspace = true }
+paint_api = { workspace = true }
 parking_lot = { workspace = true }
-profile = { path = "../profile" }
 profile_traits = { workspace = true }
 rand = { workspace = true }
 rustc-hash = { workspace = true }
 script_traits = { workspace = true }
 serde = { workspace = true }
+servo-background-hang-monitor = { workspace = true }
+servo-background-hang-monitor-api = { workspace = true }
+servo-base = { workspace = true }
+servo-bluetooth-traits = { workspace = true, optional = true }
+servo-canvas = { workspace = true }
+servo-canvas-traits = { workspace = true }
+servo-config = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-tracing = { workspace = true }
-servo_config = { path = "../config" }
-servo_url = { path = "../url" }
+servo-url = { workspace = true }
 storage_traits = { workspace = true }
 stylo = { workspace = true }
 stylo_traits = { workspace = true }
 tracing = { workspace = true, optional = true }
-webgpu = { path = "../webgpu" }
-webgpu_traits = { workspace = true }
-webrender = { workspace = true }
-webrender_api = { workspace = true }
+webgpu = { workspace = true, optional = true }
+webgpu_traits = { workspace = true, optional = true }
 webxr-api = { workspace = true }
 
 [target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_env="ohos"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]

components/constellation/broadcastchannel.rs

@@ -4,11 +4,11 @@
 
 use std::collections::HashMap;
 
-use base::id::BroadcastChannelRouterId;
-use constellation_traits::BroadcastChannelMsg;
 use ipc_channel::ipc::IpcSender;
 use log::warn;
 use rustc_hash::FxHashMap;
+use servo_base::id::BroadcastChannelRouterId;
+use servo_constellation_traits::BroadcastChannelMsg;
 use servo_url::ImmutableOrigin;
 
 #[derive(Default)]

components/constellation/browsingcontext.rs

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use base::id::{BrowsingContextGroupId, BrowsingContextId, PipelineId, WebViewId};
 use embedder_traits::ViewportDetails;
 use log::warn;
 use rustc_hash::{FxHashMap, FxHashSet};
+use servo_base::id::{BrowsingContextGroupId, BrowsingContextId, PipelineId, WebViewId};
 
 use crate::pipeline::Pipeline;
 

components/constellation/constellation_webview.rs

@@ -2,15 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use base::id::{BrowsingContextId, PipelineId, WebViewId};
 use embedder_traits::user_contents::UserContentManagerId;
-use embedder_traits::{InputEvent, MouseLeftViewportEvent, Theme};
+use embedder_traits::{GenericEmbedderProxy, InputEvent, MouseLeftViewportEvent, Theme};
 use euclid::Point2D;
 use log::warn;
 use rustc_hash::FxHashMap;
 use script_traits::{ConstellationInputEvent, ScriptThreadMessage};
+use servo_base::id::{BrowsingContextId, PipelineId, WebViewId};
 use style_traits::CSSPixel;
 
+use super::embedder::ConstellationToEmbedderMsg;
 use crate::browsingcontext::BrowsingContext;
 use crate::pipeline::Pipeline;
 use crate::session_history::JointSessionHistory;
@@ -21,6 +22,9 @@ pub(crate) struct ConstellationWebView {
     /// The [`WebViewId`] of this [`ConstellationWebView`].
     webview_id: WebViewId,
 
+    /// The [`PipelineId`] of the currently active pipeline at the top level of this WebView.
+    pub active_top_level_pipeline_id: PipelineId,
+
     /// The currently focused browsing context in this webview for key events.
     /// The focused pipeline is the current entry of the focused browsing
     /// context.
@@ -45,22 +49,41 @@ pub(crate) struct ConstellationWebView {
     /// The [`Theme`] that this [`ConstellationWebView`] uses. This is communicated to all
     /// `ScriptThread`s so that they know how to render the contents of a particular `WebView.
     theme: Theme,
+
+    /// Whether accessibility is active for this webview.
+    ///
+    /// Set by [`crate::Constellation::set_accessibility_active()`], and forwarded to the
+    /// webview’s *active* pipelines (of those that represent documents) at any given moment
+    /// via [`ScriptThreadMessage::SetAccessibilityActive`] in `set_accessibility_active()`
+    /// and [`crate::Constellation::set_frame_tree_for_webview()`].
+    pub accessibility_active: bool,
 }
 
 impl ConstellationWebView {
     pub(crate) fn new(
+        embedder_proxy: &GenericEmbedderProxy<ConstellationToEmbedderMsg>,
         webview_id: WebViewId,
+        active_top_level_pipeline_id: PipelineId,
         focused_browsing_context_id: BrowsingContextId,
         user_content_manager_id: Option<UserContentManagerId>,
     ) -> Self {
+        embedder_proxy.send(
+            ConstellationToEmbedderMsg::DocumentAccessibilityTreeIdChanged(
+                webview_id,
+                active_top_level_pipeline_id.into(),
+            ),
+        );
+
         Self {
             webview_id,
             user_content_manager_id,
+            active_top_level_pipeline_id,
             focused_browsing_context_id,
             hovered_browsing_context_id: None,
             last_mouse_move_point: Default::default(),
             session_history: JointSessionHistory::new(),
             theme: Theme::Light,
+            accessibility_active: false,
         }
     }
 

components/constellation/embedder.rs

@@ -0,0 +1,54 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use accesskit::TreeId;
+use embedder_traits::{
+    InputEventOutcome, JSValue, JavaScriptEvaluationError, JavaScriptEvaluationId,
+    MediaSessionEvent, NewWebViewDetails, TraversalId,
+};
+use servo_base::generic_channel::GenericSender;
+use servo_base::id::{PipelineId, WebViewId};
+use servo_url::ServoUrl;
+
+/// Messages sent from the `Constellation` to the embedder.
+pub enum ConstellationToEmbedderMsg {
+    /// Informs the embedder that the constellation has completed shutdown.
+    /// Required because the constellation can have pending calls to make
+    /// (e.g. SetFrameTree) at the time that we send it an ExitMsg.
+    ShutdownComplete,
+    /// Report a complete sampled profile
+    ReportProfile(Vec<u8>),
+    /// All webviews lost focus for keyboard events.
+    WebViewBlurred,
+    /// A history traversal operation completed.
+    HistoryTraversalComplete(WebViewId, TraversalId),
+    /// Notifies the embedder about media session events
+    /// (i.e. when there is metadata for the active media session, playback state changes...).
+    MediaSessionEvent(WebViewId, MediaSessionEvent),
+    /// A pipeline panicked. First string is the reason, second one is the backtrace.
+    Panic(WebViewId, String, Option<String>),
+    /// A webview potentially gained focus for keyboard events.
+    /// If the boolean value is false, the webiew could not be focused.
+    WebViewFocused(WebViewId, bool),
+    /// Inform the embedding layer that a particular `InputEvent` was handled by Servo
+    /// and the embedder can continue processing it, if necessary.
+    InputEventsHandled(WebViewId, Vec<InputEventOutcome>),
+    /// A webview was destroyed.
+    WebViewClosed(WebViewId),
+    /// Inform the embedding layer that a JavaScript evaluation has
+    /// finished with the given result.
+    FinishJavaScriptEvaluation(
+        JavaScriptEvaluationId,
+        Result<JSValue, JavaScriptEvaluationError>,
+    ),
+    /// Whether or not to allow script to open a new tab/browser
+    AllowOpeningWebView(WebViewId, GenericSender<Option<NewWebViewDetails>>),
+    /// Whether or not to allow a pipeline to load a url.
+    AllowNavigationRequest(WebViewId, PipelineId, ServoUrl),
+    /// The history state has changed.
+    HistoryChanged(WebViewId, Vec<ServoUrl>, usize),
+    /// Notifies the embedder that the AccessKit [`TreeId`] for the top-level document in this
+    /// WebView has been changed (or initially set).
+    DocumentAccessibilityTreeIdChanged(WebViewId, TreeId),
+}

components/constellation/event_loop.rs

@@ -11,18 +11,18 @@ use std::marker::PhantomData;
 use std::rc::Rc;
 
 use background_hang_monitor_api::{BackgroundHangMonitorControlMsg, HangMonitorAlert};
-use base::generic_channel::{self, GenericReceiver, GenericSender};
-use base::id::ScriptEventLoopId;
-use constellation_traits::ServiceWorkerManagerFactory;
 use embedder_traits::ScriptToEmbedderChan;
-use ipc_channel::Error;
+use ipc_channel::IpcError;
 use layout_api::ScriptThreadFactory;
 use log::error;
 use media::WindowGLContext;
 use script_traits::{InitialScriptState, ScriptThreadMessage};
 use serde::{Deserialize, Serialize};
+use servo_base::generic_channel::{self, GenericReceiver, GenericSender, SendError};
+use servo_base::id::ScriptEventLoopId;
 use servo_config::opts::{self, Opts};
 use servo_config::prefs::{self, Preferences};
+use servo_constellation_traits::ServiceWorkerManagerFactory;
 
 use crate::sandboxing::spawn_multiprocess;
 use crate::{Constellation, UnprivilegedContent};
@@ -66,9 +66,9 @@ impl EventLoop {
     pub(crate) fn spawn<STF: ScriptThreadFactory, SWF: ServiceWorkerManagerFactory>(
         constellation: &mut Constellation<STF, SWF>,
         is_private: bool,
-    ) -> Result<Rc<Self>, Error> {
+    ) -> Result<Rc<Self>, IpcError> {
         let (script_chan, script_port) =
-            base::generic_channel::channel().expect("Pipeline script chan");
+            servo_base::generic_channel::channel().expect("Pipeline script chan");
 
         let embedder_chan = constellation.embedder_proxy.sender.clone();
         let eventloop_waker = constellation.embedder_proxy.event_loop_waker.clone();
@@ -153,7 +153,7 @@ impl EventLoop {
     fn spawn_in_process<STF: ScriptThreadFactory, SWF: ServiceWorkerManagerFactory>(
         constellation: &mut Constellation<STF, SWF>,
         initial_script_state: InitialScriptState,
-    ) -> Result<Self, Error> {
+    ) -> Result<Self, IpcError> {
         let script_chan = initial_script_state.constellation_to_script_sender.clone();
         let id = initial_script_state.id;
 
@@ -192,10 +192,8 @@ impl EventLoop {
     }
 
     /// Send a message to the event loop.
-    pub fn send(&self, msg: ScriptThreadMessage) -> Result<(), Error> {
-        self.script_chan
-            .send(msg)
-            .map_err(|_err| Box::new(ipc_channel::ErrorKind::Custom("SendError".into())))
+    pub fn send(&self, msg: ScriptThreadMessage) -> Result<(), SendError> {
+        self.script_chan.send(msg)
     }
 
     /// If this is [`EventLoop`] is in another process, send a message to its `BackgroundHangMonitor`,

components/constellation/lib.rs

@@ -11,6 +11,7 @@ mod broadcastchannel;
 mod browsingcontext;
 mod constellation;
 mod constellation_webview;
+mod embedder;
 mod event_loop;
 mod logging;
 mod pipeline;
@@ -20,6 +21,7 @@ mod serviceworker;
 mod session_history;
 
 pub use crate::constellation::{Constellation, InitialConstellationState};
+pub use crate::embedder::ConstellationToEmbedderMsg;
 pub use crate::event_loop::{EventLoop, NewScriptEventLoopProcessInfo};
 pub use crate::logging::{FromEmbedderLogger, FromScriptLogger};
 pub use crate::sandboxing::{UnprivilegedContent, content_process_sandbox_profile};

components/constellation/logging.rs

@@ -11,14 +11,14 @@ use std::sync::Arc;
 use std::thread;
 
 use backtrace::Backtrace;
-use base::id::{ScriptEventLoopId, TEST_PIPELINE_ID, TEST_WEBVIEW_ID};
-use constellation_traits::{
-    EmbedderToConstellationMessage, LogEntry, ScriptToConstellationMessage,
-    ScriptToConstellationSender,
-};
 use crossbeam_channel::Sender;
 use log::{Level, LevelFilter, Log, Metadata, Record};
 use parking_lot::ReentrantMutex;
+use servo_base::id::{ScriptEventLoopId, TEST_PIPELINE_ID, TEST_WEBVIEW_ID};
+use servo_constellation_traits::{
+    EmbedderToConstellationMessage, LogEntry, ScriptToConstellationMessage,
+    ScriptToConstellationSender,
+};
 
 /// A logger directed at the constellation from content processes
 /// #[derive(Clone)]

components/constellation/pipeline.rs

@@ -5,16 +5,16 @@
 use std::collections::HashSet;
 use std::rc::Rc;
 
-use base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
-use compositing_traits::{CompositionPipeline, PaintMessage, PaintProxy};
-use constellation_traits::{LoadData, ServiceWorkerManagerFactory};
 use embedder_traits::{AnimationState, FocusSequenceNumber};
-use ipc_channel::Error;
 use layout_api::ScriptThreadFactory;
 use log::{debug, error, warn};
+use paint_api::{CompositionPipeline, PaintMessage, PaintProxy};
 use script_traits::{
     DiscardBrowsingContext, DocumentActivity, NewPipelineInfo, ScriptThreadMessage,
 };
+use servo_base::generic_channel::SendError;
+use servo_base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
+use servo_constellation_traits::{LoadData, ServiceWorkerManagerFactory};
 use servo_url::ServoUrl;
 
 use crate::Constellation;
@@ -77,7 +77,7 @@ impl Pipeline {
         event_loop: Rc<EventLoop>,
         constellation: &Constellation<STF, SWF>,
         throttled: bool,
-    ) -> Result<Self, Error> {
+    ) -> Result<Self, SendError> {
         if let Err(error) = event_loop.send(ScriptThreadMessage::SpawnPipeline(
             new_pipeline_info.clone(),
         )) {

components/constellation/process_manager.rs

@@ -34,7 +34,7 @@ impl Process {
     }
 }
 
-type ProcessReceiver = Receiver<Result<(), ipc_channel::Error>>;
+type ProcessReceiver = Receiver<Result<(), ipc_channel::IpcError>>;
 
 pub(crate) struct ProcessManager {
     processes: Vec<(Process, ProcessReceiver)>,

components/constellation/sandboxing.rs

@@ -17,7 +17,7 @@ use std::{env, process};
     )
 ))]
 use gaol::profile::{Operation, PathPattern, Profile};
-use ipc_channel::Error;
+use ipc_channel::IpcError;
 use serde::{Deserialize, Serialize};
 use servo_config::opts::Opts;
 use servo_config::prefs::Preferences;
@@ -146,7 +146,7 @@ pub fn content_process_sandbox_profile() {
     target_arch = "arm",
     target_arch = "aarch64"
 ))]
-pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, Error> {
+pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, IpcError> {
     use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
     // Note that this function can panic, due to process creation,
     // avoiding this panic would require a mechanism for dealing
@@ -177,7 +177,7 @@ pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, Error
     not(target_arch = "arm"),
     not(target_arch = "aarch64")
 ))]
-pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, Error> {
+pub fn spawn_multiprocess(content: UnprivilegedContent) -> Result<Process, IpcError> {
     use gaol::sandbox::{self, Sandbox, SandboxMethods};
     use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
 

components/constellation/serviceworker.rs

@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use base::generic_channel::GenericSender;
-use constellation_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
-use ipc_channel::Error;
+use ipc_channel::IpcError;
 use serde::{Deserialize, Serialize};
+use servo_base::generic_channel::GenericSender;
 use servo_config::opts::{self, Opts};
 use servo_config::prefs;
 use servo_config::prefs::Preferences;
+use servo_constellation_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
 use servo_url::ImmutableOrigin;
 
 use crate::process_manager::Process;
@@ -49,7 +49,7 @@ impl ServiceWorkerUnprivilegedContent {
     }
 
     /// Start the agent-cluster in it's own process.
-    pub fn spawn_multiprocess(self) -> Result<Process, Error> {
+    pub fn spawn_multiprocess(self) -> Result<Process, IpcError> {
         spawn_multiprocess(UnprivilegedContent::ServiceWorker(self))
     }
 }

components/constellation/session_history.rs

@@ -5,10 +5,10 @@
 use std::cmp::PartialEq;
 use std::fmt;
 
-use base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
-use constellation_traits::LoadData;
 use embedder_traits::ViewportDetails;
 use log::debug;
+use servo_base::id::{BrowsingContextId, HistoryStateId, PipelineId, WebViewId};
+use servo_constellation_traits::LoadData;
 use servo_url::ServoUrl;
 
 use crate::browsingcontext::NewBrowsingContextInfo;

components/constellation/tracing.rs

@@ -46,7 +46,7 @@ mod from_embedder {
         };
     }
 
-    impl LogTarget for constellation_traits::EmbedderToConstellationMessage {
+    impl LogTarget for servo_constellation_traits::EmbedderToConstellationMessage {
         fn log_target(&self) -> &'static str {
             match self {
                 Self::Exit => target!("Exit"),
@@ -82,6 +82,8 @@ mod from_embedder {
                 Self::RequestScreenshotReadiness(..) => target!("RequestScreenshotReadiness"),
                 Self::EmbedderControlResponse(..) => target!("EmbedderControlResponse"),
                 Self::UserContentManagerAction(..) => target!("UserContentManagerAction"),
+                Self::UpdatePinchZoomInfos(..) => target!("UpdatePinchZoomInfos"),
+                Self::SetAccessibilityActive(..) => target!("SetAccessibilityActive"),
             }
         }
     }
@@ -104,7 +106,6 @@ mod from_embedder {
                 InputEvent::MouseLeftViewport(..) => target_variant!("MouseLeftViewport"),
                 InputEvent::Touch(..) => target_variant!("Touch"),
                 InputEvent::Wheel(..) => target_variant!("Wheel"),
-                InputEvent::Scroll(..) => target_variant!("Scroll"),
             }
         }
     }
@@ -119,7 +120,7 @@ mod from_script {
         };
     }
 
-    impl LogTarget for constellation_traits::ScriptToConstellationMessage {
+    impl LogTarget for servo_constellation_traits::ScriptToConstellationMessage {
         fn log_target(&self) -> &'static str {
             match self {
                 Self::CompleteMessagePortTransfer(..) => target!("CompleteMessagePortTransfer"),
@@ -143,10 +144,13 @@ mod from_script {
                 Self::BroadcastStorageEvent(..) => target!("BroadcastStorageEvent"),
                 Self::ChangeRunningAnimationsState(..) => target!("ChangeRunningAnimationsState"),
                 Self::CreateCanvasPaintThread(..) => target!("CreateCanvasPaintThread"),
-                Self::Focus(..) => target!("Focus"),
-                Self::FocusRemoteDocument(..) => target!("FocusRemoteDocument"),
+                Self::FocusAncestorBrowsingContextsForFocusingSteps(..) => {
+                    target!("FocusAncestorBrowsingContextsForFocusingSteps")
+                },
+                Self::FocusRemoteBrowsingContext(..) => target!("FocusRemoteBrowsingContext"),
                 Self::GetTopForBrowsingContext(..) => target!("GetTopForBrowsingContext"),
                 Self::GetBrowsingContextInfo(..) => target!("GetBrowsingContextInfo"),
+                Self::GetDocumentOrigin(..) => target!("GetDocumentOrigin"),
                 Self::GetChildBrowsingContextId(..) => target!("GetChildBrowsingContextId"),
                 Self::LoadComplete => target!("LoadComplete"),
                 Self::LoadUrl(..) => target!("LoadUrl"),
@@ -184,6 +188,7 @@ mod from_script {
                 Self::RespondToScreenshotReadinessRequest(..) => {
                     target!("RespondToScreenshotReadinessRequest")
                 },
+                Self::TriggerGarbageCollection => target!("TriggerGarbageCollection"),
             }
         }
     }

components/default-resources/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "servo-default-resources"
+version.workspace = true
+authors.workspace = true
+repository.workspace = true
+description.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
+rust-version.workspace = true
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+embedder_traits = { workspace = true }

components/default-resources/lib.rs

@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::path::PathBuf;
+
+use embedder_traits::resources::{Resource, ResourceReaderMethods};
+
+/// A default resource reader that provides baked in resources.
+pub struct DefaultResourceReader;
+
+impl ResourceReaderMethods for DefaultResourceReader {
+    fn sandbox_access_files(&self) -> Vec<PathBuf> {
+        vec![]
+    }
+    fn sandbox_access_files_dirs(&self) -> Vec<PathBuf> {
+        vec![]
+    }
+    fn read(&self, file: Resource) -> Vec<u8> {
+        match file {
+            Resource::BluetoothBlocklist => &include_bytes!("resources/gatt_blocklist.txt")[..],
+            Resource::DomainList => &include_bytes!("resources/public_domains.txt")[..],
+            Resource::HstsPreloadList => &include_bytes!("resources/hsts_preload.fstmap")[..],
+            Resource::BadCertHTML => &include_bytes!("resources/badcert.html")[..],
+            Resource::NetErrorHTML => &include_bytes!("resources/neterror.html")[..],
+            Resource::BrokenImageIcon => &include_bytes!("resources/rippy.png")[..],
+            Resource::CrashHTML => &include_bytes!("resources/crash.html")[..],
+            Resource::DirectoryListingHTML => {
+                &include_bytes!("resources/directory-listing.html")[..]
+            },
+            Resource::AboutMemoryHTML => &include_bytes!("resources/about-memory.html")[..],
+            Resource::DebuggerJS => &include_bytes!("resources/debugger.js")[..],
+            Resource::JsonViewerHTML => &include_bytes!("resources/json-viewer.html")[..],
+        }
+        .to_owned()
+    }
+}
+
+embedder_traits::submit_resource_reader!(&DefaultResourceReader);

components/default-resources/resources/about-memory.html

@@ -154,6 +154,12 @@
       }
 
       function start() {
+        window.gcButton.onclick = async () => {
+          window.gcButton.disabled = true;
+          navigator.servo.garbageCollectAllContexts();
+          window.gcButton.disabled = false;
+        };
+
         window.startButton.onclick = async () => {
           let content = await navigator.servo.reportMemory();
           let reports = JSON.parse(content);
@@ -211,6 +217,7 @@
   <body>
     <h2>Memory Reports</h2>
     <button id="startButton">Measure</button>
+    <button id="gcButton">Force GC</button>
     <div id="reports" class="hidden"></div>
   </body>
 </html>

components/default-resources/resources/debugger.js

@@ -0,0 +1,597 @@
+if ("dbg" in this) {
+    throw new Error("Debugger script must not run more than once!");
+}
+
+const dbg = new Debugger;
+const debuggeesToPipelineIds = new Map;
+const debuggeesToWorkerIds = new Map;
+const sourceIdsToScripts = new Map;
+const frameActorsToFrames = new Map;
+const environmentActorsToEnvironments = new Map;
+
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/thread.js#155>
+// Possible values for the `why.type` attribute in "paused" event
+const PAUSE_REASONS = {
+  INTERRUPTED: "interrupted", // Associated with why.onNext attribute
+  RESUME_LIMIT: "resumeLimit",
+};
+
+// Find script by scriptId within a script tree
+function findScriptById(script, scriptId) {
+    if (script.sourceStart === scriptId) {
+        return script;
+    }
+    for (const child of script.getChildScripts()) {
+        const found = findScriptById(child, scriptId);
+        if (found) return found;
+    }
+    return null;
+}
+
+// Walk script tree and call callback for each script
+function walkScriptTree(script, callback) {
+    callback(script);
+    for (const child of script.getChildScripts()) {
+        walkScriptTree(child, callback);
+    }
+}
+
+// Find a key by a value in a map
+function findKeyByValue(map, search) {
+    for (const [key, value] of map) {
+        if (value === search) return key;
+    }
+    return undefined;
+}
+
+dbg.uncaughtExceptionHook = function(error) {
+    console.error(`[debugger] Uncaught exception at ${error.fileName}:${error.lineNumber}:${error.columnNumber}: ${error.name}: ${error.message}`);
+};
+
+dbg.onNewScript = function(script) {
+    // TODO: handle wasm (`script.source.introductionType == wasm`)
+    sourceIdsToScripts.set(script.source.id, script);
+    notifyNewSource({
+        pipelineId: debuggeesToPipelineIds.get(script.global),
+        workerId: debuggeesToWorkerIds.get(script.global),
+        spidermonkeyId: script.source.id,
+        url: script.source.url,
+        urlOverride: script.source.displayURL,
+        text: script.source.text,
+        introductionType: script.source.introductionType ?? null,
+    });
+};
+
+// Track a new debuggee global
+addEventListener("addDebuggee", event => {
+    const {global, pipelineId, workerId} = event;
+    const debuggerObject = dbg.addDebuggee(global);
+    debuggeesToPipelineIds.set(debuggerObject, pipelineId);
+    if (workerId !== undefined) {
+        debuggeesToWorkerIds.set(debuggerObject, workerId);
+    }
+});
+
+// Maximum number of properties to include in preview
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/object/previewers.js#29>
+const OBJECT_PREVIEW_MAX_ITEMS = 10;
+
+// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#80>
+const previewers = {
+    Function: [],
+    Array: [],
+    Object: [],
+    // TODO: Add Map, FormData etc
+};
+
+// Convert debuggee value to property descriptor value
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/object/utils.js#116>
+function createValueGrip(value, depth = 0) {
+    switch (typeof value) {
+        case "undefined":
+            return { valueType: "undefined" };
+        case "boolean":
+            return { valueType: "boolean", booleanValue: value };
+        case "number":
+            if (value === Infinity) {
+                return { valueType: "Infinity" };
+            } else if (value === -Infinity) {
+                return { valueType: "-Infinity" };
+            } else if (Number.isNaN(value)) {
+                return { valueType: "NaN" };
+            } else if (!value && 1 / value === -Infinity) {
+                return { valueType: "-0" };
+            }
+
+            return { valueType: "number", numberValue: value };
+        case "string":
+            return { valueType: "string", stringValue: value };
+        case "object":
+            if (value === null) {
+                return { valueType: "null" };
+            }
+            // Debugger.Object - get preview using registered previewers
+            // <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Object.html>
+            return {
+                valueType: "object",
+                objectClass: value.class,
+                preview: getPreview(value, depth),
+            };
+        default:
+            return { valueType: "string", stringValue: String(value) };
+    }
+}
+
+// Extract own properties from a debuggee object
+// <https://firefox-source-docs.mozilla.org/devtools-user/debugger-api/debugger.object/index.html#function-properties-of-the-debugger-object-prototype>
+function extractOwnProperties(obj, depth, maxItems = OBJECT_PREVIEW_MAX_ITEMS) {
+    const ownProperties = [];
+    let totalLength = 0;
+
+    let names;
+    try {
+        names = obj.getOwnPropertyNames();
+        totalLength = names.length;
+    } catch (e) {
+        return { ownProperties, ownPropertiesLength: 0 };
+    }
+
+    let count = 0;
+    for (const name of names) {
+        if (count >= maxItems) break;
+        try {
+            const desc = obj.getOwnPropertyDescriptor(name);
+            if (desc) {
+                const prop = {
+                    name: name,
+                    configurable: desc.configurable ?? false,
+                    enumerable: desc.enumerable ?? false,
+                    writable: desc.writable ?? false,
+                    isAccessor: desc.get !== undefined || desc.set !== undefined,
+                    value: createValueGrip(undefined, depth + 1),
+                };
+
+                if (desc.value !== undefined) {
+                    prop.value = createValueGrip(desc.value, depth + 1);
+                } else if (desc.get) {
+                    try {
+                        const result = desc.get.call(obj);
+                        if (result && "return" in result) {
+                            prop.value = createValueGrip(result.return, depth + 1);
+                        }
+                    } catch (e) { }
+                }
+
+                ownProperties.push(prop);
+                count++;
+            }
+        } catch (e) {
+            // For now skip properties that throw on access
+        }
+    }
+
+    return { ownProperties, ownPropertiesLength: totalLength };
+}
+
+// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#125>
+previewers.Function.push(function FunctionPreviewer(obj, depth) {
+    let function_details = {
+        name: obj.name,
+        displayName: obj.displayName,
+        parameterNames: obj.parameterNames ? obj.parameterNames: [],
+        isAsync: obj.isAsyncFunction,
+        isGenerator: obj.isGeneratorFunction,
+    }
+
+    if (depth > 1) {
+        return { kind: "Object", function: function_details };
+    }
+
+    const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj, depth);
+    return {
+        kind: "Object",
+        ownProperties,
+        ownPropertiesLength,
+        function: function_details
+    };
+});
+
+// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#172>
+// TODO: Add implementation for showing Array items
+previewers.Array.push(function ArrayPreviewer(obj, depth) {
+    const lengthDescriptor = obj.getOwnPropertyDescriptor("length");
+    const length = lengthDescriptor ? lengthDescriptor.value : 0;
+
+    return {
+        kind: "ArrayLike",
+        arrayLength: length,
+    };
+});
+
+// Generic fallback for object previewer
+// <https://searchfox.org/mozilla-central/source/devtools/server/actors/object/previewers.js#856>
+previewers.Object.push(function ObjectPreviewer(obj, depth) {
+    if (depth > 1) {
+       return { kind: "Object" };
+    }
+
+    const { ownProperties, ownPropertiesLength } = extractOwnProperties(obj, depth);
+    return {
+        kind: "Object",
+        ownProperties,
+        ownPropertiesLength,
+    };
+});
+
+function getPreview(obj, depth) {
+    const className = obj.class;
+
+    // <https://searchfox.org/mozilla-central/source/devtools/server/actors/object.js#295>
+    const typePreviewers = previewers[className] || previewers.Object;
+    for (const previewer of typePreviewers) {
+        const result = previewer(obj, depth);
+        if (result) return result;
+    }
+
+    return { ownProperties: [], ownPropertiesLength: 0 };
+}
+
+// Evaluate some javascript code in the global context of the debuggee
+// <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Object.html#executeinglobal-code-options>
+addEventListener("eval", event => {
+    const {code, pipelineId, workerId, frameActorId} = event;
+
+    let completionValue;
+    if (frameActorId) {
+        const frame = frameActorsToFrames.get(frameActorId);
+        // <https://searchfox.org/firefox-main/source/js/src/doc/Debugger/Debugger.Frame.md#223>
+        if (frame?.onStack) {
+            completionValue = frame.eval(code);
+        } else {
+            completionValue = { throw: "Frame not available" };
+        }
+    } else {
+        const object = workerId !== undefined ?
+            findKeyByValue(debuggeesToWorkerIds, workerId) :
+            findKeyByValue(debuggeesToPipelineIds, pipelineId);
+        completionValue = object.executeInGlobal(code);
+    }
+
+    // Completion values: <https://firefox-source-docs.mozilla.org/js/Debugger/Conventions.html#completion-values>
+    let resultValue;
+    if (completionValue === null) {
+        resultValue = { completionType: "terminated", value: createValueGrip(undefined), hasException: false };
+    } else if ("throw" in completionValue) {
+        // <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.html#adoptdebuggeevalue-value>
+        // <https://searchfox.org/firefox-main/source/devtools/server/actors/webconsole/eval-with-debugger.js#312>
+        // we probably don't need adoptDebuggeeValue, as we only have one debugger instance for now
+        // let value = dbg.adoptDebuggeeValue(completionValue.throw);
+        resultValue = { completionType: "throw", value: createValueGrip(completionValue.throw), hasException: true };
+    } else if ("return" in completionValue) {
+        resultValue = { completionType: "return", value: createValueGrip(completionValue.return), hasException: false };
+    }
+
+    // To avoid recursion errors in the WebIDL, preview needs to live outside of the property descriptor
+    if (resultValue.value.preview) {
+        resultValue.preview = resultValue.value.preview;
+        delete resultValue.value.preview;
+    }
+
+    evalResult(event, resultValue);
+});
+
+addEventListener("getPossibleBreakpoints", event => {
+    const {spidermonkeyId} = event;
+    const script = sourceIdsToScripts.get(spidermonkeyId);
+    const result = [];
+    walkScriptTree(script, (currentScript) => {
+        for (const location of currentScript.getPossibleBreakpoints()) {
+            location["scriptId"] = currentScript.sourceStart;
+            result.push(location);
+        }
+    });
+    getPossibleBreakpointsResult(event, result);
+});
+
+function createFrameActor(frame, pipelineId) {
+    let frameActorId = findKeyByValue(frameActorsToFrames, frame);
+    if (!frameActorId) {
+        // TODO: Check if we already have an actor for this frame
+        frameActorId = registerFrameActor(pipelineId, {
+            // TODO: Some properties throw if terminated is true
+            // TODO: arguments: frame.arguments,
+            displayName: frame.script.displayName,
+            onStack: frame.onStack,
+            oldest: frame.older == null,
+            terminated: frame.terminated,
+            type_: frame.type,
+            url: frame.script.url,
+        });
+
+        if (!frameActorId) {
+            console.error("[debugger] Couldn't create frame");
+            return undefined;
+        }
+        frameActorsToFrames.set(frameActorId, frame);
+    }
+
+    return frameActorId;
+}
+
+function handlePauseAndRespond(frame, pauseReason) {
+    dbg.onEnterFrame = undefined;
+    clearSteppingHooks(frame);
+
+    // Get the pipeline ID for this debuggee
+    const pipelineId = debuggeesToPipelineIds.get(frame.script.global);
+    if (!pipelineId) {
+        console.error("[debugger] No pipeline ID for frame's global");
+        return undefined;
+    }
+
+    let frameActorId = createFrameActor(frame, pipelineId);
+
+    // <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Script.html#getoffsetmetadata-offset>
+    const offset = frame.offset;
+    const offsetMetadata = frame.script.getOffsetMetadata(offset);
+    const frameOffset = {
+        frameActorId,
+        column: offsetMetadata.columnNumber - 1,
+        line: offsetMetadata.lineNumber
+    };
+
+    // Notify devtools and enter pause loop. This blocks until Resume.
+    pauseAndRespond(
+        pipelineId,
+        frameOffset,
+        pauseReason
+    );
+
+    // <https://firefox-source-docs.mozilla.org/js/Debugger/Conventions.html#resumption-values>
+    // Return undefined to continue execution normally after resume.
+    return undefined;
+}
+
+addEventListener("frames", event => {
+    const {pipelineId, start, count} = event;
+    let frameList = handleListFrames(pipelineId, start, count);
+
+    listFramesResult(frameList);
+})
+
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/thread.js#1425>
+function handleListFrames(pipelineId, start, count) {
+    let frame = dbg.getNewestFrame()
+
+    const walkToParentFrame = () => {
+        if (!frame) {
+            return;
+        }
+
+        const currentFrame = frame;
+        frame = null;
+
+        if (currentFrame.older) {
+            frame = currentFrame.older;
+        }
+    }
+
+    let i = 0;
+    while (frame && i < start) {
+      walkToParentFrame();
+      i++;
+    }
+
+    // Return count frames, or all remaining frames if count is not defined.
+    const frames = [];
+    for (; frame && (!count || i < start + count); i++, walkToParentFrame()) {
+      const frameActorId = createFrameActor(frame, pipelineId);
+      frames.push(frameActorId);
+    }
+
+    return frames;
+}
+
+addEventListener("setBreakpoint", event => {
+    const {spidermonkeyId, scriptId, offset} = event;
+    const script = sourceIdsToScripts.get(spidermonkeyId);
+    const target = findScriptById(script, scriptId);
+    if (target) {
+        target.setBreakpoint(offset, {
+            // <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Script.html#setbreakpoint-offset-handler>
+            // The hit handler receives a Debugger.Frame instance representing the currently executing stack frame.
+            hit: (frame) => handlePauseAndRespond(frame, {type_: "breakpoint"})
+        });
+    }
+});
+
+// <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Frame.html>
+addEventListener("interrupt", event => {
+    dbg.onEnterFrame = (frame) => handlePauseAndRespond(
+        frame,
+        { type_: PAUSE_REASONS.INTERRUPTED, onNext: true }
+    );
+});
+
+function makeSteppingHooks(steppingType, startFrame) {
+    return {
+        onEnterFrame: (frame) => {
+            const { onStep, onPop } = makeSteppingHooks("next", frame);
+            frame.onStep = onStep;
+            frame.onPop = onPop;
+        },
+        onStep: () => {
+            const meta = startFrame.script.getOffsetMetadata(startFrame.offset);
+            if (meta.isBreakpoint && meta.isStepStart) {
+                return handlePauseAndRespond(startFrame, { type_: PAUSE_REASONS.RESUME_LIMIT });
+            }
+        },
+        onPop: (completion) => {
+            this.reportedPop = true;
+            suspendedFrame = startFrame;
+            if (steppingType !== "finish") {
+                // TODO: completion contains the return value, we have to send it back
+                // <https://searchfox.org/firefox-main/source/devtools/server/actors/thread.js#1026>
+                return handlePauseAndRespond(startFrame, { type_: steppingType });
+            }
+            attachSteppingHooks("next", startFrame);
+        },
+    }
+}
+
+function getNextStepFrame(frame) {
+    const endOfFrame = frame.reportedPop;
+    const stepFrame = endOfFrame ? frame.older : frame;
+    if (!stepFrame || !stepFrame.script) {
+      return null;
+    }
+    return stepFrame;
+}
+
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/thread.js#1235>
+function attachSteppingHooks(steppingType, frame) {
+    if (steppingType === "finish" && frame.reportedPop) {
+        steppingType = "next";
+    }
+
+    const stepFrame = getNextStepFrame(frame);
+    if (!stepFrame) {
+        steppingType = "step";
+    }
+
+    const { onEnterFrame, onStep, onPop } = makeSteppingHooks(
+        steppingType,
+        frame,
+    );
+
+    if (steppingType === "step") {
+        dbg.onEnterFrame = onEnterFrame;
+    }
+
+    if (stepFrame) {
+        switch (steppingType) {
+            case "step":
+            case "next":
+                if (stepFrame.script) {
+                    stepFrame.onStep = onStep;
+                }
+            case "finish":
+                stepFrame.onPop = onPop;
+                break;
+        }
+    }
+}
+
+function clearSteppingHooks(suspendedFrame) {
+    if (suspendedFrame) {
+        suspendedFrame.onStep = undefined;
+        suspendedFrame.onPop = undefined;
+    }
+    let frame = this.youngestFrame;
+    if (frame?.onStack) {
+        while (frame) {
+            frame.onStep = undefined;
+            frame.onPop = undefined;
+            frame = frame.older;
+        }
+    }
+}
+
+// <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#resuming-a-thread>
+addEventListener("resume", event => {
+    const {resumeLimitType: steppingType, frameActorID} = event;
+    let frame = dbg.getNewestFrame();
+    if (frameActorID) {
+        frame = frameActorsToFrames.get(frameActorID);
+        if (!frame) {
+            console.error("[debugger] Couldn't find frame");
+        }
+    }
+    if (steppingType) {
+        attachSteppingHooks(steppingType, frame);
+    } else {
+        clearSteppingHooks(frame);
+    }
+});
+
+// <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Script.html#clearbreakpoint-handler-offset>
+// There may be more than one breakpoint at the same offset with different handlers, but we don’t handle that case for now.
+addEventListener("clearBreakpoint", event => {
+    const {spidermonkeyId, scriptId, offset} = event;
+    const script = sourceIdsToScripts.get(spidermonkeyId);
+    const target = findScriptById(script, scriptId);
+    if (target) {
+        // <https://firefox-source-docs.mozilla.org/js/Debugger/Debugger.Script.html#clearallbreakpoints-offset>
+        // If the instance refers to a JSScript, remove all breakpoints set in this script at that offset.
+        target.clearAllBreakpoints(offset);
+    }
+});
+
+// TODO: Get variables (scopes don't show if they don't have a variable)
+function createEnvironmentActor(environment) {
+    let actor = findKeyByValue(environmentActorsToEnvironments, environment);
+
+    if (!actor) {
+        let info = {};
+        if (environment.type == "declarative") {
+            info.type_ = environment.calleeScript ? "function" : "block";
+        } else {
+            info.type_ = environment.type;
+        }
+
+        info.scopeKind = environment.scopeKind;
+
+        if (environment.calleeScript) {
+            info.functionDisplayName = environment.calleeScript.displayName;
+        }
+
+        let parent = null;
+        if (environment.parent) {
+            parent = createEnvironmentActor(environment.parent);
+        }
+
+        if (environment.type == "declarative") {
+            info.bindingVariables = buildBindings(environment)
+        }
+
+        actor = registerEnvironmentActor(info, parent);
+        environmentActorsToEnvironments.set(actor, environment);
+    }
+
+    return actor;
+}
+
+function buildBindings(environment) {
+    let bindingVars = [];
+    for (const name of environment.names()) {
+        const value = environment.getVariable(name);
+        const property = {
+            name: name,
+            configurable: false,
+            enumerable: true,
+            writable: !value?.optimizedOut,
+            isAccessor: false,
+            value: createValueGrip(value),
+        };
+
+        // To avoid recursion errors in the WebIDL, preview needs to live outside of the property descriptor
+        let preview = undefined;
+        if (property.value.preview) {
+            preview = property.value.preview;
+            delete property.value.preview;
+        }
+
+        bindingVars.push({ property, preview });
+    }
+    return bindingVars;
+}
+
+// Get a `Debugger.Environment` instance within which evaluation is taking place.
+// <https://searchfox.org/firefox-main/source/devtools/server/actors/frame.js#109>
+addEventListener("getEnvironment", event => {
+    const {frameActorId} = event;
+    frame = frameActorsToFrames.get(frameActorId);
+
+    const actor = createEnvironmentActor(frame.environment);
+    getEnvironmentResult(actor);
+});

components/default-resources/resources/json-viewer.html

@@ -0,0 +1,269 @@
+<html>
+  <head>
+    <style>
+      body {
+        font-family: monospace;
+        margin: 0;
+        padding: 0;
+        background: #fff;
+        color: #333;
+      }
+
+      #json-raw {
+        display: none;
+      }
+
+      #viewer {
+        display: none;
+        padding: 0.5em 1em;
+        line-height: 1.5;
+
+        &.active {
+          display: block;
+        }
+      }
+
+      #toolbar {
+        display: flex;
+        gap: 1em;
+        padding: 0.5em;
+        align-items: center;
+        background: #f5f5f5;
+        border-bottom: 1px solid #ddd;
+
+        & button {
+          min-width: 5em;
+
+          &.active {
+            background: #ddd;
+            font-weight: bold;
+          }
+        }
+      }
+
+      #raw-view {
+        display: none;
+        padding: 0.5em 1em;
+        white-space: pre-wrap;
+        word-break: break-all;
+
+        &.active {
+          display: block;
+        }
+      }
+
+      .json-error {
+        padding: 0.5em 1em;
+        color: #c00;
+        font-weight: bold;
+      }
+
+      /* Syntax highlighting for Json data types */
+      .json-key {
+        color: #881391;
+      }
+
+      .json-string {
+        color: #1a1aa6;
+      }
+
+      .json-number {
+        color: #1c00cf;
+      }
+
+      .json-boolean {
+        color: #0d22aa;
+      }
+
+      .json-null {
+        color: #808080;
+      }
+
+      /* Collapsible tree */
+      .toggle {
+        cursor: pointer;
+        user-select: none;
+
+        &::before {
+          content: "\25BC";
+          display: inline-block;
+          width: 1em;
+          transition: transform 0.1s;
+        }
+
+        &.collapsed::before {
+          transform: rotate(-90deg);
+        }
+      }
+
+      .collapsible {
+        margin-left: 1.5em;
+
+        &.hidden {
+          display: none;
+        }
+      }
+
+      .bracket {
+        color: #333;
+      }
+
+      .comma {
+        color: #333;
+      }
+
+      .line {
+        padding-left: 0;
+      }
+    </style>
+    <script>
+      // Shortcut to create an element with an optional class and text content.
+      function createElement(name, classes = null, textContent = null) {
+        let node = document.createElement(name);
+        if (classes) {
+          node.className = classes;
+        }
+        if (textContent) {
+          node.textContent = textContent;
+        }
+        return node;
+      }
+
+      function renderNode(value, container) {
+        if (value === null) {
+          let s = createElement("span", "json-null", "null");
+          container.append(s);
+        } else if (typeof value === "boolean") {
+          let s = createElement("span", "json-boolean", String(value));
+          container.append(s);
+        } else if (typeof value === "number") {
+          let s = createElement("span", "json-number", String(value));
+          container.append(s);
+        } else if (typeof value === "string") {
+          let s = createElement("span", "json-string", JSON.stringify(value));
+          container.append(s);
+        } else if (Array.isArray(value)) {
+          renderArray(value, container);
+        } else if (typeof value === "object") {
+          renderObject(value, container);
+        }
+      }
+
+      function renderObject(obj, container) {
+        let keys = Object.keys(obj);
+        if (keys.length === 0) {
+          container.append(createElement("span", "bracket", "{}"));
+          return;
+        }
+
+        let toggle = createElement("span", "toggle");
+        container.append(toggle);
+
+        container.append(createElement("span", "bracket", "{"));
+
+        let inner = createElement("div", "collapsible");
+        container.append(inner);
+
+        keys.forEach((key, i) => {
+          let line = createElement("div", "line");
+          line.append(createElement("span", "json-key", JSON.stringify(key)));
+          line.append(document.createTextNode(": "));
+          renderNode(obj[key], line);
+          if (i < keys.length - 1) {
+            line.append(createElement("span", "comma", ","));
+          }
+          inner.append(line);
+        });
+
+        container.append(createElement("span", "bracket", "}"));
+
+        toggle.onclick = function () {
+          toggle.classList.toggle("collapsed");
+          inner.classList.toggle("hidden");
+        };
+      }
+
+      function renderArray(arr, container) {
+        if (arr.length === 0) {
+          container.append(createElement("span", "bracket", "[]"));
+          return;
+        }
+
+        let toggle = createElement("span", "toggle");
+        container.append(toggle);
+
+        container.append(createElement("span", "bracket", "["));
+
+        let inner = createElement("div", "collapsible");
+        container.append(inner);
+
+        arr.forEach((item, i) => {
+          let line = createElement("div", "line");
+          renderNode(item, line);
+          if (i < arr.length - 1) {
+            line.append(createElement("span", "comma", ","));
+          }
+          inner.append(line);
+        });
+
+        container.append(createElement("span", "bracket", "]"));
+
+        toggle.onclick = function () {
+          toggle.classList.toggle("collapsed");
+          inner.classList.toggle("hidden");
+        };
+      }
+
+      document.addEventListener("DOMContentLoaded", function () {
+        const viewer = document.getElementById("viewer");
+        const prettyButton = document.getElementById("pretty-toggle");
+        const rawButton = document.getElementById("raw-toggle");
+        const rawView = document.getElementById("raw-view");
+        const rawText = rawView.innerText;
+
+        let data;
+        let parseError = null;
+        try {
+          data = JSON.parse(rawText);
+        } catch (e) {
+          parseError = e;
+        }
+
+        if (parseError) {
+          let errDiv = createElement(
+            "div",
+            "json-error",
+            "Invalid JSON: " + parseError.message,
+          );
+          viewer.append(errDiv);
+          viewer.append(createElement("pre", null, rawText));
+        } else {
+          renderNode(data, viewer);
+          rawView.textContent = JSON.stringify(data, null, 2);
+        }
+
+        // Toggle buttons
+        prettyButton.onclick = function () {
+          viewer.classList.add("active");
+          rawView.classList.remove("active");
+
+          prettyButton.classList.add("active");
+          rawButton.classList.remove("active");
+        };
+        rawButton.onclick = function () {
+          rawView.classList.add("active");
+          viewer.classList.remove("active");
+
+          rawButton.classList.add("active");
+          prettyButton.classList.remove("active");
+        };
+      });
+    </script>
+  </head>
+  <body>
+    <div id="toolbar">
+      <button id="pretty-toggle" class="active">Pretty</button>
+      <button id="raw-toggle">Raw</button>
+    </div>
+    <div id="viewer" class="active"></div>
+    <pre id="raw-view">

components/deny_public_fields/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "deny_public_fields"
+name = "servo-deny-public-fields"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
 path = "lib.rs"

components/devtools/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
-name = "devtools"
+name = "servo-devtools"
 version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 publish.workspace = true
 rust-version.workspace = true
+repository.workspace = true
+description.workspace = true
 
 [lib]
 name = "devtools"
@@ -13,7 +15,6 @@ path = "lib.rs"
 
 [dependencies]
 atomic_refcell = { workspace = true }
-base = { workspace = true }
 base64 = { workspace = true }
 chrono = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -22,14 +23,18 @@ embedder_traits = { workspace = true }
 headers = { workspace = true }
 http = { workspace = true }
 log = { workspace = true }
-net = { path = "../net" }
+malloc_size_of = { workspace = true }
+malloc_size_of_derive = { workspace = true }
+net = { workspace = true }
 net_traits = { workspace = true }
+profile_traits = { workspace = true }
 rand = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-servo_config = { path = "../config" }
-servo_url = { path = "../url" }
+servo-base = { workspace = true }
+servo-config = { workspace = true }
+servo-url = { workspace = true }
 uuid = { workspace = true }
 
 [build-dependencies]

components/devtools/actor.rs

@@ -5,18 +5,19 @@
 use std::any::{Any, type_name};
 use std::collections::HashMap;
 use std::marker::PhantomData;
-use std::net::TcpStream;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicU32, Ordering};
 
 use atomic_refcell::AtomicRefCell;
-use base::id::PipelineId;
 use log::{debug, warn};
+use malloc_size_of::MallocSizeOf;
+use malloc_size_of_derive::MallocSizeOf;
 use serde::Serialize;
 use serde_json::{Map, Value, json};
+use servo_base::id::PipelineId;
 
 use crate::StreamId;
-use crate::protocol::{ClientRequest, JsonPacketStream};
+use crate::protocol::{ClientRequest, DevtoolsConnection, JsonPacketStream};
 
 /// Error replies.
 ///
@@ -48,8 +49,7 @@ impl ActorError {
 
 /// A common trait for all devtools actors that encompasses an immutable name
 /// and the ability to process messages that are directed to particular actors.
-/// TODO: ensure the name is immutable
-pub(crate) trait Actor: Any + ActorAsAny + Send + Sync {
+pub(crate) trait Actor: Any + ActorAsAny + Send + Sync + MallocSizeOf {
     fn handle_message(
         &self,
         request: ClientRequest,
@@ -81,7 +81,7 @@ pub(crate) trait ActorEncode<T: Serialize>: Actor {
 
 /// Return value of `ActorRegistry::find` that allows seamless downcasting
 /// from `dyn Actor` to the concrete actor type.
-pub struct DowncastableActorArc<T> {
+pub(crate) struct DowncastableActorArc<T> {
     actor: Arc<dyn Actor>,
     _phantom: PhantomData<T>,
 }
@@ -93,10 +93,19 @@ impl<T: 'static> std::ops::Deref for DowncastableActorArc<T> {
     }
 }
 
-/// A list of known, owned actors.
 #[derive(Default)]
-pub struct ActorRegistry {
-    actors: AtomicRefCell<HashMap<String, Arc<dyn Actor>>>,
+struct ActorRegistryType(AtomicRefCell<HashMap<String, Arc<dyn Actor>>>);
+
+impl MallocSizeOf for ActorRegistryType {
+    fn size_of(&self, ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+        self.0.borrow().iter().map(|actor| actor.size_of(ops)).sum()
+    }
+}
+
+/// A list of known, owned actors.
+#[derive(Default, MallocSizeOf)]
+pub(crate) struct ActorRegistry {
+    actors: ActorRegistryType,
     script_actors: AtomicRefCell<HashMap<String, String>>,
     /// Lookup table for SourceActor names associated with a given PipelineId.
     source_actor_names: AtomicRefCell<HashMap<PipelineId, Vec<String>>>,
@@ -107,7 +116,7 @@ pub struct ActorRegistry {
 
 impl ActorRegistry {
     pub(crate) fn cleanup(&self, stream_id: StreamId) {
-        for actor in self.actors.borrow().values() {
+        for actor in self.actors.0.borrow().values() {
             actor.cleanup(stream_id);
         }
     }
@@ -147,16 +156,25 @@ impl ActorRegistry {
     }
 
     /// Create a unique name based on a monotonically increasing suffix
-    /// TODO: Merge this with `register/register_later` and don't allow to
+    /// TODO: Merge this with `register` and don't allow to
     /// create new names without registering an actor.
     pub fn new_name<T: Actor>(&self) -> String {
         let suffix = self.next.fetch_add(1, Ordering::Relaxed);
-        format!("{}{}", Self::base_name::<T>(), suffix)
+        let base = Self::base_name::<T>();
+
+        // Firefox DevTools client requires "/workerTarget" in actor name to recognize workers
+        // <https://searchfox.org/firefox-main/source/devtools/client/fronts/watcher.js#65>
+        if base.contains("WorkerTarget") {
+            format!("/workerTarget{}", suffix)
+        } else {
+            format!("{}{}", base, suffix)
+        }
     }
 
     /// Add an actor to the registry of known actors that can receive messages.
     pub(crate) fn register<T: Actor>(&self, actor: T) {
         self.actors
+            .0
             .borrow_mut()
             .insert(actor.name(), Arc::new(actor));
     }
@@ -165,6 +183,7 @@ impl ActorRegistry {
     pub fn find<T: Actor>(&self, name: &str) -> DowncastableActorArc<T> {
         let actor = self
             .actors
+            .0
             .borrow()
             .get(name)
             .expect("Should never look for a nonexistent actor")
@@ -185,7 +204,7 @@ impl ActorRegistry {
     pub(crate) fn handle_message(
         &self,
         msg: &Map<String, Value>,
-        stream: &mut TcpStream,
+        stream: &mut DevtoolsConnection,
         stream_id: StreamId,
     ) -> Result<(), ()> {
         let to = match msg.get("to") {
@@ -197,7 +216,7 @@ impl ActorRegistry {
         };
 
         let actor = {
-            let actors_map = self.actors.borrow();
+            let actors_map = self.actors.0.borrow();
             actors_map.get(to).cloned()
         };
         match actor {
@@ -208,7 +227,7 @@ impl ActorRegistry {
             },
             Some(actor) => {
                 let msg_type = msg.get("type").unwrap().as_str().unwrap();
-                if let Err(error) = ClientRequest::handle(stream, to, |req| {
+                if let Err(error) = ClientRequest::handle(stream.clone(), to, |req| {
                     actor.handle_message(req, self, msg_type, msg, stream_id)
                 }) {
                     // <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#error-packets>
@@ -224,7 +243,7 @@ impl ActorRegistry {
     }
 
     pub fn remove(&self, name: String) {
-        self.actors.borrow_mut().remove(&name);
+        self.actors.0.borrow_mut().remove(&name);
     }
 
     pub fn register_source_actor(&self, pipeline_id: PipelineId, actor_name: &str) {

components/devtools/actors/breakpoint.rs

@@ -2,12 +2,35 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use devtools_traits::DevtoolScriptControlMsg;
+use malloc_size_of_derive::MallocSizeOf;
+use serde::Deserialize;
+use serde_json::Map;
+
 use crate::actor::{Actor, ActorEncode, ActorError, ActorRegistry};
+use crate::actors::browsing_context::BrowsingContextActor;
+use crate::actors::thread::ThreadActor;
 use crate::protocol::ClientRequest;
 use crate::{ActorMsg, EmptyReplyMsg};
 
-pub struct BreakpointListActor {
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct BreakpointRequestLocation {
+    pub line: u32,
+    pub column: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub source_url: Option<String>,
+}
+
+#[derive(Deserialize)]
+struct BreakpointRequest {
+    location: BreakpointRequestLocation,
+}
+
+#[derive(MallocSizeOf)]
+pub(crate) struct BreakpointListActor {
     name: String,
+    browsing_context_name: String,
 }
 
 impl Actor for BreakpointListActor {
@@ -18,9 +41,9 @@ impl Actor for BreakpointListActor {
     fn handle_message(
         &self,
         request: ClientRequest,
-        _registry: &crate::actor::ActorRegistry,
+        registry: &crate::actor::ActorRegistry,
         msg_type: &str,
-        _msg: &serde_json::Map<String, serde_json::Value>,
+        msg: &Map<String, serde_json::Value>,
         _stream_id: crate::StreamId,
     ) -> Result<(), ActorError> {
         match msg_type {
@@ -28,6 +51,35 @@ impl Actor for BreakpointListActor {
             // Seems to be infallible, unlike the thread actor’s `setBreakpoint`.
             // <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#breakpoints>
             "setBreakpoint" => {
+                let msg: BreakpointRequest =
+                    serde_json::from_value(msg.clone().into()).map_err(|_| ActorError::Internal)?;
+                let BreakpointRequestLocation {
+                    line,
+                    column,
+                    source_url,
+                } = msg.location;
+                let source_url = source_url.ok_or(ActorError::Internal)?;
+
+                let browsing_context_actor =
+                    registry.find::<BrowsingContextActor>(&self.browsing_context_name);
+                let thread_actor =
+                    registry.find::<ThreadActor>(&browsing_context_actor.thread_name);
+                let source = thread_actor
+                    .source_manager
+                    .find_source(registry, &source_url)
+                    .ok_or(ActorError::Internal)?;
+
+                if let Some((script_id, offset)) = source.find_offset(line, column) {
+                    source
+                        .script_sender
+                        .send(DevtoolScriptControlMsg::SetBreakpoint(
+                            source.spidermonkey_id,
+                            script_id,
+                            offset,
+                        ))
+                        .map_err(|_| ActorError::Internal)?;
+                }
+
                 let msg = EmptyReplyMsg { from: self.name() };
                 request.reply_final(&msg)?
             },
@@ -36,6 +88,34 @@ impl Actor for BreakpointListActor {
                 request.reply_final(&msg)?
             },
             "removeBreakpoint" => {
+                let msg: BreakpointRequest =
+                    serde_json::from_value(msg.clone().into()).map_err(|_| ActorError::Internal)?;
+                let BreakpointRequestLocation {
+                    line,
+                    column,
+                    source_url,
+                } = msg.location;
+                let source_url = source_url.ok_or(ActorError::Internal)?;
+
+                let browsing_context_actor =
+                    registry.find::<BrowsingContextActor>(&self.browsing_context_name);
+                let thread_actor =
+                    registry.find::<ThreadActor>(&browsing_context_actor.thread_name);
+                let source = thread_actor
+                    .source_manager
+                    .find_source(registry, &source_url)
+                    .ok_or(ActorError::Internal)?;
+                if let Some((script_id, offset)) = source.find_offset(line, column) {
+                    source
+                        .script_sender
+                        .send(DevtoolScriptControlMsg::ClearBreakpoint(
+                            source.spidermonkey_id,
+                            script_id,
+                            offset,
+                        ))
+                        .map_err(|_| ActorError::Internal)?;
+                }
+
                 let msg = EmptyReplyMsg { from: self.name() };
                 request.reply_final(&msg)?
             },
@@ -46,8 +126,14 @@ impl Actor for BreakpointListActor {
 }
 
 impl BreakpointListActor {
-    pub fn new(name: String) -> Self {
-        Self { name }
+    pub fn register(registry: &ActorRegistry, browsing_context_name: String) -> String {
+        let name = registry.new_name::<Self>();
+        let actor = Self {
+            name: name.clone(),
+            browsing_context_name,
+        };
+        registry.register::<Self>(actor);
+        name
     }
 }
 

components/devtools/actors/browsing_context.rs

@@ -6,19 +6,16 @@
 //! Connection point for remote devtools that wish to investigate a particular Browsing Context's contents.
 //! Supports dynamic attaching and detaching which control notifications of navigation, etc.
 
-use std::collections::HashMap;
-use std::net::TcpStream;
-
 use atomic_refcell::AtomicRefCell;
-use base::generic_channel::{self, GenericSender};
-use base::id::PipelineId;
-use devtools_traits::DevtoolScriptControlMsg::{
-    self, GetCssDatabase, SimulateColorScheme, WantsLiveNotifications,
-};
+use devtools_traits::DevtoolScriptControlMsg::{self, GetCssDatabase, SimulateColorScheme};
 use devtools_traits::{DevtoolsPageInfo, NavigationState};
 use embedder_traits::Theme;
+use malloc_size_of_derive::MallocSizeOf;
+use rustc_hash::FxHashMap;
 use serde::Serialize;
 use serde_json::{Map, Value};
+use servo_base::generic_channel::{self, GenericSender, SendError};
+use servo_base::id::PipelineId;
 
 use crate::actor::{Actor, ActorEncode, ActorError, ActorRegistry};
 use crate::actors::inspector::InspectorActor;
@@ -30,7 +27,7 @@ use crate::actors::tab::TabDescriptorActor;
 use crate::actors::thread::ThreadActor;
 use crate::actors::watcher::{SessionContext, SessionContextType, WatcherActor};
 use crate::id::{DevtoolsBrowserId, DevtoolsBrowsingContextId, DevtoolsOuterWindowId, IdMap};
-use crate::protocol::{ClientRequest, JsonPacketStream};
+use crate::protocol::{ClientRequest, DevtoolsConnection, JsonPacketStream};
 use crate::resource::ResourceAvailable;
 use crate::{EmptyReplyMsg, StreamId};
 
@@ -90,7 +87,7 @@ enum TargetType {
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct BrowsingContextActorMsg {
+pub(crate) struct BrowsingContextActorMsg {
     actor: String,
     title: String,
     url: String,
@@ -131,27 +128,33 @@ pub struct BrowsingContextActorMsg {
 /// The browsing context actor encompasses all of the other supporting actors when debugging a web
 /// view. To this extent, it contains a watcher actor that helps when communicating with the host,
 /// as well as resource actors that each perform one debugging function.
+#[derive(MallocSizeOf)]
 pub(crate) struct BrowsingContextActor {
-    pub name: String,
+    name: String,
     pub title: AtomicRefCell<String>,
     pub url: AtomicRefCell<String>,
     /// This corresponds to webview_id
     pub browser_id: DevtoolsBrowserId,
     // TODO: Should these ids be atomic?
-    pub active_pipeline_id: AtomicRefCell<PipelineId>,
-    pub active_outer_window_id: AtomicRefCell<DevtoolsOuterWindowId>,
+    active_pipeline_id: AtomicRefCell<PipelineId>,
+    active_outer_window_id: AtomicRefCell<DevtoolsOuterWindowId>,
     pub browsing_context_id: DevtoolsBrowsingContextId,
-    pub accessibility: String,
-    pub console: String,
-    pub css_properties: String,
-    pub inspector: String,
-    pub reflow: String,
-    pub style_sheets: String,
-    pub thread: String,
-    pub _tab: String,
-    pub script_chan: GenericSender<DevtoolScriptControlMsg>,
-    pub streams: AtomicRefCell<HashMap<StreamId, TcpStream>>,
-    pub watcher: String,
+    accessibility_name: String,
+    pub console_name: String,
+    css_properties_name: String,
+    pub(crate) inspector_name: String,
+    reflow_name: String,
+    style_sheets_name: String,
+    pub thread_name: String,
+    _tab: String,
+    // Different pipelines may run on different script threads.
+    // These should be kept around even when the active pipeline is updated,
+    // in case the browsing context revisits a pipeline via history navigation.
+    // TODO: Each entry is stored forever; ideally there should be a way to
+    //       detect when `ScriptThread`s are destroyed and remove the associated
+    //       entries.
+    script_chans: AtomicRefCell<FxHashMap<PipelineId, GenericSender<DevtoolScriptControlMsg>>>,
+    pub watcher_name: String,
 }
 
 impl ResourceAvailable for BrowsingContextActor {
@@ -190,37 +193,29 @@ impl Actor for BrowsingContextActor {
         };
         Ok(())
     }
-
-    fn cleanup(&self, id: StreamId) {
-        self.streams.borrow_mut().remove(&id);
-        if self.streams.borrow().is_empty() {
-            self.script_chan
-                .send(WantsLiveNotifications(self.pipeline_id(), false))
-                .unwrap();
-        }
-    }
 }
 
 impl BrowsingContextActor {
     #[expect(clippy::too_many_arguments)]
-    pub(crate) fn new(
-        console: String,
+    pub(crate) fn register(
+        registry: &ActorRegistry,
+        console_name: String,
         browser_id: DevtoolsBrowserId,
         browsing_context_id: DevtoolsBrowsingContextId,
         page_info: DevtoolsPageInfo,
         pipeline_id: PipelineId,
         outer_window_id: DevtoolsOuterWindowId,
         script_sender: GenericSender<DevtoolScriptControlMsg>,
-        actors: &ActorRegistry,
-    ) -> BrowsingContextActor {
-        let name = actors.new_name::<BrowsingContextActor>();
+    ) -> String {
+        let name = registry.new_name::<BrowsingContextActor>();
         let DevtoolsPageInfo {
             title,
             url,
             is_top_level_global,
+            ..
         } = page_info;
 
-        let accessibility = AccessibilityActor::new(actors.new_name::<AccessibilityActor>());
+        let accessibility_name = AccessibilityActor::register(registry);
 
         let properties = (|| {
             let (properties_sender, properties_receiver) = generic_channel::channel()?;
@@ -228,58 +223,70 @@ impl BrowsingContextActor {
             properties_receiver.recv().ok()
         })()
         .unwrap_or_default();
-        let css_properties =
-            CssPropertiesActor::new(actors.new_name::<CssPropertiesActor>(), properties);
+        let css_properties_name = CssPropertiesActor::register(registry, properties);
 
-        let inspector = InspectorActor::register(actors, pipeline_id, script_sender.clone());
+        let inspector_name = InspectorActor::register(registry, name.clone());
 
-        let reflow = ReflowActor::new(actors.new_name::<ReflowActor>());
+        let reflow_name = ReflowActor::register(registry);
 
-        let style_sheets = StyleSheetsActor::new(actors.new_name::<StyleSheetsActor>());
+        let style_sheets_name = StyleSheetsActor::register(registry);
 
-        let tabdesc = TabDescriptorActor::new(actors, name.clone(), is_top_level_global);
+        let tab_descriptor_name =
+            TabDescriptorActor::register(registry, name.clone(), is_top_level_global);
 
-        let thread = ThreadActor::new(actors.new_name::<ThreadActor>());
+        let thread_name =
+            ThreadActor::register(registry, script_sender.clone(), Some(name.clone()));
 
-        let watcher = WatcherActor::new(
-            actors,
+        let watcher_name = WatcherActor::register(
+            registry,
             name.clone(),
             SessionContext::new(SessionContextType::BrowserElement),
         );
 
-        let target = BrowsingContextActor {
-            name,
-            script_chan: script_sender,
+        let mut script_chans = FxHashMap::default();
+        script_chans.insert(pipeline_id, script_sender);
+
+        let actor = BrowsingContextActor {
+            name: name.clone(),
+            script_chans: AtomicRefCell::new(script_chans),
             title: AtomicRefCell::new(title),
             url: AtomicRefCell::new(url.into_string()),
             active_pipeline_id: AtomicRefCell::new(pipeline_id),
             active_outer_window_id: AtomicRefCell::new(outer_window_id),
             browser_id,
             browsing_context_id,
-            accessibility: accessibility.name(),
-            console,
-            css_properties: css_properties.name(),
-            inspector,
-            reflow: reflow.name(),
-            streams: AtomicRefCell::new(HashMap::new()),
-            style_sheets: style_sheets.name(),
-            _tab: tabdesc.name(),
-            thread: thread.name(),
-            watcher: watcher.name(),
+            accessibility_name,
+            console_name,
+            css_properties_name,
+            inspector_name,
+            reflow_name,
+            style_sheets_name,
+            _tab: tab_descriptor_name,
+            thread_name,
+            watcher_name,
         };
 
-        actors.register(accessibility);
-        actors.register(css_properties);
-        actors.register(reflow);
-        actors.register(style_sheets);
-        actors.register(tabdesc);
-        actors.register(thread);
-        actors.register(watcher);
+        registry.register::<Self>(actor);
 
-        target
+        name
     }
 
-    pub(crate) fn navigate(&self, state: NavigationState, id_map: &mut IdMap) {
+    pub(crate) fn handle_new_global(
+        &self,
+        pipeline: PipelineId,
+        script_sender: GenericSender<DevtoolScriptControlMsg>,
+    ) {
+        self.script_chans
+            .borrow_mut()
+            .insert(pipeline, script_sender);
+    }
+
+    pub(crate) fn handle_navigate<'a>(
+        &self,
+        state: NavigationState,
+        id_map: &mut IdMap,
+        connections: impl Iterator<Item = &'a mut DevtoolsConnection>,
+    ) {
         let (pipeline_id, title, url, state) = match state {
             NavigationState::Start(url) => (None, None, url, "start"),
             NavigationState::Stop(pipeline, info) => {
@@ -306,7 +313,7 @@ impl BrowsingContextActor {
             is_frame_switching: false,
         };
 
-        for stream in self.streams.borrow_mut().values_mut() {
+        for stream in connections {
             let _ = stream.write_json_packet(&msg);
         }
     }
@@ -332,7 +339,7 @@ impl BrowsingContextActor {
     }
 
     pub fn simulate_color_scheme(&self, theme: Theme) -> Result<(), ()> {
-        self.script_chan
+        self.script_chan()
             .send(SimulateColorScheme(self.pipeline_id(), theme))
             .map_err(|_| ())
     }
@@ -344,6 +351,28 @@ impl BrowsingContextActor {
     pub(crate) fn outer_window_id(&self) -> DevtoolsOuterWindowId {
         *self.active_outer_window_id.borrow()
     }
+
+    /// Returns the script sender for the active pipeline.
+    pub(crate) fn script_chan(&self) -> GenericSender<DevtoolScriptControlMsg> {
+        self.script_chans
+            .borrow()
+            .get(&self.pipeline_id())
+            .unwrap()
+            .clone()
+    }
+
+    pub(crate) fn instruct_script_to_send_live_updates(&self, should_send_updates: bool) {
+        let result = self
+            .script_chan()
+            .send(DevtoolScriptControlMsg::WantsLiveNotifications(
+                self.pipeline_id(),
+                should_send_updates,
+            ));
+
+        // Notifying the script thread may fail with a "Disconnected" error if servo
+        // as a whole is being shut down.
+        debug_assert!(matches!(result, Ok(_) | Err(SendError::Disconnected)));
+    }
 }
 
 impl ActorEncode<BrowsingContextActorMsg> for BrowsingContextActor {
@@ -364,13 +393,13 @@ impl ActorEncode<BrowsingContextActorMsg> for BrowsingContextActor {
             browsing_context_id: self.browsing_context_id.value(),
             outer_window_id: self.outer_window_id().value(),
             is_top_level_target: true,
-            accessibility_actor: self.accessibility.clone(),
-            console_actor: self.console.clone(),
-            css_properties_actor: self.css_properties.clone(),
-            inspector_actor: self.inspector.clone(),
-            reflow_actor: self.reflow.clone(),
-            style_sheets_actor: self.style_sheets.clone(),
-            thread_actor: self.thread.clone(),
+            accessibility_actor: self.accessibility_name.clone(),
+            console_actor: self.console_name.clone(),
+            css_properties_actor: self.css_properties_name.clone(),
+            inspector_actor: self.inspector_name.clone(),
+            reflow_actor: self.reflow_name.clone(),
+            style_sheets_actor: self.style_sheets_name.clone(),
+            thread_actor: self.thread_name.clone(),
             target_type: TargetType::Frame,
         }
     }

components/devtools/actors/console.rs

@@ -7,68 +7,121 @@
 //! inspection, JS evaluation, autocompletion) in Servo.
 
 use std::collections::HashMap;
-use std::net::TcpStream;
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::sync::atomic::{AtomicBool, Ordering};
 
 use atomic_refcell::AtomicRefCell;
-use base::generic_channel::{self, GenericSender};
-use base::id::TEST_PIPELINE_ID;
-use devtools_traits::EvaluateJSReply::{
-    ActorValue, BooleanValue, NullValue, NumberValue, StringValue, VoidValue,
-};
 use devtools_traits::{
-    CachedConsoleMessage, CachedConsoleMessageTypes, ConsoleClearMessage, ConsoleLog,
-    ConsoleMessage, DevtoolScriptControlMsg, PageError,
+    ConsoleMessage, ConsoleMessageFields, DevtoolScriptControlMsg, PageError, StackFrame,
+    get_time_stamp,
 };
-use log::debug;
+use malloc_size_of_derive::MallocSizeOf;
 use serde::Serialize;
-use serde_json::{self, Map, Number, Value};
+use serde_json::{self, Map, Value};
+use servo_base::generic_channel::{self, GenericSender};
+use servo_base::id::TEST_PIPELINE_ID;
 use uuid::Uuid;
 
 use crate::actor::{Actor, ActorError, ActorRegistry};
 use crate::actors::browsing_context::BrowsingContextActor;
-use crate::actors::object::ObjectActor;
-use crate::actors::worker::WorkerActor;
-use crate::protocol::{ClientRequest, JsonPacketStream};
+use crate::actors::object::debugger_value_to_json;
+use crate::actors::worker::WorkerTargetActor;
+use crate::protocol::{ClientRequest, DevtoolsConnection, JsonPacketStream};
 use crate::resource::{ResourceArrayType, ResourceAvailable};
 use crate::{EmptyReplyMsg, StreamId, UniqueId};
 
-trait EncodableConsoleMessage {
-    fn encode(&self) -> serde_json::Result<String>;
+#[derive(Clone, Serialize, MallocSizeOf)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct DevtoolsConsoleMessage {
+    #[serde(flatten)]
+    fields: ConsoleMessageFields,
+    #[ignore_malloc_size_of = "Currently no way to have serde_json::Value"]
+    arguments: Vec<Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    stacktrace: Option<Vec<StackFrame>>,
+    // Not implemented in Servo
+    // inner_window_id
+    // source_id
 }
 
-impl EncodableConsoleMessage for CachedConsoleMessage {
-    fn encode(&self) -> serde_json::Result<String> {
-        match *self {
-            CachedConsoleMessage::PageError(ref a) => serde_json::to_string(a),
-            CachedConsoleMessage::ConsoleLog(ref a) => serde_json::to_string(a),
+impl DevtoolsConsoleMessage {
+    pub(crate) fn new(message: ConsoleMessage, registry: &ActorRegistry) -> Self {
+        Self {
+            fields: message.fields,
+            arguments: message
+                .arguments
+                .into_iter()
+                .map(|argument| debugger_value_to_json(registry, argument))
+                .collect(),
+            stacktrace: message.stacktrace,
+        }
+    }
+}
+
+#[derive(Clone, Serialize, MallocSizeOf)]
+#[serde(rename_all = "camelCase")]
+struct DevtoolsPageError {
+    #[serde(flatten)]
+    page_error: PageError,
+    category: String,
+    error: bool,
+    warning: bool,
+    info: bool,
+    private: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    stacktrace: Option<Vec<StackFrame>>,
+    // Not implemented in Servo
+    // inner_window_id
+    // source_id
+    // has_exception
+    // exception
+}
+
+impl From<PageError> for DevtoolsPageError {
+    fn from(page_error: PageError) -> Self {
+        Self {
+            page_error,
+            category: "script".to_string(),
+            error: true,
+            warning: false,
+            info: false,
+            private: false,
+            stacktrace: None,
+        }
+    }
+}
+#[derive(Clone, Serialize, MallocSizeOf)]
+#[serde(rename_all = "camelCase")]
+pub(crate) struct PageErrorWrapper {
+    page_error: DevtoolsPageError,
+}
+
+impl From<PageError> for PageErrorWrapper {
+    fn from(page_error: PageError) -> Self {
+        Self {
+            page_error: page_error.into(),
+        }
+    }
+}
+
+#[derive(Clone, Serialize, MallocSizeOf)]
+#[serde(untagged)]
+pub(crate) enum ConsoleResource {
+    ConsoleMessage(DevtoolsConsoleMessage),
+    PageError(PageErrorWrapper),
+}
+
+impl ConsoleResource {
+    pub fn resource_type(&self) -> String {
+        match self {
+            ConsoleResource::ConsoleMessage(_) => "console-message".into(),
+            ConsoleResource::PageError(_) => "error-message".into(),
         }
     }
 }
 
 #[derive(Serialize)]
-struct StartedListenersTraits;
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct StartedListenersReply {
-    from: String,
-    native_console_api: bool,
-    started_listeners: Vec<String>,
-    traits: StartedListenersTraits,
-}
-
-#[derive(Serialize)]
-struct GetCachedMessagesReply {
-    from: String,
-    messages: Vec<Map<String, Value>>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct StopListenersReply {
-    from: String,
-    stopped_listeners: Vec<String>,
+pub struct ConsoleClearMessage {
+    pub level: String,
 }
 
 #[derive(Serialize)]
@@ -88,6 +141,7 @@ struct EvaluateJSReply {
     timestamp: u64,
     exception: Value,
     exception_message: Value,
+    has_exception: bool,
     helper_result: Value,
 }
 
@@ -104,6 +158,7 @@ struct EvaluateJSEvent {
     result_id: String,
     exception: Value,
     exception_message: Value,
+    has_exception: bool,
     helper_result: Value,
 }
 
@@ -120,45 +175,58 @@ struct SetPreferencesReply {
     updated: Vec<String>,
 }
 
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct PageErrorWrapper {
-    page_error: PageError,
-}
-
+#[derive(MallocSizeOf)]
 pub(crate) enum Root {
     BrowsingContext(String),
     DedicatedWorker(String),
 }
 
+#[derive(MallocSizeOf)]
 pub(crate) struct ConsoleActor {
-    pub name: String,
-    pub root: Root,
-    pub cached_events: AtomicRefCell<HashMap<UniqueId, Vec<CachedConsoleMessage>>>,
+    name: String,
+    root: Root,
+    cached_events: AtomicRefCell<HashMap<UniqueId, Vec<ConsoleResource>>>,
+    /// Used to control whether to send resource array messages from
+    /// `handle_console_resource`. It starts being false, and it only gets
+    /// activated after the client requests `console-message` or `error-message`
+    /// resources for the first time. Otherwise we would be sending messages
+    /// before the client is ready to receive them.
+    client_ready_to_receive_messages: AtomicBool,
 }
 
 impl ConsoleActor {
+    pub fn register(registry: &ActorRegistry, name: String, root: Root) -> String {
+        let actor = Self {
+            name: name.clone(),
+            root,
+            cached_events: Default::default(),
+            client_ready_to_receive_messages: false.into(),
+        };
+        registry.register(actor);
+        name
+    }
+
     fn script_chan(&self, registry: &ActorRegistry) -> GenericSender<DevtoolScriptControlMsg> {
         match &self.root {
-            Root::BrowsingContext(browsing_context) => registry
-                .find::<BrowsingContextActor>(browsing_context)
-                .script_chan
+            Root::BrowsingContext(browsing_context_name) => registry
+                .find::<BrowsingContextActor>(browsing_context_name)
+                .script_chan(),
+            Root::DedicatedWorker(worker_name) => registry
+                .find::<WorkerTargetActor>(worker_name)
+                .script_sender
                 .clone(),
-            Root::DedicatedWorker(worker) => {
-                registry.find::<WorkerActor>(worker).script_chan.clone()
-            },
         }
     }
 
     fn current_unique_id(&self, registry: &ActorRegistry) -> UniqueId {
         match &self.root {
-            Root::BrowsingContext(browsing_context) => UniqueId::Pipeline(
+            Root::BrowsingContext(browsing_context_name) => UniqueId::Pipeline(
                 registry
-                    .find::<BrowsingContextActor>(browsing_context)
+                    .find::<BrowsingContextActor>(browsing_context_name)
                     .pipeline_id(),
             ),
-            Root::DedicatedWorker(worker) => {
-                UniqueId::Worker(registry.find::<WorkerActor>(worker).worker_id)
+            Root::DedicatedWorker(worker_name) => {
+                UniqueId::Worker(registry.find::<WorkerTargetActor>(worker_name).worker_id)
             },
         }
     }
@@ -169,132 +237,70 @@ impl ConsoleActor {
         msg: &Map<String, Value>,
     ) -> Result<EvaluateJSReply, ()> {
         let input = msg.get("text").unwrap().as_str().unwrap().to_owned();
+        let frame_actor_id = msg
+            .get("frameActor")
+            .and_then(|v| v.as_str())
+            .map(String::from);
         let (chan, port) = generic_channel::channel().unwrap();
-        // FIXME: Redesign messages so we don't have to fake pipeline ids when
-        //        communicating with workers.
+        // FIXME: Redesign messages so we don't have to fake pipeline ids when communicating with workers.
         let pipeline = match self.current_unique_id(registry) {
             UniqueId::Pipeline(p) => p,
             UniqueId::Worker(_) => TEST_PIPELINE_ID,
         };
         self.script_chan(registry)
-            .send(DevtoolScriptControlMsg::EvaluateJS(
-                pipeline,
+            .send(DevtoolScriptControlMsg::Eval(
                 input.clone(),
+                pipeline,
+                frame_actor_id,
                 chan,
             ))
             .unwrap();
 
-        // TODO: Extract conversion into protocol module or some other useful place
-        let result = match port.recv().map_err(|_| ())? {
-            VoidValue => {
-                let mut m = Map::new();
-                m.insert("type".to_owned(), Value::String("undefined".to_owned()));
-                Value::Object(m)
-            },
-            NullValue => {
-                let mut m = Map::new();
-                m.insert("type".to_owned(), Value::String("null".to_owned()));
-                Value::Object(m)
-            },
-            BooleanValue(val) => Value::Bool(val),
-            NumberValue(val) => {
-                if val.is_nan() {
-                    let mut m = Map::new();
-                    m.insert("type".to_owned(), Value::String("NaN".to_owned()));
-                    Value::Object(m)
-                } else if val.is_infinite() {
-                    let mut m = Map::new();
-                    if val < 0. {
-                        m.insert("type".to_owned(), Value::String("-Infinity".to_owned()));
-                    } else {
-                        m.insert("type".to_owned(), Value::String("Infinity".to_owned()));
-                    }
-                    Value::Object(m)
-                } else if val == 0. && val.is_sign_negative() {
-                    let mut m = Map::new();
-                    m.insert("type".to_owned(), Value::String("-0".to_owned()));
-                    Value::Object(m)
-                } else {
-                    Value::Number(Number::from_f64(val).unwrap())
-                }
-            },
-            StringValue(s) => Value::String(s),
-            ActorValue { class, uuid } => {
-                // TODO: Make initial ActorValue message include these properties?
-                let mut m = Map::new();
-                let actor = ObjectActor::register(registry, uuid);
+        let eval_result = port.recv().map_err(|_| ())?;
+        let has_exception = eval_result.has_exception;
 
-                m.insert("type".to_owned(), Value::String("object".to_owned()));
-                m.insert("class".to_owned(), Value::String(class));
-                m.insert("actor".to_owned(), Value::String(actor));
-                m.insert("extensible".to_owned(), Value::Bool(true));
-                m.insert("frozen".to_owned(), Value::Bool(false));
-                m.insert("sealed".to_owned(), Value::Bool(false));
-                Value::Object(m)
-            },
-        };
-
-        // TODO: Catch and return exception values from JS evaluation
         let reply = EvaluateJSReply {
             from: self.name(),
             input,
-            result,
-            timestamp: SystemTime::now()
-                .duration_since(UNIX_EPOCH)
-                .unwrap_or_default()
-                .as_millis() as u64,
+            result: debugger_value_to_json(registry, eval_result.value),
+            timestamp: get_time_stamp(),
             exception: Value::Null,
             exception_message: Value::Null,
+            has_exception,
             helper_result: Value::Null,
         };
-        std::result::Result::Ok(reply)
+        Ok(reply)
     }
 
-    pub(crate) fn handle_page_error(
+    pub(crate) fn handle_console_resource(
         &self,
-        page_error: PageError,
+        resource: ConsoleResource,
         id: UniqueId,
         registry: &ActorRegistry,
-        stream: &mut TcpStream,
+        stream: &mut DevtoolsConnection,
     ) {
         self.cached_events
             .borrow_mut()
             .entry(id.clone())
             .or_default()
-            .push(CachedConsoleMessage::PageError(page_error.clone()));
-        if id == self.current_unique_id(registry) {
-            if let Root::BrowsingContext(bc) = &self.root {
-                registry.find::<BrowsingContextActor>(bc).resource_array(
-                    PageErrorWrapper { page_error },
-                    "error-message".into(),
-                    ResourceArrayType::Available,
-                    stream,
-                )
-            };
+            .push(resource.clone());
+        if !self
+            .client_ready_to_receive_messages
+            .load(Ordering::Relaxed)
+        {
+            return;
         }
-    }
-
-    pub(crate) fn handle_console_api(
-        &self,
-        console_message: ConsoleMessage,
-        id: UniqueId,
-        registry: &ActorRegistry,
-        stream: &mut TcpStream,
-    ) {
-        let log_message: ConsoleLog = console_message.into();
-        self.cached_events
-            .borrow_mut()
-            .entry(id.clone())
-            .or_default()
-            .push(CachedConsoleMessage::ConsoleLog(log_message.clone()));
+        let resource_type = resource.resource_type();
         if id == self.current_unique_id(registry) {
-            if let Root::BrowsingContext(bc) = &self.root {
-                registry.find::<BrowsingContextActor>(bc).resource_array(
-                    log_message,
-                    "console-message".into(),
-                    ResourceArrayType::Available,
-                    stream,
-                )
+            if let Root::BrowsingContext(browsing_context_name) = &self.root {
+                registry
+                    .find::<BrowsingContextActor>(browsing_context_name)
+                    .resource_array(
+                        resource,
+                        resource_type,
+                        ResourceArrayType::Available,
+                        stream,
+                    )
             };
         }
     }
@@ -303,21 +309,45 @@ impl ConsoleActor {
         &self,
         id: UniqueId,
         registry: &ActorRegistry,
-        stream: &mut TcpStream,
+        stream: &mut DevtoolsConnection,
     ) {
         if id == self.current_unique_id(registry) {
-            if let Root::BrowsingContext(bc) = &self.root {
-                registry.find::<BrowsingContextActor>(bc).resource_array(
-                    ConsoleClearMessage {
-                        level: "clear".to_owned(),
-                    },
-                    "console-message".into(),
-                    ResourceArrayType::Available,
-                    stream,
-                )
+            if let Root::BrowsingContext(browsing_context_name) = &self.root {
+                registry
+                    .find::<BrowsingContextActor>(browsing_context_name)
+                    .resource_array(
+                        ConsoleClearMessage {
+                            level: "clear".to_owned(),
+                        },
+                        "console-message".into(),
+                        ResourceArrayType::Available,
+                        stream,
+                    )
             };
         }
     }
+
+    pub(crate) fn get_cached_messages(
+        &self,
+        registry: &ActorRegistry,
+        resource: &str,
+    ) -> Vec<ConsoleResource> {
+        let id = self.current_unique_id(registry);
+        let cached_events = self.cached_events.borrow();
+        let Some(events) = cached_events.get(&id) else {
+            return vec![];
+        };
+        events
+            .iter()
+            .filter(|event| event.resource_type() == resource)
+            .cloned()
+            .collect()
+    }
+
+    pub(crate) fn received_first_message_from_client(&self) {
+        self.client_ready_to_receive_messages
+            .store(true, Ordering::Relaxed);
+    }
 }
 
 impl Actor for ConsoleActor {
@@ -334,95 +364,11 @@ impl Actor for ConsoleActor {
         _id: StreamId,
     ) -> Result<(), ActorError> {
         match msg_type {
-            "clearMessagesCache" => {
+            "clearMessagesCacheAsync" => {
                 self.cached_events
                     .borrow_mut()
                     .remove(&self.current_unique_id(registry));
-                // FIXME: need to send a reply here!
-                return Err(ActorError::UnrecognizedPacketType);
-            },
-
-            "getCachedMessages" => {
-                let str_types = msg
-                    .get("messageTypes")
-                    .unwrap()
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .map(|json_type| json_type.as_str().unwrap());
-                let mut message_types = CachedConsoleMessageTypes::empty();
-                for str_type in str_types {
-                    match str_type {
-                        "PageError" => message_types.insert(CachedConsoleMessageTypes::PAGE_ERROR),
-                        "ConsoleAPI" => {
-                            message_types.insert(CachedConsoleMessageTypes::CONSOLE_API)
-                        },
-                        s => debug!("unrecognized message type requested: \"{}\"", s),
-                    };
-                }
-                let mut messages = vec![];
-                for event in self
-                    .cached_events
-                    .borrow()
-                    .get(&self.current_unique_id(registry))
-                    .unwrap_or(&vec![])
-                    .iter()
-                {
-                    let include = match event {
-                        CachedConsoleMessage::PageError(_)
-                            if message_types.contains(CachedConsoleMessageTypes::PAGE_ERROR) =>
-                        {
-                            true
-                        },
-                        CachedConsoleMessage::ConsoleLog(_)
-                            if message_types.contains(CachedConsoleMessageTypes::CONSOLE_API) =>
-                        {
-                            true
-                        },
-                        _ => false,
-                    };
-                    if include {
-                        let json_string = event.encode().unwrap();
-                        let json = serde_json::from_str::<Value>(&json_string).unwrap();
-                        messages.push(json.as_object().unwrap().to_owned())
-                    }
-                }
-
-                let msg = GetCachedMessagesReply {
-                    from: self.name(),
-                    messages,
-                };
-                request.reply_final(&msg)?
-            },
-
-            "startListeners" => {
-                // TODO: actually implement listener filters that support starting/stopping
-                let listeners = msg.get("listeners").unwrap().as_array().unwrap().to_owned();
-                let msg = StartedListenersReply {
-                    from: self.name(),
-                    native_console_api: true,
-                    started_listeners: listeners
-                        .into_iter()
-                        .map(|s| s.as_str().unwrap().to_owned())
-                        .collect(),
-                    traits: StartedListenersTraits,
-                };
-                request.reply_final(&msg)?
-            },
-
-            "stopListeners" => {
-                // TODO: actually implement listener filters that support starting/stopping
-                let msg = StopListenersReply {
-                    from: self.name(),
-                    stopped_listeners: msg
-                        .get("listeners")
-                        .unwrap()
-                        .as_array()
-                        .unwrap_or(&vec![])
-                        .iter()
-                        .map(|listener| listener.as_str().unwrap().to_owned())
-                        .collect(),
-                };
+                let msg = EmptyReplyMsg { from: self.name() };
                 request.reply_final(&msg)?
             },
 
@@ -450,7 +396,7 @@ impl Actor for ConsoleActor {
                 };
                 // Emit an eager reply so that the client starts listening
                 // for an async event with the resultID
-                let stream = request.reply(&early_reply)?;
+                let mut stream = request.reply(&early_reply)?;
 
                 if msg.get("eager").and_then(|v| v.as_bool()).unwrap_or(false) {
                     // We don't support the side-effect free evaluation that eager evaluation
@@ -468,6 +414,7 @@ impl Actor for ConsoleActor {
                     result_id,
                     exception: reply.exception,
                     exception_message: reply.exception_message,
+                    has_exception: reply.has_exception,
                     helper_result: reply.helper_result,
                 };
                 // Send the data from evaluateJS along with a resultID
@@ -482,14 +429,9 @@ impl Actor for ConsoleActor {
                 request.reply_final(&msg)?
             },
 
-            "clearMessagesCacheAsync" => {
-                self.cached_events
-                    .borrow_mut()
-                    .remove(&self.current_unique_id(registry));
-                let msg = EmptyReplyMsg { from: self.name() };
-                request.reply_final(&msg)?
-            },
-
+            // NOTE: Do not handle `startListeners`, it is a legacy API.
+            // Instead, enable the resource in `WatcherActor::supported_resources`
+            // and handle the messages there.
             _ => return Err(ActorError::UnrecognizedPacketType),
         };
         Ok(())

components/devtools/actors/device.rs

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use malloc_size_of_derive::MallocSizeOf;
 use serde::Serialize;
 use serde_json::{Map, Value};
 
@@ -34,8 +35,9 @@ struct SystemInfo {
 
 include!(concat!(env!("OUT_DIR"), "/build_id.rs"));
 
-pub struct DeviceActor {
-    pub name: String,
+#[derive(MallocSizeOf)]
+pub(crate) struct DeviceActor {
+    name: String,
 }
 
 impl Actor for DeviceActor {
@@ -58,7 +60,7 @@ impl Actor for DeviceActor {
                         apptype: "servo".to_string(),
                         version: env!("CARGO_PKG_VERSION").to_string(),
                         appbuildid: BUILD_ID.to_string(),
-                        platformversion: "145.0".to_string(),
+                        platformversion: "146.0".to_string(),
                         brand_name: "Servo".to_string(),
                     },
                 };
@@ -72,8 +74,11 @@ impl Actor for DeviceActor {
 }
 
 impl DeviceActor {
-    pub fn new(name: String) -> DeviceActor {
-        DeviceActor { name }
+    pub fn register(registry: &ActorRegistry) -> String {
+        let name = registry.new_name::<Self>();
+        let actor = DeviceActor { name: name.clone() };
+        registry.register::<Self>(actor);
+        name
     }
 
     pub fn description() -> ActorDescription {

components/devtools/actors/environment.rs

@@ -2,31 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use std::collections::HashMap;
+
+use devtools_traits::EnvironmentInfo;
+use malloc_size_of_derive::MallocSizeOf;
 use serde::Serialize;
-use serde_json::{Map, Value};
+use serde_json::Value;
 
 use crate::actor::{Actor, ActorEncode, ActorRegistry};
-use crate::actors::object::ObjectActorMsg;
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum EnvironmentType {
-    Function,
-    _Block,
-    _Object,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub enum EnvironmentScope {
-    Function,
-    _Global,
-}
+use crate::actors::object::{ObjectActorMsg, ObjectPropertyDescriptor};
 
 #[derive(Serialize)]
 struct EnvironmentBindings {
     arguments: Vec<Value>,
-    variables: Map<String, Value>,
+    variables: HashMap<String, ObjectPropertyDescriptor>,
 }
 
 #[derive(Serialize)]
@@ -37,11 +26,11 @@ struct EnvironmentFunction {
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct EnvironmentActorMsg {
+pub(crate) struct EnvironmentActorMsg {
     actor: String,
     #[serde(rename = "type")]
-    type_: EnvironmentType,
-    scope_kind: EnvironmentScope,
+    type_: Option<String>,
+    scope_kind: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     parent: Option<Box<EnvironmentActorMsg>>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -57,9 +46,11 @@ pub struct EnvironmentActorMsg {
 /// Resposible for listing the bindings in an environment and assigning new values to them.
 /// Referenced by `FrameActor` when replying to `getEnvironment` messages.
 /// <https://searchfox.org/firefox-main/source/devtools/server/actors/environment.js>
-pub struct EnvironmentActor {
-    pub name: String,
-    pub parent: Option<String>,
+#[derive(MallocSizeOf)]
+pub(crate) struct EnvironmentActor {
+    name: String,
+    environment: EnvironmentInfo,
+    parent_name: Option<String>,
 }
 
 impl Actor for EnvironmentActor {
@@ -68,22 +59,60 @@ impl Actor for EnvironmentActor {
     }
 }
 
+impl EnvironmentActor {
+    pub fn register(
+        registry: &ActorRegistry,
+        environment: EnvironmentInfo,
+        parent_name: Option<String>,
+    ) -> String {
+        let environment_name = registry.new_name::<Self>();
+        let environment_actor = Self {
+            name: environment_name.clone(),
+            parent_name,
+            environment,
+        };
+        registry.register(environment_actor);
+        environment_name
+    }
+}
+
 impl ActorEncode<EnvironmentActorMsg> for EnvironmentActor {
     fn encode(&self, registry: &ActorRegistry) -> EnvironmentActorMsg {
         let parent = self
-            .parent
+            .parent_name
             .as_ref()
             .map(|p| registry.find::<EnvironmentActor>(p))
             .map(|p| Box::new(p.encode(registry)));
         // TODO: Change hardcoded values.
         EnvironmentActorMsg {
             actor: self.name(),
-            type_: EnvironmentType::Function,
-            scope_kind: EnvironmentScope::Function,
+            type_: self.environment.type_.clone(),
+            scope_kind: self.environment.scope_kind.clone(),
             parent,
-            bindings: None,
-            function: None,
+            function: self
+                .environment
+                .function_display_name
+                .clone()
+                .map(|display_name| EnvironmentFunction { display_name }),
             object: None,
+            bindings: Some(EnvironmentBindings {
+                arguments: [].to_vec(),
+                variables: self
+                    .environment
+                    .binding_variables
+                    .clone()
+                    .into_iter()
+                    .map(|ref property_descriptor| {
+                        (
+                            property_descriptor.name.clone(),
+                            ObjectPropertyDescriptor::from_property_descriptor(
+                                registry,
+                                property_descriptor,
+                            ),
+                        )
+                    })
+                    .collect(),
+            }),
         }
     }
 }

components/devtools/actors/frame.rs

@@ -2,16 +2,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-// TODO: Remove once the actor is used
-#![expect(dead_code)]
-
+use atomic_refcell::AtomicRefCell;
+use devtools_traits::{DevtoolScriptControlMsg, FrameInfo};
+use malloc_size_of_derive::MallocSizeOf;
 use serde::Serialize;
 use serde_json::{Map, Value};
+use servo_base::generic_channel::channel;
 
 use crate::StreamId;
 use crate::actor::{Actor, ActorEncode, ActorError, ActorRegistry};
 use crate::actors::environment::{EnvironmentActor, EnvironmentActorMsg};
-use crate::protocol::ClientRequest;
+use crate::actors::object::ObjectActor;
+use crate::actors::source::SourceActor;
+use crate::protocol::{ClientRequest, JsonPacketStream};
 
 #[derive(Serialize)]
 struct FrameEnvironmentReply {
@@ -24,12 +27,12 @@ struct FrameEnvironmentReply {
 #[serde(rename_all = "kebab-case")]
 pub enum FrameState {
     OnStack,
-    Suspended,
-    Dead,
+    _Suspended,
+    _Dead,
 }
 
 #[derive(Serialize)]
-pub struct FrameWhere {
+pub(crate) struct FrameWhere {
     actor: String,
     line: u32,
     column: u32,
@@ -37,7 +40,7 @@ pub struct FrameWhere {
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct FrameActorMsg {
+pub(crate) struct FrameActorMsg {
     actor: String,
     #[serde(rename = "type")]
     type_: String,
@@ -46,15 +49,20 @@ pub struct FrameActorMsg {
     display_name: String,
     oldest: bool,
     state: FrameState,
+    this: Value,
     #[serde(rename = "where")]
     where_: FrameWhere,
 }
 
 /// Represents an stack frame. Used by `ThreadActor` when replying to interrupt messages.
 /// <https://searchfox.org/firefox-main/source/devtools/server/actors/frame.js>
-pub struct FrameActor {
-    pub name: String,
-    pub source_actor: String,
+#[derive(MallocSizeOf)]
+pub(crate) struct FrameActor {
+    name: String,
+    object_actor: String,
+    source_name: String,
+    frame_result: FrameInfo,
+    current_offset: AtomicRefCell<(u32, u32)>,
 }
 
 impl Actor for FrameActor {
@@ -65,7 +73,7 @@ impl Actor for FrameActor {
     // https://searchfox.org/firefox-main/source/devtools/shared/specs/frame.js
     fn handle_message(
         &self,
-        request: ClientRequest,
+        mut request: ClientRequest,
         registry: &ActorRegistry,
         msg_type: &str,
         _msg: &Map<String, Value>,
@@ -73,16 +81,24 @@ impl Actor for FrameActor {
     ) -> Result<(), ActorError> {
         match msg_type {
             "getEnvironment" => {
-                let environment = EnvironmentActor {
-                    name: registry.new_name::<EnvironmentActor>(),
-                    parent: None,
+                let Some((tx, rx)) = channel() else {
+                    return Err(ActorError::Internal);
                 };
+                let source_actor = registry.find::<SourceActor>(&self.source_name);
+                source_actor
+                    .script_sender
+                    .send(DevtoolScriptControlMsg::GetEnvironment(self.name(), tx))
+                    .map_err(|_| ActorError::Internal)?;
+                let environment_name = rx.recv().map_err(|_| ActorError::Internal)?;
+
                 let msg = FrameEnvironmentReply {
                     from: self.name(),
-                    environment: environment.encode(registry),
+                    environment: registry.encode::<EnvironmentActor, _>(&environment_name),
                 };
-                registry.register(environment);
-                request.reply_final(&msg)?
+                // This reply has a `type` field but it doesn't need a followup,
+                // unlike most messages. We need to skip the validity check.
+                request.write_json_packet(&msg)?;
+                request.mark_handled();
             },
             _ => return Err(ActorError::UnrecognizedPacketType),
         };
@@ -90,8 +106,33 @@ impl Actor for FrameActor {
     }
 }
 
+impl FrameActor {
+    pub fn register(
+        registry: &ActorRegistry,
+        source_name: String,
+        frame_result: FrameInfo,
+    ) -> String {
+        let object_name = ObjectActor::register(registry, None, "Object".to_owned(), None);
+
+        let name = registry.new_name::<Self>();
+        let actor = Self {
+            name: name.clone(),
+            object_actor: object_name,
+            source_name,
+            frame_result,
+            current_offset: Default::default(),
+        };
+        registry.register::<Self>(actor);
+        name
+    }
+
+    pub(crate) fn set_offset(&self, column: u32, line: u32) {
+        *self.current_offset.borrow_mut() = (column, line);
+    }
+}
+
 impl ActorEncode<FrameActorMsg> for FrameActor {
-    fn encode(&self, _: &ActorRegistry) -> FrameActorMsg {
+    fn encode(&self, registry: &ActorRegistry) -> FrameActorMsg {
         // TODO: Handle other states
         let state = FrameState::OnStack;
         let async_cause = if let FrameState::OnStack = state {
@@ -99,18 +140,22 @@ impl ActorEncode<FrameActorMsg> for FrameActor {
         } else {
             Some("await".into())
         };
+        let (column, line) = *self.current_offset.borrow();
+        // <https://searchfox.org/firefox-main/source/devtools/docs/user/debugger-api/debugger.frame/index.rst>
         FrameActorMsg {
             actor: self.name(),
-            type_: "call".into(),
+            type_: self.frame_result.type_.clone(),
             arguments: vec![],
             async_cause,
-            display_name: "".into(), // TODO: get display name
-            oldest: true,
+            // TODO: Should be optional
+            display_name: self.frame_result.display_name.clone(),
+            this: registry.encode::<ObjectActor, _>(&self.object_actor),
+            oldest: self.frame_result.oldest,
             state,
             where_: FrameWhere {
-                actor: self.source_actor.clone(),
-                line: 1, // TODO: get from breakpoint?
-                column: 1,
+                actor: self.source_name.clone(),
+                line,
+                column,
             },
         }
     }

components/devtools/actors/framerate.rs

@@ -5,14 +5,16 @@
 use std::mem;
 
 use atomic_refcell::AtomicRefCell;
-use base::generic_channel::GenericSender;
-use base::id::PipelineId;
 use devtools_traits::DevtoolScriptControlMsg;
+use malloc_size_of_derive::MallocSizeOf;
+use servo_base::generic_channel::GenericSender;
+use servo_base::id::PipelineId;
 
 use crate::actor::{Actor, ActorRegistry};
 use crate::actors::timeline::HighResolutionStamp;
 
-pub struct FramerateActor {
+#[derive(MallocSizeOf)]
+pub(crate) struct FramerateActor {
     name: String,
     pipeline_id: PipelineId,
     script_sender: GenericSender<DevtoolScriptControlMsg>,