CI: fix self-hosted runners in Linux builds

Signed-off-by: Delan Azabani <dazabani@igalia.com>

.cargo/config.toml

@@ -34,4 +34,3 @@ RUSTC_BOOTSTRAP = "crown,script,style_tests"
 
 [build]
 rustdocflags = ["--document-private-items"]
-rustc = "crown"

.gitattributes

@@ -1,5 +1,5 @@
 * text=auto eol=lf
-tests/* linguist-vendored
+tests/wpt/** linguist-vendored
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+# Reviewers for the Servo project
+
+
+/components/script/  @gterzian

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: servo
 open_collective: servo

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug Report
+about: Create a bug report to help us improve
+title: ''
+labels: C-untriaged
+assignees: ''
+
+---
+
+**Describe the bug:**
+A clear and concise description of the bug.
+
+**To Reproduce:**
+Steps to reproduce the behavior.
+
+**Platform:**
+Specify OS, distribution, and hardware platform.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,11 @@
+---
+name: Feature Request
+about: Suggest the implementation of a new feature
+title: ''
+labels: B-feature-tracking, C-untriaged
+assignees: ''
+
+---
+
+**Describe the new feature:**
+A clear and concise description of the new feature with links to any relevant specifications.

.github/dependabot.yml

@@ -8,3 +8,34 @@ updates:
   allow:
   - dependency-type: direct
   - dependency-type: indirect
+  groups:
+    gstreamer-related:
+       patterns:
+         - "gio*"
+         - "glib*"
+         - "gobject*"
+         - "gstreamer*"
+  groups:
+    egui-related:
+       patterns:
+         - "ecolor"
+         - "egui"
+         - "egui-winit"
+         - "egui_glow"
+         - "emath"
+         - "epaint"
+  ignore:
+  # Ignore all stylo crates as their upgrades are coordinated via companion PRs.
+  - dependency-name: servo_atoms
+  - dependency-name: derive_common
+  - dependency-name: malloc_size_of
+  - dependency-name: selectors
+  - dependency-name: servo_arc
+  - dependency-name: size_of_test
+  - dependency-name: style
+  - dependency-name: style_config
+  - dependency-name: style_derive
+  - dependency-name: style_static_prefs
+  - dependency-name: style_traits
+  - dependency-name: to_shmem
+  - dependency-name: to_shmem_derive

.github/workflows/android.yml

@@ -18,6 +18,7 @@ env:
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
   CCACHE: "sccache"
   CARGO_INCREMENTAL: 0
 
@@ -27,32 +28,36 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        arch: ['armv7-linux-androideabi', 'i686-linux-android']
+        arch: ['aarch64-linux-android', 'armv7-linux-androideabi', 'i686-linux-android', 'x86_64-linux-android']
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          large-packages: false
+          swap-storage: false
       - uses: actions/checkout@v4
-        if: github.event_name != 'issue_comment' && github.event_name != 'pull_request_target'
+        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 an `issue_comment` action on a pull request.
+      # This is necessary to checkout the pull request if this run was triggered via a
+      # `pull_request_target` event.
       - uses: actions/checkout@v4
-        if: github.event_name == 'issue_comment' || github.event_name == 'pull_request_target'
+        if: github.event_name == 'pull_request_target'
         with:
-          ref: refs/pull/${{ github.event.issue.number || github.event.number }}/head
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 2
       - name: Run sccache-cache
-        uses: mozilla-actions/sccache-action@v0.0.3
-      - name: Install taplo
-        uses: baptiste0928/cargo-install@v2
-        with:
-          crate: taplo-cli
-          locked: true
+        uses: mozilla-actions/sccache-action@v0.0.4
+      - name: Install crown
+        run: cargo install --path support/crown
       - name: Bootstrap Python
         run: python3 -m pip install --upgrade pip virtualenv
       - name: Bootstrap dependencies
-        run: sudo apt update && python3 ./mach bootstrap
+        run: sudo apt update && python3 ./mach bootstrap --skip-lints
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -64,12 +69,23 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25c
+          ndk-version: r26c
+      - name: Setup Key Store for APK Signing
+        env:
+          KEYSTORE_BASE64: ${{ secrets.APK_KEYSTORE_BASE64 }}
+        if: ${{ env.KEYSTORE_BASE64 != '' }}
+        run: |
+          APK_SIGNING_KEY_STORE_PATH="${PWD}/servo_keystore.jks"
+          echo "${KEYSTORE_BASE64}" | base64 -d > "${APK_SIGNING_KEY_STORE_PATH}"
+          echo "APK_SIGNING_KEY_STORE_PATH=${APK_SIGNING_KEY_STORE_PATH}" >> ${GITHUB_ENV}
       - name: Build (arch ${{ matrix.arch }} profile ${{ inputs.profile }})
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+          APK_SIGNING_KEY_STORE_PASS: ${{ secrets.APK_SIGNING_KEY_STORE_PASS }}
+          APK_SIGNING_KEY_ALIAS: ${{ secrets.APK_SIGNING_KEY_ALIAS }}
+          APK_SIGNING_KEY_PASS: ${{ secrets.APK_SIGNING_KEY_PASS }}
         run: |
-          python3 ./mach build --android --target ${{ matrix.arch }} --${{ inputs.profile }}
+          python3 ./mach build --use-crown --locked --target ${{ matrix.arch }} --${{ inputs.profile }}
           cp -r target/cargo-timings target/cargo-timings-android-${{ matrix.arch }}
       # TODO: This is disabled since APK crashes during startup.
       # See https://github.com/servo/servo/issues/31134

.github/workflows/auto-merge-updates.yml

@@ -0,0 +1,18 @@
+name: Automerge Dependabot & WPT Updates
+on: pull_request
+
+permissions:
+  pull-requests: read
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'servo-wpt-sync' }}
+    steps:
+      - name: Approve the PR & enable auto-merge
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.SERVO_DEPENDABOT_TOKEN }}

.github/workflows/dco-merge-group.yml

@@ -0,0 +1,12 @@
+# Mostly copied from https://github.com/onnx/onnx/blob/main/.github/workflows/dco_merge_group.yml
+# Because of https://github.com/dcoapp/app/issues/199
+
+name: DCO
+on:
+  merge_group:
+
+jobs:
+  DCO:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue"

.github/workflows/dependabot-pr.yml

@@ -1,22 +0,0 @@
-name: Approve & merge successful dependabot patch upgrade PRs
-on: pull_request
-
-permissions:
-  pull-requests: read
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1
-      - name: Approve the PR & enable auto-merge
-        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
-        run: |
-          gh pr review --approve "$PR_URL"
-          gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.SERVO_DEPENDABOT_TOKEN}}

.github/workflows/dispatch-workflow.yml

@@ -8,7 +8,7 @@ on:
       profile:
         required: true
         type: string
-      wpt-tests-to-run:
+      wpt-args:
         required: true
         type: string
       wpt-layout:
@@ -37,7 +37,7 @@ jobs:
       profile: ${{ inputs.profile }}
       wpt-layout: ${{ inputs.wpt-layout }}
       unit-tests: ${{ inputs.unit-tests }}
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
 
   linux:
     if: ${{ inputs.workflow == 'linux' }}
@@ -48,7 +48,13 @@ jobs:
       profile: ${{ inputs.profile }}
       wpt-layout: ${{ inputs.wpt-layout }}
       unit-tests: ${{ inputs.unit-tests }}
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
+
+  lint:
+    if: ${{ inputs.workflow == 'lint' }}
+    name: Lint
+    uses: ./.github/workflows/lint.yml
+    secrets: inherit
 
   android:
     if: ${{ inputs.workflow == 'android' }}
@@ -57,3 +63,10 @@ jobs:
     secrets: inherit
     with:
       profile: ${{ inputs.profile }}
+
+  ohos:
+    if: ${{ inputs.workflow == 'ohos' }}
+    name: OpenHarmony
+    uses: ./.github/workflows/ohos.yml
+    with:
+      profile: ${{ inputs.profile }}

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           sudo apt update
-          python3 ./mach bootstrap
+          python3 ./mach bootstrap --skip-lints
       - 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

@@ -0,0 +1,59 @@
+name: Lint
+on:
+  workflow_call:
+  workflow_dispatch:
+
+env:
+  RUST_BACKTRACE: 1
+  SHELL: /bin/bash
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+  CCACHE: "sccache"
+  CARGO_INCREMENTAL: 0
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request_target'
+        with:
+          fetch-depth: 2 # This is necessary for `test-tidy`.
+      # This is necessary to checkout the pull request if this run was triggered via a
+      # `pull_request_target` event.
+      - uses: actions/checkout@v4
+        if: github.event_name == 'pull_request_target'
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 2 # This is necessary for `test-tidy`.
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.4
+      - name: Set LIBCLANG_PATH env # needed for bindgen in mozangle
+        run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install taplo
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: taplo-cli
+          locked: true
+      - name: Install cargo-deny
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-deny
+          locked: true
+      - name: Bootstrap Python
+        run: python3 -m pip install --upgrade pip
+      - name: Bootstrap dependencies
+        run: |
+          sudo apt update
+          python3 ./mach bootstrap
+      # TODO: Do GitHub anotaions
+      # TODO: Fail on warnings
+      - name: Clippy
+        run: |
+          python3 ./mach cargo-clippy --use-crown --locked
+      - name: Tidy
+        run: python3 ./mach test-tidy --no-progress --all

.github/workflows/linux-wpt.yml

@@ -5,7 +5,7 @@ on:
       profile:
         required: true
         type: string
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -55,7 +55,7 @@ jobs:
           python3 -m pip install --upgrade pip
           sudo apt update
           sudo apt install -qy --no-install-recommends mesa-vulkan-drivers
-          python3 ./mach bootstrap
+          python3 ./mach bootstrap --skip-lints
       - name: Sync from upstream WPT
         if: ${{ inputs.wpt-sync-from-upstream }}
         run: |
@@ -67,12 +67,13 @@ jobs:
           python3 ./mach test-wpt \
             $WPT_LAYOUT_ARG \
             $WPT_ALWAYS_SUCCEED_ARG \
-            ${{ inputs.wpt-tests-to-run }} \
             --${{ inputs.profile }} --processes $(nproc) --timeout-multiplier 2 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
-            --log-raw wpt-full-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
+            --log-raw wpt-full-logs/linux-${{ inputs.wpt-layout }}/raw/${{ matrix.chunk_id }}.log \
+            --log-wptreport wpt-full-logs/linux-${{ inputs.wpt-layout }}/wptreport/${{ matrix.chunk_id }}.json \
             --log-raw-unexpected wpt-filtered-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
-            --filter-intermittents wpt-filtered-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json
+            --filter-intermittents wpt-filtered-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json \
+            ${{ inputs.wpt-args }}
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
       - name: Archive results (filtered)
@@ -94,18 +95,19 @@ jobs:
     if: ${{ always() }}
     needs: linux-wpt
     steps:
-      - name: Merge logs (filtered)
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}
-          pattern: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}-*
-          delete-merged: true
       - name: Merge logs (full)
         uses: actions/upload-artifact/merge@v4
         with:
           name: wpt-full-logs-linux-${{ inputs.wpt-layout }}
           pattern: wpt-full-logs-linux-${{ inputs.wpt-layout }}-*
           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
+        with:
+          name: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}
+          pattern: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}-*
+          delete-merged: true
       - uses: actions/checkout@v4
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
       - uses: actions/download-artifact@v4

.github/workflows/linux.yml

@@ -6,7 +6,7 @@ on:
         required: false
         default: "release"
         type: string
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -35,7 +35,7 @@ on:
         default: "release"
         type: choice
         options: ["release", "debug", "production"]
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -59,54 +59,92 @@ on:
 env:
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
-  SCCACHE_GHA_ENABLED: "true"
-  CCACHE: "sccache"
-  CARGO_INCREMENTAL: 0
 
 jobs:
+  # 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:
+    uses: ./.github/workflows/self-hosted-runner-select.yml
+    secrets: inherit
+    with:
+      # Ubuntu 22.04 has glibc 2.34 so the binaries produced
+      # won't run on systems with older glibc e.g wpt.fyi
+      # runners which still use 20.04.
+      github-hosted-runner-label: ubuntu-${{ inputs.upload && '20.04' || '22.04' }}
+      self-hosted-image-name: servo-ubuntu2204
+      force-github-hosted-runner: ${{ inputs.upload }}
+  runner-timeout:
+    needs:
+      - runner-select
+    uses: ./.github/workflows/self-hosted-runner-timeout.yml
+    secrets: inherit
+    with:
+      selected-runner-label: ${{ needs.runner-select.outputs.selected-runner-label }}
+      is-self-hosted: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+
   build:
-    name: Linux Build
-    # Ubuntu 22.04 has glibc 2.34 so the binaries produced
-    # won't run on systems with older glibc e.g wpt.fyi
-    # runners which still use 20.04.
-    runs-on: ubuntu-${{ inputs.upload && '20.04' || '22.04' }}
+    needs:
+      - runner-select
+    name: Linux Build [${{ needs.runner-select.outputs.unique-id }}]
+    runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
     steps:
+      - if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        run: |
+          echo SCCACHE_GHA_ENABLED=true >> $GITHUB_ENV
+          echo RUSTC_WRAPPER=sccache >> $GITHUB_ENV
+          echo CCACHE=sccache >> $GITHUB_ENV
+          echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
-        if: github.event_name != 'pull_request_target'
-        with:
-          fetch-depth: 2 # This is necessary for `test-tidy`.
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name != 'pull_request_target' }}
       # This is necessary to checkout the pull request if this run was triggered via a
       # `pull_request_target` event.
       - uses: actions/checkout@v4
-        if: github.event_name == 'pull_request_target'
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name == 'pull_request_target' }}
         with:
-          ref: refs/pull/${{ github.event.number }}/head
-          fetch-depth: 2 # This is necessary for `test-tidy`.
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      # Faster checkout for self-hosted runner that uses prebaked repo.
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name != 'pull_request_target' }}
+        run: git fetch --depth=1 origin $GITHUB_SHA
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name == 'pull_request_target' }}
+        run: git fetch --depth=1 origin ${{ github.event.pull_request.head.sha }}
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        # Same as `git switch --detach FETCH_HEAD`, but fixes up dirty working
+        # trees, in case the runner image was baked with a dirty working tree.
+        run: |
+          git switch --detach
+          git reset --hard FETCH_HEAD
+
+      # Install missing tools in a GitHub-hosted runner.
       - name: Run sccache-cache
-        uses: mozilla-actions/sccache-action@v0.0.3
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        uses: mozilla-actions/sccache-action@v0.0.4
       - name: Set LIBCLANG_PATH env # needed for bindgen in mozangle
-        if: ${{ !inputs.upload  }} # not needed on ubuntu 20.04 used for nightly
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) && !inputs.upload }} # not needed on ubuntu 20.04 used for nightly
         run: echo "LIBCLANG_PATH=/usr/lib/llvm-14/lib" >> $GITHUB_ENV
       - uses: actions/setup-python@v5
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         with:
           python-version: '3.10'
-      - name: Install taplo
-        uses: baptiste0928/cargo-install@v2
-        with:
-          crate: taplo-cli
-          locked: true
-          cache-key: ${{ inputs.upload && '20.04' || '22.04' }}
       - name: Bootstrap Python
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         run: python3 -m pip install --upgrade pip
       - name: Bootstrap dependencies
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         run: |
           sudo apt update
-          python3 ./mach bootstrap
-      - name: Tidy
-        run: python3 ./mach test-tidy --no-progress --all
+          python3 ./mach bootstrap --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
+      # commit we are building uses a different rustc version.
+      - name: Install crown
+        run: cargo install --path support/crown
+
       - name: Build (${{ inputs.profile }})
         run: |
-          python3 ./mach build --${{ inputs.profile }}
+          python3 ./mach build --use-crown --locked --${{ inputs.profile }}
           cp -r target/cargo-timings target/cargo-timings-linux
       - name: Smoketest
         run: xvfb-run python3 ./mach smoketest --${{ inputs.profile  }}
@@ -114,7 +152,7 @@ jobs:
         run: ./mach test-scripts
       - name: Unit tests
         if: ${{ inputs.unit-tests }}
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 20
           max_attempts: 2 # https://github.com/servo/servo/issues/30683
@@ -125,8 +163,6 @@ jobs:
           name: cargo-timings-linux
           # Using a wildcard here ensures that the archive includes the path.
           path: target/cargo-timings-*
-      - name: Lockfile check
-        run: ./etc/ci/lockfile_changed.sh
       - name: Build mach package
         run: python3 ./mach package --${{ inputs.profile }}
       - name: Upload artifact for mach package
@@ -158,7 +194,7 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/linux-wpt.yml
     with:
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
       profile: ${{ inputs.profile }}
       wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }}
       wpt-layout: "layout-2020"
@@ -170,7 +206,7 @@ jobs:
     needs: ["build"]
     uses: ./.github/workflows/linux-wpt.yml
     with:
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
       profile: ${{ inputs.profile }}
       wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }}
       wpt-layout: "layout-2013"

.github/workflows/mac-wpt.yml

@@ -3,7 +3,7 @@ name: Mac WPT Tests
 on:
   workflow_call:
     inputs:
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -45,19 +45,20 @@ jobs:
         run: |
           gtar -xzf target.tar.gz
           python3 -m pip install --upgrade pip
-          python3 ./mach bootstrap
+          python3 ./mach bootstrap --skip-lints
       - name: Smoketest
         run: python3 ./mach smoketest --${{ inputs.profile }}
       - name: Run tests
         run: |
           mkdir -p wpt-filtered-logs/macos-${{ inputs.wpt-layout }}
           mkdir -p wpt-full-logs/macos-${{ inputs.wpt-layout }}
-          python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG ${{ inputs.wpt-tests-to-run }} \
+          python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG \
             --${{ inputs.profile }} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
             --log-raw wpt-full-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
             --log-raw-unexpected wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
             --filter-intermittents wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json
+            ${{ inputs.wpt-args }}
       - name: Archive results (filtered)
         uses: actions/upload-artifact@v4
         if: ${{ always() }}

.github/workflows/mac.yml

@@ -7,7 +7,7 @@ on:
         required: false
         default: "release"
         type: string
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -32,7 +32,7 @@ on:
         default: "release"
         type: choice
         options: ["release", "debug", "production"]
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -53,6 +53,7 @@ env:
   RUST_BACKTRACE: 1
   SHELL: /bin/bash
   SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
   CCACHE: "sccache"
   CARGO_INCREMENTAL: 0
 
@@ -75,25 +76,22 @@ jobs:
       - uses: actions/checkout@v4
         if: github.event_name == 'pull_request_target'
         with:
-          ref: refs/pull/${{ github.event.number }}/head
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Run sccache-cache
-        uses: mozilla-actions/sccache-action@v0.0.3
-      - name: Install taplo
-        uses: baptiste0928/cargo-install@v2
-        with:
-          crate: taplo-cli
-          locked: true
+        uses: mozilla-actions/sccache-action@v0.0.4
+      - name: Install crown
+        run: cargo install --path support/crown
       - name: Bootstrap
         run: |
           python3 -m pip install --upgrade pip
-          python3 ./mach bootstrap
+          python3 ./mach bootstrap --skip-lints
           brew install gnu-tar
       - name: Build (${{ inputs.profile }})
         run: |
-          python3 ./mach build --${{ inputs.profile }}
+          python3 ./mach build --use-crown --locked --${{ inputs.profile }}
           cp -r target/cargo-timings target/cargo-timings-macos
       - name: Smoketest
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with: # See https://github.com/servo/servo/issues/30757
           timeout_minutes: 5
           max_attempts: 2
@@ -102,7 +100,7 @@ jobs:
         run: ./mach test-scripts
       - name: Unit tests
         if: ${{ inputs.unit-tests }}
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 20 # https://github.com/servo/servo/issues/30275
           max_attempts: 3 # https://github.com/servo/servo/issues/30683
@@ -110,7 +108,7 @@ jobs:
       - name: Build mach package
         run: python3 ./mach package --${{ inputs.profile }}
       - name: Run DMG smoketest
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with: # See https://github.com/servo/servo/issues/30757
           timeout_minutes: 5
           max_attempts: 2
@@ -152,7 +150,7 @@ jobs:
     with:
       profile: ${{ inputs.profile }}
       wpt-layout: "layout-2020"
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
     secrets: inherit
 
   wpt-2013:
@@ -163,5 +161,5 @@ jobs:
     with:
       profile: ${{ inputs.profile }}
       wpt-layout: "layout-2013"
-      wpt-tests-to-run: ${{ inputs.wpt-tests-to-run }}
+      wpt-args: ${{ inputs.wpt-args }}
     secrets: inherit

.github/workflows/main.yml

@@ -35,7 +35,12 @@ jobs:
     uses: ./.github/workflows/linux.yml
     with:
       unit-tests: true
-      wpt-layout: ${{ github.event_name == 'pull_request' && 'none' || 'all' }}
+      wpt-layout: ${{ github.event_name == 'pull_request' && 'none' || '2020' }}
+    secrets: inherit
+
+  lint:
+    name: Lint
+    uses: ./.github/workflows/lint.yml
     secrets: inherit
 
   build-android:
@@ -46,6 +51,13 @@ jobs:
       profile: "release"
     secrets: inherit
 
+  build-ohos:
+    name: OpenHarmony
+    if: ${{ github.event_name != 'pull_request' }}
+    uses: ./.github/workflows/ohos.yml
+    with:
+      profile: "release"
+
   build-result:
     name: Result
     runs-on: ubuntu-latest
@@ -56,6 +68,8 @@ jobs:
       - "build-mac"
       - "build-linux"
       - "build-android"
+      - "build-ohos"
+      - "lint"
     steps:
       - name: Merge build timings
         uses: actions/upload-artifact/merge@v4

.github/workflows/nightly.yml

@@ -15,7 +15,7 @@ jobs:
     # 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-20.04
+    runs-on: ubuntu-latest
     steps:
       - id: create-release
         run: |
@@ -43,10 +43,10 @@ jobs:
     # 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-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Publish as latest (success)
-        if: success()
+        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
         run: |
           gh api \
             --method PATCH \
@@ -55,7 +55,7 @@ jobs:
             /repos/${NIGHTLY_REPO}/releases/${RELEASE_ID} \
             -F draft=false
       - name: Publish as latest (failure)
-        if: failure()
+        if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
         run: |
           gh api \
             --method PATCH \

.github/workflows/ohos.yml

@@ -0,0 +1,69 @@
+name: OpenHarmony
+on:
+  workflow_call:
+    inputs:
+      profile:
+        required: false
+        default: "release"
+        type: string
+  workflow_dispatch:
+    inputs:
+      profile:
+        required: false
+        default: "release"
+        type: choice
+        description: "Cargo build profile"
+        options: [ "release", "debug", "production"]
+
+env:
+  RUST_BACKTRACE: 1
+  SHELL: /bin/bash
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+  CCACHE: "sccache"
+  CARGO_INCREMENTAL: 0
+
+jobs:
+  build:
+    name: OpenHarmony Build
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        arch: ['aarch64-unknown-linux-ohos', 'x86_64-unknown-linux-ohos']
+    steps:
+      - uses: actions/checkout@v4
+        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@v4
+        if: github.event_name == 'pull_request_target'
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 2
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.4
+      - name: Install crown
+        run: cargo install --path support/crown
+      - name: Bootstrap Python
+        run: python3 -m pip install --upgrade pip virtualenv
+      - name: Bootstrap dependencies
+        run: sudo apt update && python3 ./mach bootstrap --skip-lints
+      - name: Setup OpenHarmony SDK
+        id: setup_sdk
+        uses: openharmony-rs/setup-ohos-sdk@v0.1
+        with:
+          version: "4.1"
+      - name: Build (arch ${{ matrix.arch }} profile ${{ inputs.profile }})
+        env:
+          OHOS_SDK_NATIVE: ${{ steps.setup_sdk.outputs.ohos_sdk_native }}
+        run: |
+          python3 ./mach build --locked --target ${{ matrix.arch }} --${{ inputs.profile }}
+          cp -r target/cargo-timings target/cargo-timings-ohos-${{ matrix.arch }}
+      - name: Archive build timing
+        uses: actions/upload-artifact@v4
+        with:
+          name: cargo-timings-ohos-${{ matrix.arch }}
+          # Using a wildcard here ensures that the archive includes the path.
+          path: target/cargo-timings-*

.github/workflows/pull-request-wpt-export.yml

@@ -2,6 +2,7 @@ name: WPT Export
 on:
   pull_request_target:
     types: ['opened', 'synchronize', 'reopened', 'edited', 'closed']
+    branches: ['main']
 
 jobs:
   upstream:

.github/workflows/quick-check.yml

@@ -1,16 +0,0 @@
-# This action is meant as a quick check to be run when pushing to
-# branches on forks. This allows forks to test the build and unit
-# tests automatically without opening a pull request.
-name: Quick check
-on:
-  push:
-    branches-ignore:
-      ["main", "auto", "try", "try-*", "dependabot/**"]
-
-jobs:
-  build-linux:
-    name: Linux
-    if: github.repository != 'servo/servo' || github.event_name == 'workflow_dispatch'
-    uses: ./.github/workflows/linux.yml
-    with:
-      unit-tests: true

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

@@ -42,7 +42,7 @@ jobs:
           python3 ./mach bootstrap
       - name: Add upstream remote
         run: |
-          git config --local user.email "josh+wptsync@joshmatthews.net"
+          git config --local user.email "ghbot+wpt-sync@servo.org"
           git config --local user.name "WPT Sync Bot"
           git remote add upstream https://github.com/servo/servo.git
           git fetch --unshallow upstream
@@ -54,10 +54,10 @@ jobs:
           export CURRENT_DATE=$(date +"%d-%m-%Y")
           echo $CURRENT_DATE
           echo "CURRENT_DATE=$CURRENT_DATE" >> $GITHUB_ENV
-          ./mach update-wpt linux-layout-2013/*.log --legacy-layout
-          ./mach update-wpt linux-layout-2020/*.log
+          ./mach update-wpt linux-layout-2013/raw/*.log --legacy-layout
+          ./mach update-wpt linux-layout-2020/raw/*.log
           git add tests/wpt/meta tests/wpt/meta-legacy-layout
-          git commit -a --amend --no-edit
+          git commit -a --amend -s --no-edit
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:

.github/workflows/self-hosted-runner-select.yml

@@ -0,0 +1,98 @@
+name: Select Self-hosted Runner
+on:
+  workflow_call:
+    inputs:
+      github-hosted-runner-label:
+        required: true
+        type: string
+      self-hosted-image-name:
+        required: true
+        type: string
+      self-hosted-runner-scope:
+        required: false
+        type: string
+        default: /orgs/${{ github.repository_owner }}/actions/runners
+      monitor-api-base-url:
+        required: false
+        type: string
+        default: https://ci0.servo.org
+      force-github-hosted-runner:
+        required: false
+        type: boolean
+        default: false
+    outputs:
+      unique-id:
+        value: ${{ jobs.runner-select.outputs.unique-id }}
+      selected-runner-label:
+        value: ${{ jobs.runner-select.outputs.selected-runner-label }}
+      is-self-hosted:
+        value: ${{ jobs.runner-select.outputs.is-self-hosted }}
+
+jobs:
+  # Selects a self-hosted runner if available, or else a GitHub-hosted runner.
+  # We generate a unique id for the workload, then ask our monitor API to
+  # reserve a self-hosted runner for us.
+  runner-select:
+    name: Select Runner
+    runs-on: ubuntu-latest
+    outputs:
+      unique-id: ${{ steps.select.outputs.unique_id }}
+      selected-runner-label: ${{ steps.select.outputs.selected_runner_label }}
+      is-self-hosted: ${{ steps.select.outputs.is_self_hosted }}
+    steps:
+      - name: Select and reserve best available runner
+        id: select
+        run: |
+          github_hosted_runner_label='${{ inputs.github-hosted-runner-label }}'
+          self_hosted_image_name='${{ inputs.self-hosted-image-name }}'
+          self_hosted_runner_scope='${{ inputs.self-hosted-runner-scope }}'
+          monitor_api_base_url='${{ inputs.monitor-api-base-url }}'
+
+          set -euo pipefail
+
+          fall_back_to_github_hosted() {
+            echo 'Falling back to GitHub-hosted runner'
+            echo "selected_runner_label=$github_hosted_runner_label" | tee -a $GITHUB_OUTPUT
+            echo 'is_self_hosted=false' | tee -a $GITHUB_OUTPUT
+            exit 0
+          }
+
+          # Generate a unique id that allows the workload job to find the runner
+          # we are reserving for it (via runner labels), and allows the timeout
+          # job to find the workload job run (via the job’s friendly name), even
+          # if there are multiple instances in the workflow call tree.
+          unique_id=$(uuidgen)
+          echo "unique_id=$unique_id" | tee -a $GITHUB_OUTPUT
+
+          # Disable self-hosted runners by creating a repository variable named
+          # NO_SELF_HOSTED_RUNNERS with any non-empty value.
+          # <https://github.com/servo/servo/settings/variables/actions>
+          if [ -n '${{ vars.NO_SELF_HOSTED_RUNNERS }}' ]; then
+            echo 'NO_SELF_HOSTED_RUNNERS is set!'
+            # fall_back_to_github_hosted
+          fi
+
+          if [ '${{ inputs.force-github-hosted-runner }}' = true ]; then
+            echo 'inputs.force-github-hosted-runner is set!'
+            fall_back_to_github_hosted
+          fi
+
+          # Use the monitor API to reserve a runner. If we get an object with
+          # runner details, we succeeded. If we get null, we failed.
+          take_runner_url=$monitor_api_base_url/$self_hosted_image_name/$unique_id/${{ github.repository }}/${{ github.run_id }}
+          result=$(mktemp)
+          echo
+          echo POST "$take_runner_url"
+          if ! curl -sS --fail-with-body --connect-timeout 5 --max-time 30 -X POST "$take_runner_url" \
+              -H 'Authorization: Bearer ${{ secrets.SERVO_CI_MONITOR_API_TOKEN }}' > $result \
+              || ! jq -e . $result > /dev/null; then
+            cat $result
+            echo
+            echo
+            echo 'No self-hosted runners available!'
+            fall_back_to_github_hosted
+          fi
+
+          echo
+          echo "selected_runner_label=reserved-for:$unique_id" | tee -a $GITHUB_OUTPUT
+          echo 'is_self_hosted=true' | tee -a $GITHUB_OUTPUT

.github/workflows/self-hosted-runner-timeout.yml

@@ -0,0 +1,39 @@
+name: Detect Self-hosted Runner Timeout
+on:
+  workflow_call:
+    inputs:
+      selected-runner-label:
+        required: true
+        type: string
+      is-self-hosted:
+        required: true
+        type: boolean
+
+jobs:
+  # In the unlikely event a self-hosted runner was selected and reserved but it
+  # goes down before the workload starts, cancel the workflow run.
+  runner-timeout:
+    if: ${{ inputs.is-self-hosted }}
+    name: Detect Runner Timeout
+    runs-on: ubuntu-latest
+    steps:
+      - name: Wait a bit
+        run: sleep 30
+
+      - name: Cancel if workload job is still queued
+        run: |
+          run_url=/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          export GH_TOKEN=${{ secrets.GITHUB_TOKEN }}
+
+          if [ "$(gh api "$run_url/jobs" \
+            | jq -er --arg id '${{ inputs.unique-id }}' \
+              '.jobs[] | select(.name | contains("[" + $id + "]")) | .status'
+          )" = queued ]; then
+            echo 'Timeout waiting for runner assignment!'
+            echo 'Hint: does this repo have permission to access the runner group?'
+            echo 'Hint: https://github.com/organizations/servo/settings/actions/runner-groups'
+            echo
+            echo 'Cancelling workflow run'
+            gh api "$run_url/cancel" --method POST
+            exit 1
+          fi

.github/workflows/try-label.yml

@@ -0,0 +1,180 @@
+name: Try (Label)
+
+on:
+  pull_request_target:
+    types: [labeled]
+
+jobs:
+  parse-comment:
+    name: Trigger Try
+    runs-on: ubuntu-latest
+    concurrency:
+      group: try-${{ github.event.number }}
+    outputs:
+      configuration: ${{ steps.configuration.outputs.config }}
+      try_string: ${{ steps.try_string.outputs.result }}
+    steps:
+      - name: Collect Labels
+        uses: actions/github-script@v7
+        id: try_string
+        with:
+          result-encoding: string
+          script: |
+            function makeComment(body) {
+                console.log(body);
+
+                github.rest.issues.createComment({
+                  issue_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body
+                })
+            }
+
+            let try_string = "";
+
+            for (let label of context.payload.pull_request.labels) {
+              if (!label.name.startsWith("T-")) {
+                continue;
+              }
+
+              // Try to remove the label. If that fails, it's likely that another
+              // workflow has already processed it or a user has removed it.
+              try {
+                await github.rest.issues.removeLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: context.issue.number,
+                  name: label.name,
+                });
+              } catch (exception) {
+                console.log("Assuming '" + label.name + "' is already removed: " + exception);
+                continue;
+              }
+
+              console.log("Found label: " + label.name);
+              // Remove the "T-" prefix.
+              label = label.name.slice(2);
+              try_string += " " + label;
+            }
+
+            console.log(try_string);
+
+            // Exit early if the try string is empty (no try triggered).
+            if (!try_string.trim()) {
+              return "";
+            }
+
+            let username = context.payload.sender.login;
+            let result = await github.rest.repos.getCollaboratorPermissionLevel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              username
+            });
+            if (!result.data.user.permissions.push) {
+              makeComment('🔒 User @' + username + ' does not have permission to trigger try jobs.');
+              return "";
+            }
+
+            return try_string;
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            python/servo/try_parser.py
+          sparse-checkout-cone-mode: false
+      - name: Parse Labels
+        if: ${{ steps.try_string.outputs.result }}
+        id: configuration
+        run: |
+          {
+            echo 'config<<EOF'
+            python ./python/servo/try_parser.py ${{ steps.try_string.outputs.result }}
+            echo EOF
+           } >> $GITHUB_OUTPUT
+      - name: Comment Run Start
+        if: ${{ steps.try_string.outputs.result }}
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            let config = ${{ steps.configuration.outputs.config }};
+            function makeComment(body) {
+                console.log(body);
+
+                github.rest.issues.createComment({
+                  issue_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body
+                })
+            }
+
+            const url = context.serverUrl +
+              "/" + context.repo.owner +
+              "/" + context.repo.repo +
+              "/actions/runs/" + context.runId;
+            const formattedURL = "[#" + context.runId + "](" + url + ")";
+            makeComment("🔨 Triggering try run (" + formattedURL + ") for "
+             + config.matrix.map(m => m.name).join(", "));
+
+  run-try:
+    if: ${{ needs.parse-comment.outputs.try_string }}
+    needs: ["parse-comment"]
+    name: ${{ matrix.name }}
+    strategy:
+      fail-fast: ${{ fromJson(needs.parse-comment.outputs.configuration).fail_fast }}
+      matrix:
+        include: ${{ fromJson(needs.parse-comment.outputs.configuration).matrix }}
+    # We need to use `dipatch-workflow.yml` because workflows do not support using: ${}.
+    uses: ./.github/workflows/dispatch-workflow.yml
+    secrets: inherit
+    with:
+      workflow: ${{ matrix.workflow }}
+      wpt-layout: ${{ matrix.wpt_layout }}
+      profile: ${{ matrix.profile }}
+      unit-tests: ${{ matrix.unit_tests }}
+      wpt-args: ${{ matrix.wpt_args }}
+
+  results:
+    name: Results
+    needs: ["parse-comment", "run-try"]
+    runs-on: ubuntu-latest
+    if: ${{ always() && needs.parse-comment.outputs.try_string }}
+    steps:
+      - name: Success
+        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+              const url = context.serverUrl +
+                "/" + context.repo.owner +
+                "/" + context.repo.repo +
+                "/actions/runs/" + context.runId;
+              const formattedURL = "[#" + context.runId + "](" + url + ")";
+              github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: "✨ Try run (" + formattedURL + ") " + "succeeded.",
+              });
+      - name: Failure
+        if: ${{ contains(needs.*.result, 'failure') }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+              const url = context.serverUrl +
+                "/" + context.repo.owner +
+                "/" + context.repo.repo +
+                "/actions/runs/" + context.runId;
+              const formattedURL = "[#" + context.runId + "](" + url + ")";
+              github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: "⚠️ Try run (" + formattedURL + ") " + "failed.",
+              });
+
+

.github/workflows/try.yml

@@ -10,7 +10,7 @@ on:
         default: "release"
         type: choice
         options: ["release", "debug", "production"]
-      wpt-tests-to-run:
+      wpt-args:
         default: ""
         required: false
         type: string
@@ -48,7 +48,7 @@ jobs:
            } >> $GITHUB_OUTPUT
       - name: Configuration
         id: configuration
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             // When triggered via a push try the `try` branch, search the last commit for a configuration object.
@@ -75,7 +75,7 @@ jobs:
             if (context.eventName == "workflow_dispatch") {
               // WPT-related overrides only affect Linux currently, as tests don't run by default on other platforms.
               configuration.matrix[0].wpt_layout = "${{ inputs.wpt-layout }}" || "none";
-              configuration.matrix[0].wpt_tests_to_run = "${{ inputs.wpt-tests-to-run }}" || "";
+              configuration.matrix[0].wpt_args = "${{ inputs.wpt-args }}" || "";
 
               let unit_tests = Boolean(${{ inputs.unit-tests }});
               let profile = '${{ inputs.profile }}';
@@ -103,7 +103,7 @@ jobs:
       wpt-layout: ${{ matrix.wpt_layout }}
       profile: ${{ matrix.profile }}
       unit-tests: ${{ matrix.unit_tests }}
-      wpt-tests-to-run: ${{ matrix.wpt_tests_to_run }}
+      wpt-args: ${{ matrix.wpt_args }}
 
   build-result:
     name: Result
@@ -113,6 +113,7 @@ jobs:
     needs: [ "decision", "build" ]
     steps:
       - name: Merge build timings
+        continue-on-error: true
         uses: actions/upload-artifact/merge@v4
         with:
           name: cargo-timings

.github/workflows/try_labels.yml

@@ -1,183 +0,0 @@
-name: Try (Label)
-
-on:
-  pull_request_target:
-    types: [labeled]
-
-jobs:
-  parse-comment:
-    name: Trigger Try
-    runs-on: ubuntu-latest
-    concurrency:
-      group: try-${{ github.event.number }}
-    outputs:
-      configuration: ${{ steps.configuration.outputs.config }}
-      try_string: ${{ steps.try_string.outputs.result }}
-    steps:
-      - name: Collect Labels
-        uses: actions/github-script@v6
-        id: try_string
-        with:
-          result-encoding: string
-          script: |
-            function makeComment(body) {
-                console.log(body);
-
-                github.rest.issues.createComment({
-                  issue_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  body
-                })
-            }
-
-            let try_string = "";
-
-            for (let label of context.payload.pull_request.labels) {
-              if (!label.name.startsWith("T-")) {
-                continue;
-              }
-
-              // Try to remove the label. If that fails, it's likely that another
-              // workflow has already processed it or a user has removed it.
-              try {
-                await github.rest.issues.removeLabel({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: context.issue.number,
-                  name: label.name,
-                });
-              } catch (exception) {
-                console.log("Assuming '" + label.name + "' is already removed: " + exception);
-                continue;
-              }
-
-              console.log("Found label: " + label.name);
-              // Remove the "T-" prefix.
-              label = label.name.slice(2);
-              try_string += " " + label;
-            }
-
-            console.log(try_string);
-
-            // Exit early if the try string is empty (no try triggered).
-            if (!try_string.trim()) {
-              return "";
-            }
-
-            let username = context.payload.sender.login;
-            let result = await github.rest.repos.getCollaboratorPermissionLevel({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              username
-            });
-            if (!result.data.user.permissions.push) {
-              makeComment('🔒 User @' + username + ' does not have permission to trigger try jobs.');
-              return "";
-            }
-
-            return try_string;
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - uses: actions/checkout@v4
-        with:
-          # This is necessary to checkout the pull request if this run was triggered
-          # via an `label` action on a pull request.
-          ref: refs/pull/${{ github.event.number }}/head
-          sparse-checkout: |
-            python/servo/try_parser.py
-          sparse-checkout-cone-mode: false
-      - name: Parse Labels
-        if: ${{ steps.try_string.outputs.result }}
-        id: configuration
-        run: |
-          {
-            echo 'config<<EOF'
-            python ./python/servo/try_parser.py ${{ steps.try_string.outputs.result }}
-            echo EOF
-           } >> $GITHUB_OUTPUT
-      - name: Comment Run Start
-        if: ${{ steps.try_string.outputs.result }}
-        uses: actions/github-script@v6
-        with:
-          result-encoding: string
-          script: |
-            let config = ${{ steps.configuration.outputs.config }};
-            function makeComment(body) {
-                console.log(body);
-
-                github.rest.issues.createComment({
-                  issue_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  body
-                })
-            }
-
-            const url = context.serverUrl +
-              "/" + context.repo.owner +
-              "/" + context.repo.repo +
-              "/actions/runs/" + context.runId;
-            const formattedURL = "[#" + context.runId + "](" + url + ")";
-            makeComment("🔨 Triggering try run (" + formattedURL + ") for "
-             + config.matrix.map(m => m.name).join(", "));
-
-  run-try:
-    if: ${{ needs.parse-comment.outputs.try_string }}
-    needs: ["parse-comment"]
-    name: ${{ matrix.name }}
-    strategy:
-      fail-fast: ${{ fromJson(needs.parse-comment.outputs.configuration).fail_fast }}
-      matrix:
-        include: ${{ fromJson(needs.parse-comment.outputs.configuration).matrix }}
-    # We need to use `dipatch-workflow.yml` because workflows do not support using: ${}.
-    uses: ./.github/workflows/dispatch-workflow.yml
-    secrets: inherit
-    with:
-      workflow: ${{ matrix.workflow }}
-      wpt-layout: ${{ matrix.wpt_layout }}
-      profile: ${{ matrix.profile }}
-      unit-tests: ${{ matrix.unit_tests }}
-      wpt-tests-to-run: ${{ matrix.wpt_tests_to_run }}
-
-  results:
-    name: Results
-    needs: ["parse-comment", "run-try"]
-    runs-on: ubuntu-latest
-    if: ${{ always() && needs.parse-comment.outputs.try_string }}
-    steps:
-      - name: Success
-        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
-        uses: actions/github-script@v6
-        with:
-          script: |
-              const url = context.serverUrl +
-                "/" + context.repo.owner +
-                "/" + context.repo.repo +
-                "/actions/runs/" + context.runId;
-              const formattedURL = "[#" + context.runId + "](" + url + ")";
-              github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: "✨ Try run (" + formattedURL + ") " + "succeeded.",
-              });
-      - name: Failure
-        if: ${{ contains(needs.*.result, 'failure') }}
-        uses: actions/github-script@v6
-        with:
-          script: |
-              const url = context.serverUrl +
-                "/" + context.repo.owner +
-                "/" + context.repo.repo +
-                "/actions/runs/" + context.runId;
-              const formattedURL = "[#" + context.runId + "](" + url + ")";
-              github.rest.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: "⚠️ Try run (" + formattedURL + ") " + "failed.",
-              });
-
-

.github/workflows/windows.yml

@@ -42,53 +42,111 @@ env:
   # clang_sys will search msys path before Program Files\LLVM
   # so we need to override this behaviour until we update clang-sys
   # https://github.com/KyleMayes/clang-sys/issues/150
-  LIBCLANG_PATH: C:\\Program Files\\LLVM\\bin
+  LIBCLANG_PATH: C:\Program Files\LLVM\bin
+  RUSTUP_WINDOWS_PATH_ADD_BIN: 1
 
 jobs:
+  # 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:
+    uses: ./.github/workflows/self-hosted-runner-select.yml
+    secrets: inherit
+    with:
+      github-hosted-runner-label: windows-2022
+      self-hosted-image-name: servo-windows10
+  runner-timeout:
+    needs:
+      - runner-select
+    uses: ./.github/workflows/self-hosted-runner-timeout.yml
+    secrets: inherit
+    with:
+      selected-runner-label: ${{ needs.runner-select.outputs.selected-runner-label }}
+      is-self-hosted: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+
   build:
-    name: Windows Build
-    runs-on: windows-2022
+    needs:
+      - runner-select
+    name: Windows Build [${{ needs.runner-select.outputs.unique-id }}]
+    runs-on: ${{ needs.runner-select.outputs.selected-runner-label }}
     steps:
-      - uses: actions/checkout@v4
-        if: github.event_name != 'pull_request_target'
-      # This is necessary to checkout the pull request if this run was triggered via a
-      # `pull_request_target` event.
-      - uses: actions/checkout@v4
-        if: github.event_name == 'pull_request_target'
+      - if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name != 'pull_request_target' }}
+        uses: actions/checkout@v4
+      - if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name == 'pull_request_target' }}
+        uses: actions/checkout@v4
         with:
-          ref: refs/pull/${{ github.event.number }}/head
-          fetch-depth: 2
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 1
+
+      # Faster checkout for self-hosted runner that uses prebaked repo.
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name != 'pull_request_target' }}
+        run: git fetch --depth=1 origin $env:GITHUB_SHA
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) && github.event_name == 'pull_request_target' }}
+        run: git fetch --depth=1 origin ${{ github.event.pull_request.head.sha }}
+      - if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        # Same as `git switch --detach FETCH_HEAD`, but fixes up dirty working
+        # trees, in case the runner image was baked with a dirty working tree.
+        run: |
+          git switch --detach
+          git reset --hard FETCH_HEAD
+
       - name: ccache
+        # FIXME: “Error: Restoring cache failed: Error: Unable to locate executable file: sh.”
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         uses: hendrikmuhs/ccache-action@v1.2
-      - name: Install taplo
-        uses: baptiste0928/cargo-install@v2
-        with:
-          crate: taplo-cli
-          locked: true
+
+      # Install missing tools in a GitHub-hosted runner.
+      # Workaround for https://github.com/actions/runner-images/issues/10001:
+      - name: Upgrade llvm
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        run: choco upgrade llvm
       - name: Install wixtoolset
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         run: |
           choco install wixtoolset
           echo "C:\\Program Files (x86)\\WiX Toolset v3.11\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - uses: actions/setup-python@v5
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         with:
-          python-version: '3.10'
+          python-version: "3.10"
       - name: Bootstrap
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
         run: |
           python -m pip install --upgrade pip
           python mach fetch
           python mach bootstrap-gstreamer
-          cargo install --path support/crown
+      # For some reason WiX isn't currently on the GitHub runner path. This is a
+      # temporary workaround until that is fixed.
+      - name: Add WiX to Path
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        run: |
+          "$env:WIX\bin" >> $env:GITHUB_PATH
+
+      # 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
+      # commit we are building uses a different rustc version.
+      - name: Install crown
+        run: cargo install --path support/crown --force
+
+      - name: Debug logging for incremental builds
+        if: ${{ fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        run: |
+          cat C:\init\incremental_build_debug.txt
+          echo "`$env:LIBCLANG_PATH now = $env:LIBCLANG_PATH"
+          echo "`$env:PATH now = $env:PATH"
+
       - name: Build (${{ inputs.profile }})
         run: |
-          python mach build --${{ inputs.profile }}
+          python mach build --use-crown --locked --${{ inputs.profile }}
           cp C:\a\servo\servo\target\cargo-timings C:\a\servo\servo\target\cargo-timings-windows -Recurse
       - name: Copy resources
+        if: ${{ ! fromJSON(needs.runner-select.outputs.is-self-hosted) }}
+        # GitHub-hosted runners check out the repo on D: drive.
         run: cp D:\a\servo\servo\resources C:\a\servo\servo -Recurse
       - name: Smoketest
-        run: python mach smoketest --angle --${{ inputs.profile }}
+        run: python mach smoketest --${{ inputs.profile }}
       - name: Unit tests
         if: ${{ inputs.unit-tests }}
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 30
           max_attempts: 3 # https://github.com/servo/servo/issues/30683

.gitignore

@@ -8,14 +8,11 @@
 /android-toolchains
 /target
 /tests/wpt/reftests-report/report.html
-/ports/android/bin
-/ports/android/libs
-/ports/android/local.properties
-/ports/android/obj
 /python/_virtualenv*
 /python/_venv*
 /python/tidy/servo_tidy.egg-info
 /tests/wpt/sync
+/tests/dromaeo/dromaeo
 *.pkl
 *.pyc
 *.swp
@@ -26,9 +23,10 @@
 .coverage
 .DS_Store
 Servo.app
+servo.pftrace
 .config.mk.last
 /glfw
-capture_webrender/
+webrender-captures/
 /screenshots
 
 # Allow CSV files to be used as resources in tests

CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Code of Conduct
+
+The Servo Project follows the [**Rust Code of Conduct**](https://www.rust-lang.org/policies/code-of-conduct), with the differences below.
+
+Our code of conduct applies to the [Servo Zulip channels](https://servo.zulipchat.com/), [GitHub repositories](https://github.com/servo), and all official Servo venues, rather than the Rust project.
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify one of our designated contacts:
+* Delan Azabani (she/her) <dazabani@igalia.com>
+* Martin Robinson (he/him) <mrobinson@igalia.com>
+* Manuel Rego Casasnovas (he/him) <rego@igalia.com>
+
+*Note: If you modify this file, please keep this file in sync with <https://servo.org/coc/>.*
+

CONTRIBUTING.md

@@ -1,78 +1,5 @@
 # Contributing to Servo
 
-Servo welcomes contribution from everyone. Here are the guidelines if you are
-thinking of helping us:
-
-
-## Contributions
-
-Contributions to Servo or its dependencies should be made in the form of GitHub
-pull requests. Each pull request will be reviewed by a core contributor
-(someone with permission to land patches) and either landed in the main tree or
-given feedback for changes that would be required. All contributions should
-follow this format, even those from core contributors.
-
-Should you wish to work on an issue, please claim it first by commenting on
-the GitHub issue that you want to work on it. This is to prevent duplicated
-efforts from contributors on the same issue.
-
-Head over to [Servo Starters](https://starters.servo.org/) to find
-good tasks to start with. If you come across words or jargon that do not make
-sense, please check [the glossary](docs/glossary.md) first. If there's no
-matching entry, please make a pull request to add one with the content `TODO`
-so we can correct that!
-
-See [`HACKING_QUICKSTART.md`](docs/HACKING_QUICKSTART.md) for more information
-on how to start working on Servo.
-
-## Pull request checklist
-
-- Branch from the main branch and, if needed, rebase to the current main branch
-  before submitting your pull request. If it doesn't merge cleanly with main
-  you may be asked to rebase your changes.
-
-- Commits should be as small as possible, while ensuring that each commit is
-  correct independently (i.e., each commit should compile and pass tests). 
-
-- Commits should be accompanied by a Developer Certificate of Origin
-  (http://developercertificate.org) sign-off, which indicates that you (and
-  your employer if applicable) agree to be bound by the terms of the
-  [project license](LICENSE). In git, this is the `-s` option to `git commit`.
-
-- If your patch is not getting reviewed or you need a specific person to review
-  it, you can @-reply a reviewer asking for a review in the pull request or a
-  comment, or you can ask for a review in [the Servo chat](https://servo.zulipchat.com/).
-
-- Add tests relevant to the fixed bug or new feature.  For a DOM change this
-  will usually be a web platform test; for layout, a reftest.  See our [testing
-  guide](https://github.com/servo/servo/wiki/Testing) for more information.
-
-For specific git instructions, see [GitHub workflow 101](https://github.com/servo/servo/wiki/Github-workflow).
-
-## Running tests in pull requests
-
-When you push to a pull request, GitHub automatically checks that your changes have no compilation, lint, or tidy errors.
-
-To run unit tests or Web Platform Tests against a pull request, add one or more of the labels below to your pull request. If you do not have permission to add labels to your pull request, add a comment on your bug requesting that they be added.
-
-| Label | Effect |
-|---|---|
-| `T-full` | Unit tests: Linux, macOS, Windows<br>Layout tests: Linux, macOS<br>Legacy layout tests: Linux, macOS |
-| `T-linux-wpt-2013` | Unit tests: Linux<br>Legacy layout tests: Linux |
-| `T-linux-wpt-2020` | Unit tests: Linux<br>Layout tests: Linux |
-| `T-macos` | Unit tests: macOS |
-| `T-windows` | Unit tests: Windows |
-
-## Conduct
-
-Servo Code of Conduct is published at <https://servo.org/coc/>.
-
-## Communication
-
-Servo contributors frequent the [Servo Zulip chat](https://servo.zulipchat.com/).
-
-## Technical Steering Committee
-
-Technical oversight of the Servo Project is provided by the
-[Technical Steering Committee](https://github.com/servo/project/blob/main/governance/tsc/README.md).
+Moved to the Servo book:
 
+- [Contributing to Servo](https://book.servo.org/contributing.html)

Cargo.toml

@@ -2,77 +2,88 @@
 resolver = "2"
 members = [
     "ports/servoshell",
-    "ports/jniapi/",
     "tests/unit/*",
     "support/crown",
 ]
 default-members = ["ports/servoshell"]
 exclude = [".cargo"]
 
+[workspace.package]
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+edition = "2021"
+publish = false
+
 [workspace.dependencies]
 accountable-refcell = "0.2.0"
 app_units = "0.7"
 arrayvec = "0.7"
 async-tungstenite = { version = "0.23", features = ["tokio-rustls-webpki-roots"] }
 atomic_refcell = "0.1.13"
+background_hang_monitor_api = { path = "components/shared/background_hang_monitor" }
 backtrace = "0.3"
+base = { path = "components/shared/base" }
 base64 = "0.21.7"
-bitflags = "2.4"
+bincode = "1"
+bitflags = "2.6"
 bluetooth_traits = { path = "components/shared/bluetooth" }
 byteorder = "1.5"
 canvas_traits = { path = "components/shared/canvas" }
 cfg-if = "1.0.0"
+chrono = { version = "0.4", features = ["serde"] }
 compositing_traits = { path = "components/shared/compositing" }
 content-security-policy = { version = "0.5", features = ["serde"] }
-cookie = "0.12"
+cookie = { package = "cookie", version = "0.18" }
 crossbeam-channel = "0.5"
-cssparser = "0.31.2"
+cssparser = { version = "0.34", features = ["serde"] }
 darling = { version = "0.20", default-features = false }
-data-url = "0.1.0"
+data-url = "0.3"
 devtools_traits = { path = "components/shared/devtools" }
 embedder_traits = { path = "components/shared/embedder" }
 encoding_rs = "0.8"
 env_logger = "0.10"
 euclid = "0.22"
 fnv = "1.0"
+freetype-sys = "0.20"
 fxhash = "0.2"
 getopts = "0.2.11"
-gfx_traits = { path = "components/shared/gfx" }
+fonts_traits = { path = "components/shared/fonts" }
 gleam = "0.15"
-glib = "0.18"
-gstreamer = { version = "0.21", features = ["v1_18"] }
-gstreamer-base = "0.21"
-gstreamer-gl = "0.21"
-gstreamer-gl-sys = { version = "0.21" }
-gstreamer-gl-wayland = { version = "0.21" }
-gstreamer-sys = "0.21"
-gstreamer-video = "0.21"
+glib = "0.19"
+gstreamer = { version = "0.22", features = ["v1_18"] }
+gstreamer-base = "0.22"
+gstreamer-gl = "0.22"
+gstreamer-gl-sys = "0.22"
+gstreamer-sys = "0.22"
+gstreamer-video = "0.22"
 headers = "0.3"
-html5ever = "0.26"
+html5ever = "0.28"
 http = "0.2"
 hyper = "0.14"
 hyper-rustls = { version = "0.24", default-features = false, features = ["acceptor", "http1", "http2", "logging", "tls12", "webpki-tokio"] }
 hyper_serde = { path = "components/hyper_serde" }
+icu_segmenter = "1.5.0"
 image = "0.24"
 imsz = "0.2"
-indexmap = { version = "2.2.3", features = ["std"] }
+indexmap = { version = "2.5.0", features = ["std"] }
 ipc-channel = "0.18"
-itertools = "0.12"
-jemallocator = "0.5.4"
-jemalloc-sys = "0.5.4"
-keyboard-types = "0.6"
-layout_traits = { path = "components/shared/layout" }
-lazy_static = "1.4"
+itertools = "0.13"
+tikv-jemalloc-sys = "0.6.0"
+tikv-jemallocator = "0.6.0"
+keyboard-types = "0.7"
 libc = "0.2"
 log = "0.4"
+mach2 = "0.4"
+malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2024-07-16", features = ["servo"] }
 malloc_size_of_derive = "0.1"
 mime = "0.3.13"
-mime_guess = "2.0.3"
+mime_guess = "2.0.5"
 mozangle = "0.5.1"
-msg = { path = "components/shared/msg" }
 net_traits = { path = "components/shared/net" }
-num_cpus = "1.1.0"
+nix = "0.29"
 num-traits = "0.2"
+num_cpus = "1.1.0"
 parking_lot = "0.12"
 percent-encoding = "2.3"
 proc-macro2 = "1"
@@ -83,43 +94,59 @@ rand_core = "0.6"
 rand_isaac = "0.3"
 rayon = "1"
 regex = "1.10"
-rustls = { version = "0.21.10", features = ["dangerous_configuration"] }
+rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
 rustls-pemfile = "1.0.4"
 script_layout_interface = { path = "components/shared/script_layout" }
 script_traits = { path = "components/shared/script" }
-serde = "1.0.197"
+selectors = { git = "https://github.com/servo/stylo", branch = "2024-07-16" }
+serde = "1.0.209"
 serde_bytes = "0.11"
 serde_json = "1.0"
-smallbitvec = "2.3.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_arc = { git = "https://github.com/servo/stylo", branch = "2024-07-16", features = ["servo"] }
+servo_atoms = { git = "https://github.com/servo/stylo", branch = "2024-07-16" }
+size_of_test = { git = "https://github.com/servo/stylo", branch = "2024-07-16" }
+smallbitvec = "2.5.3"
 smallvec = "1.13"
 sparkle = "0.1.26"
 string_cache = "0.8"
 string_cache_codegen = "0.5"
-style_traits = { path = "components/style_traits", features = ["servo"] }
-# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
-surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] }
+style = { git = "https://github.com/servo/stylo", branch = "2024-07-16", features = ["servo"] }
+style_config = { git = "https://github.com/servo/stylo", branch = "2024-07-16" }
+style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2024-07-16" }
+style_traits = { git = "https://github.com/servo/stylo", branch = "2024-07-16", features = ["servo"] }
+surfman = { version = "0.9.8", features = ["chains"] }
 syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
 synstructure = "0.13"
 thin-vec = "0.2.13"
 time = "0.1.41"
+time_03 = { package = "time", version = "0.3", features = ["large-dates", "serde"] }
+to_shmem = { git = "https://github.com/servo/stylo", branch = "2024-07-16" }
 tokio = "1"
 tokio-rustls = "0.24"
 tungstenite = "0.20"
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+tracing-perfetto = "0.1.1"
+uluru = "3.0"
 unicode-bidi = "0.3.15"
+unicode-properties = { version = "0.1.2", features = ["emoji"] }
 unicode-script = "0.5"
+unicode-segmentation = "1.1.0"
 url = "2.5"
-uuid = { version = "1.7.0", features = ["v4"] }
+uuid = { version = "1.10.0", features = ["v4"] }
 webdriver = "0.49.0"
-webpki = "0.22"
 webpki-roots = "0.25"
-webrender = { git = "https://github.com/servo/webrender", rev = "f91b68a61", features = ["capture"] }
-webrender_api = { git = "https://github.com/servo/webrender", rev = "f91b68a61" }
+webrender = { git = "https://github.com/servo/webrender", branch = "0.65", features = ["capture"] }
+webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" }
 webrender_traits = { path = "components/shared/webrender" }
-wgpu-core = "0.18"
-wgpu-types = "0.18"
-winapi = "0.3"
-xi-unicode = "0.1.0"
-xml5ever = "0.17"
+wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "0e352f5b3448236b6cbebcd146d0606b00cb3806" }
+wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "0e352f5b3448236b6cbebcd146d0606b00cb3806" }
+windows-sys = "0.59"
+xi-unicode = "0.3.0"
+xml5ever = "0.19"
 
 [profile.release]
 opt-level = 3
@@ -131,6 +158,12 @@ debug-assertions = true
 [profile.production]
 inherits = "release"
 debug-assertions = false
+lto = "thin"
+codegen-units = 1
+
+[profile.production-stripped]
+inherits = "production"
+strip = true
 
 [patch.crates-io]
 # If you need to temporarily test Servo with a local fork of some upstream
@@ -138,7 +171,30 @@ debug-assertions = false
 #
 #     <crate> = { path = "/path/to/local/checkout" }
 #
-# Or for a git dependency:
+# Or for Stylo:
 #
-#     [patch."https://github.com/servo/<repository>"]
-#     <crate> = { path = "/path/to/local/checkout" }
+# [patch."https://github.com/servo/stylo"]
+# derive_common = { path = "../stylo/derive_common" }
+# dom = { path = "../stylo/dom" }
+# malloc_size_of = { path = "../stylo/malloc_size_of" }
+# selectors = { path = "../stylo/selectors" }
+# servo_arc = { path = "../stylo/servo_arc" }
+# servo_atoms = { path = "../stylo/atoms" }
+# size_of_test = { path = "../stylo/size_of_test" }
+# static_prefs = { path = "../stylo/style_static_prefs" }
+# style = { path = "../stylo/style" }
+# style_config = { path = "../stylo/style_config" }
+# style_derive = { path = "../stylo/style_derive" }
+# style_traits = { path = "../stylo/style_traits" }
+# to_shmem = { path = "../stylo/to_shmem" }
+#
+# Or for WebRender:
+#
+# [patch."https://github.com/servo/webrender"]
+# webrender = { path = "../webrender/webrender" }
+# webrender_api = { path = "../webrender/webrender_api" }
+#
+# Or for another Git dependency:
+#
+# [patch."https://github.com/servo/<repository>"]
+# <crate> = { path = "/path/to/local/checkout" }

README.md

@@ -4,205 +4,63 @@ Servo is a prototype web browser engine written in the
 [Rust](https://github.com/rust-lang/rust) language. It is currently developed on
 64-bit macOS, 64-bit Linux, 64-bit Windows, and Android.
 
-Servo welcomes contribution from everyone.  See
-[`CONTRIBUTING.md`](CONTRIBUTING.md) and [`HACKING_QUICKSTART.md`](docs/HACKING_QUICKSTART.md)
-for help getting started.
+Servo welcomes contribution from everyone. Check out [The Servo Book](https://book.servo.org) to get started, or go to [servo.org](https://servo.org/) for news and guides.
 
-Visit the [Servo Project page](https://servo.org/) for news and guides.
+## Getting started
 
-## Build Setup
-
-* [macOS](#macos)
-* [Linux](#Linux)
-* [Windows](#windows)
-* [Android](https://github.com/servo/servo/wiki/Building-for-Android)
-
-If these instructions fail or you would like to install dependencies
-manually, try the [manual build setup][manual-build].
+For more detailed build instructions, see the Servo book under [Setting up your environment](https://book.servo.org/hacking/setting-up-your-environment.html), [Building Servo](https://book.servo.org/hacking/building-servo.html), and [Building for Android](https://book.servo.org/hacking/building-for-android.html).
 
 ### macOS
 
-- Ensure that the version showed by `python --version` is >= 3.10:
-- Install [Xcode](https://developer.apple.com/xcode/)
-- Install [Homebrew](https://brew.sh/)
-- Run `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
-- Run `./mach bootstrap`<br/>
-  *Note: This will install the recommended version of GStreamer globally on your system.*
+- Download and install [`python`](https://www.python.org/downloads/macos/), [Xcode](https://developer.apple.com/xcode/), and [`brew`](https://brew.sh/)
+- Install `rustup`: `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
+- Restart your shell to make sure `cargo` is available
+- Install the other dependencies: `./mach bootstrap`
+- Build servoshell: `./mach build`
 
 ### Linux
 
-- Run `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
-- Install Python (version >= 3.10):
-    - **Debian-like:** Run `sudo apt install python3-pip python3-venv`
-    - **Fedora:** Run `sudo dnf install python3 python3-pip python3-devel`
-    - **Arch:** Run `sudo pacman -S --needed python python-pip`
-    - **Gentoo:** Run `sudo emerge dev-python/pip`
-- Run `./mach bootstrap`
+- Install `curl` and `python`:
+  - Arch: `sudo pacman -S --needed curl python python-pip`
+  - Debian, Ubuntu: `sudo apt install curl python3-pip python3-venv`
+  - Fedora: `sudo dnf install curl python3 python3-pip python3-devel`
+  - Gentoo: `sudo emerge net-misc/curl dev-python/pip`
+- Install `rustup`: `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
+- Restart your shell to make sure `cargo` is available
+- Install the other dependencies: `./mach bootstrap`
+- Build servoshell: `./mach build`
 
 ### Windows
 
- - Download and run [`rustup-init.exe`](https://win.rustup.rs/)
-  - Make sure to select *Quick install via the Visual Studio Community
-    installer* or otherwise install Visual Studio 2022.
- - In the *Visual Studio Installer* ensure the following components are installed for Visual Studio 2022:
-    - **Windows 10 SDK (10.0.19041.0)** (`Microsoft.VisualStudio.Component.Windows10SDK.19041`)
-    - **MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest)** (`Microsoft.VisualStudio.Component.VC.Tools.x86.x64`)
-    - **C++ ATL for latest v143 build tools (x86 & x64)** (`Microsoft.VisualStudio.Component.VC.ATL`)
-    - **C++ MFC for latest v143 build tools (x86 & x64)** (`Microsoft.VisualStudio.Component.VC.ATLMFC`)
- - Install [chocolatey](https://chocolatey.org/)
- - Install [Python 3.11](https://www.python.org/downloads/windows/)
- - Run `mach bootstrap`
-    + *This will install CMake, Git, and Ninja via choco in an
-       Administrator console. Allow the scripts to run and once
-       the operation finishes, close the new console.*
-- Run `refreshenv`
-
-See also [Windows Troubleshooting Tips][windows-tips].
+- Download and install [`python`](https://www.python.org/downloads/windows/), [`choco`](https://chocolatey.org/install#individual), and [`rustup`](https://win.rustup.rs/)
+  - Be sure to select *Quick install via the Visual Studio Community installer*
+- In the Visual Studio Installer, ensure the following components are installed:
+  - **Windows 10 SDK (10.0.19041.0)** (`Microsoft.VisualStudio.Component.Windows10SDK.19041`)
+  - **MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest)** (`Microsoft.VisualStudio.Component.VC.Tools.x86.x64`)
+  - **C++ ATL for latest v143 build tools (x86 & x64)** (`Microsoft.VisualStudio.Component.VC.ATL`)
+  - **C++ MFC for latest v143 build tools (x86 & x64)** (`Microsoft.VisualStudio.Component.VC.ATLMFC`)
+- Restart your shell to make sure `cargo` is available
+- Install the other dependencies: `.\mach bootstrap`
+- Build servoshell: `.\mach build`
 
 ### Android
 
 - Ensure that the following environment variables are set:
   - `ANDROID_SDK_ROOT`
-  - `ANDROID_NDK_ROOT`: `$ANDROID_SDK_ROOT/ndk/25.2.9519653/`
+  - `ANDROID_NDK_ROOT`: `$ANDROID_SDK_ROOT/ndk/26.2.11394342/`
  `ANDROID_SDK_ROOT` can be any directory (such as `~/android-sdk`).
   All of the Android build dependencies will be installed there.
 - Install the latest version of the [Android command-line
   tools](https://developer.android.com/studio#command-tools) to
   `$ANDROID_SDK_ROOT/cmdline-tools/latest`.
-- Run the following command to install the necessary components and the path t
+- Run the following command to install the necessary components:
   ```shell
   sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install
    "build-tools;33.0.2" \
    "emulator" \
-   "ndk;25.2.9519653" \
+   "ndk;26.2.11394342" \
    "platform-tools" \
    "platforms;android-33" \
    "system-images;android-33;google_apis;x86_64"
   ```
-For information about building and running the Android build, see
-the [Android documentation][android-docs].
-
-### Cloning the Repo
-Your CARGO_HOME needs to point to (or be in) the same drive as your Servo repository (See [#28530](https://github.com/servo/servo/issues/28530)).
-``` sh
-git clone https://github.com/servo/servo
-cd servo
-```
-
-## Building
-
-Servo is built with [Cargo](https://crates.io/), the Rust package manager.
-We also use Mozilla's Mach tools to orchestrate the build and other tasks.
-You can call Mach like this:
-
-On Unix systems:
-```
-./mach [command] [arguments]
-```
-On Windows Commandline:
-```
-mach.bat [command] [arguments]
-```
-The examples below will use Unix, but the same applies to Windows.
-
-### The Rust compiler
-
-Servo's build system uses rustup.rs to automatically download a Rust compiler.
-This is a specific version of Rust Nightly determined by the
-[`rust-toolchain.toml`](https://github.com/servo/servo/blob/main/rust-toolchain.toml) file.
-
-### Normal build
-
-To build Servo in development mode.
-This is useful for development, but the resulting binary is very slow:
-
-``` sh
-./mach build --dev
-./mach run tests/html/about-mozilla.html
-```
-
-### Release build
-For benchmarking, performance testing, or real-world use.
-Add the `--release` flag to create an optimized build:
-
-``` sh
-./mach build --release
-./mach run --release tests/html/about-mozilla.html
-```
-
-### Android build
-
-For an armv7 Android build run the following command.
-
-```shell
-./mach build --android
-```
-
-### Checking for build errors, without building
-
-If you’re making changes to one crate that cause build errors in another crate,
-consider this instead of a full build:
-
-```sh
-./mach check
-```
-
-It will run `cargo check`, which runs the analysis phase of the compiler
-(and so shows build errors if any) but skips the code generation phase.
-This can be a lot faster than a full build,
-though of course it doesn’t produce a binary you can run.
-
-## Running
-
-Run Servo with the command:
-
-```sh
-./servo [url] [arguments] # if you run with nightly build
-./mach run [url] [arguments] # if you run with mach
-
-# For example
-./mach run https://www.google.com
-```
-
-### Commandline Arguments
-
-- `-p INTERVAL` turns on the profiler and dumps info to the console every
-  `INTERVAL` seconds
-- `-s SIZE` sets the tile size for painting; defaults to 512
-- `-z` disables all graphical output; useful for running JS / layout tests
-- `-Z help` displays useful output to debug servo
-
-### Keyboard Shortcuts
-
-- `Ctrl`+`L` opens URL prompt (`Cmd`+`L` on Mac)
-- `Ctrl`+`R` reloads current page (`Cmd`+`R` on Mac)
-- `Ctrl`+`-` zooms out (`Cmd`+`-` on Mac)
-- `Ctrl`+`=` zooms in (`Cmd`+`=` on Mac)
-- `Alt`+`left arrow` goes backwards in the history (`Cmd`+`left arrow` on Mac)
-- `Alt`+`right arrow` goes forwards in the history (`Cmd`+`right arrow` on Mac)
-- `Esc` or `Ctrl`+`Q` exits Servo (`Cmd`+`Q` on Mac)
-
-### Runtime dependencies
-
-#### Linux
-
-* `GStreamer` >=1.18
-* `gst-plugins-bad` >=1.18
-* `libXcursor`
-* `libXrandr`
-* `libXi`
-* `libxkbcommon`
-* `vulkan-loader`
-* `libegl1-mesa-dev`
-
-## Developing
-
-There are lots of mach commands you can use. You can list them with `./mach
---help`.
-
-
-The generated documentation can be found on https://doc.servo.org/servo/index.html
-
-[manual-build]: https://github.com/servo/servo/wiki/Building#manual-build-setup
-[windows-tips]: https://github.com/servo/servo/wiki/Building#troubleshooting-the-windows-build
-[android-docs]: https://github.com/servo/servo/wiki/Android
+- Follow the instructions above for the platform you are building on

SECURITY.md

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

components/allocator/Cargo.toml

@@ -1,20 +1,24 @@
 [package]
 name = "servo_allocator"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"
 
-[target.'cfg(not(any(windows, target_os = "android")))'.dependencies]
-jemallocator = { workspace = true }
-jemalloc-sys = { workspace = true }
+[features]
+use-system-allocator = ["libc"]
+
+[target.'cfg(not(any(windows, target_env = "ohos")))'.dependencies]
+tikv-jemallocator = { workspace = true }
+tikv-jemalloc-sys = { workspace = true }
+libc = { workspace = true, optional = true }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { workspace = true, features = ["heapapi"] }
+windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
 
-[target.'cfg(target_os = "android")'.dependencies]
+[target.'cfg(target_env = "ohos")'.dependencies]
 libc = { workspace = true }

components/allocator/lib.rs

@@ -9,33 +9,46 @@ static ALLOC: Allocator = Allocator;
 
 pub use crate::platform::*;
 
-#[cfg(not(any(windows, target_os = "android")))]
+#[cfg(not(any(windows, feature = "use-system-allocator", target_env = "ohos")))]
 mod platform {
     use std::os::raw::c_void;
 
-    use jemallocator;
-
-    pub use self::jemallocator::Jemalloc as Allocator;
+    pub use tikv_jemallocator::Jemalloc as Allocator;
 
     /// Get the size of a heap block.
+    ///
+    /// # Safety
+    ///
+    /// Passing a non-heap allocated pointer to this function results in undefined behavior.
     pub unsafe extern "C" fn usable_size(ptr: *const c_void) -> usize {
-        jemallocator::usable_size(ptr)
+        tikv_jemallocator::usable_size(ptr)
     }
 
     /// Memory allocation APIs compatible with libc
     pub mod libc_compat {
-        pub use jemalloc_sys::{free, malloc, realloc};
+        pub use tikv_jemalloc_sys::{free, malloc, realloc};
     }
 }
 
-#[cfg(target_os = "android")]
+#[cfg(all(
+    not(windows),
+    any(feature = "use-system-allocator", target_env = "ohos")
+))]
 mod platform {
     pub use std::alloc::System as Allocator;
     use std::os::raw::c_void;
 
     /// Get the size of a heap block.
+    ///
+    /// # Safety
+    ///
+    /// Passing a non-heap allocated pointer to this function results in undefined behavior.
     pub unsafe extern "C" fn usable_size(ptr: *const c_void) -> usize {
-        libc::malloc_usable_size(ptr)
+        #[cfg(target_vendor = "apple")]
+        return libc::malloc_size(ptr);
+
+        #[cfg(not(target_vendor = "apple"))]
+        return libc::malloc_usable_size(ptr as *mut _);
     }
 
     pub mod libc_compat {
@@ -48,14 +61,19 @@ mod platform {
     pub use std::alloc::System as Allocator;
     use std::os::raw::c_void;
 
-    use winapi::um::heapapi::{GetProcessHeap, HeapSize, HeapValidate};
+    use windows_sys::Win32::Foundation::FALSE;
+    use windows_sys::Win32::System::Memory::{GetProcessHeap, HeapSize, HeapValidate};
 
     /// Get the size of a heap block.
+    ///
+    /// # Safety
+    ///
+    /// Passing a non-heap allocated pointer to this function results in undefined behavior.
     pub unsafe extern "C" fn usable_size(mut ptr: *const c_void) -> usize {
         let heap = GetProcessHeap();
 
-        if HeapValidate(heap, 0, ptr) == 0 {
-            ptr = *(ptr as *const *const c_void).offset(-1);
+        if HeapValidate(heap, 0, ptr) == FALSE {
+            ptr = *(ptr as *const *const c_void).offset(-1)
         }
 
         HeapSize(heap, 0, ptr) as usize

components/atoms/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "servo_atoms"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
-build = "build.rs"
-
-[lib]
-path = "lib.rs"
-
-[dependencies]
-string_cache = { workspace = true }
-
-[build-dependencies]
-string_cache_codegen = { workspace = true }

components/atoms/build.rs

@@ -1,31 +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 std::env;
-use std::fs::File;
-use std::io::{BufRead, BufReader};
-use std::path::Path;
-
-fn main() {
-    let static_atoms =
-        Path::new(&env::var_os("CARGO_MANIFEST_DIR").unwrap()).join("static_atoms.txt");
-    let static_atoms = BufReader::new(File::open(&static_atoms).unwrap());
-    let mut atom_type = string_cache_codegen::AtomType::new("Atom", "atom!");
-
-    macro_rules! predefined {
-        ($($name: expr,)+) => {
-            {
-                $(
-                    atom_type.atom($name);
-                )+
-            }
-        }
-    }
-    include!("../style/counter_style/predefined.rs");
-
-    atom_type
-        .atoms(static_atoms.lines().map(Result::unwrap))
-        .write_to_file(&Path::new(&env::var_os("OUT_DIR").unwrap()).join("atom.rs"))
-        .unwrap();
-}

components/atoms/lib.rs

@@ -1,5 +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/. */
-
-include!(concat!(env!("OUT_DIR"), "/atom.rs"));

components/atoms/static_atoms.txt

@@ -1,174 +0,0 @@
--moz-content-preferred-color-scheme
--moz-device-pixel-ratio
--moz-gtk-csd-close-button-position
--moz-gtk-csd-maximize-button-position
--moz-gtk-csd-menu-radius
--moz-gtk-csd-minimize-button-position
--moz-gtk-csd-titlebar-radius
--moz-gtk-menu-radius
-DOMContentLoaded
-abort
-activate
-addtrack
-animationcancel
-animationend
-animationiteration
-animationstart
-aspect-ratio
-beforeunload
-block-size
-button
-canplay
-canplaythrough
-center
-change
-characteristicvaluechanged
-checkbox
-click
-close
-closing
-color
-complete
-compositionend
-compositionstart
-compositionupdate
-controllerchange
-cursive
-dark
-datachannel
-date
-datetime-local
-dir
-device-pixel-ratio
-durationchange
-email
-emptied
-end
-ended
-error
-fantasy
-fetch
-file
-fill
-fill-opacity
-formdata
-fullscreenchange
-fullscreenerror
-gattserverdisconnected
-hashchange
-height
-hidden
-icecandidate
-iceconnectionstatechange
-icegatheringstatechange
-image
-inline-size
-input
-inputsourceschange
-invalid
-keydown
-keypress
-kind
-left
-light
-ltr
-load
-loadeddata
-loadedmetadata
-loadend
-loadstart
-message
-message
-messageerror
-monospace
-month
-mousedown
-mousemove
-mouseover
-mouseup
-negotiationneeded
-none
-normal
-number
-onchange
-open
-orientation
-pagehide
-pageshow
-password
-pause
-play
-playing
-popstate
-postershown
-print
-progress
-radio
-range
-ratechange
-readystatechange
-referrer
-reftest-wait
-rejectionhandled
-removetrack
-reset
-resize
-resolution
-resourcetimingbufferfull
-right
-rtl
-sans-serif
-safe-area-inset-top
-safe-area-inset-bottom
-safe-area-inset-left
-safe-area-inset-right
-scan
-screen
-scroll-position
-scrollbar-inline-size
-search
-seeked
-seeking
-select
-selectend
-selectionchange
-selectstart
-serif
-sessionavailable
-signalingstatechange
-squeeze
-squeezeend
-squeezestart
-srclang
-statechange
-stroke
-stroke-opacity
-storage
-submit
-suspend
-system-ui
-tel
-text
-time
-timeupdate
-toggle
-track
-transitioncancel
-transitionend
-transitionrun
-transitionstart
-uncapturederror
-unhandledrejection
-unload
-url
-visibilitychange
-volumechange
-waiting
-webglcontextcreationerror
-webkitAnimationEnd
-webkitAnimationIteration
-webkitAnimationStart
-webkitTransitionEnd
-webkitTransitionRun
-week
-width

components/background_hang_monitor/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "background_hang_monitor"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-publish = false
-edition = "2018"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "background_hang_monitor"
@@ -13,20 +13,18 @@ test = false
 doctest = false
 
 [dependencies]
+background_hang_monitor_api = { workspace = true }
 backtrace = { workspace = true }
+base = { workspace = true }
 crossbeam-channel = { workspace = true }
 ipc-channel = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
-msg = { workspace = true }
 serde_json = { workspace = true }
 
-[dev-dependencies]
-lazy_static = { workspace = true }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 mach2 = "0.4"
 
-[target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
-nix = "0.25"
+[target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64", target_env = "ohos", target_env = "musl"))))'.dependencies]
+nix = { workspace = true, features = ["signal"] }
 unwind-sys = "0.1.4"

components/background_hang_monitor/background_hang_monitor.rs

@@ -8,15 +8,15 @@ use std::sync::{Arc, Weak};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use crossbeam_channel::{after, never, select, unbounded, Receiver, Sender};
-use ipc_channel::ipc::{IpcReceiver, IpcSender};
-use ipc_channel::router::ROUTER;
-use log::warn;
-use msg::constellation_msg::{
+use background_hang_monitor_api::{
     BackgroundHangMonitor, BackgroundHangMonitorClone, BackgroundHangMonitorControlMsg,
     BackgroundHangMonitorExitSignal, BackgroundHangMonitorRegister, HangAlert, HangAnnotation,
     HangMonitorAlert, MonitoredComponentId,
 };
+use crossbeam_channel::{after, never, select, unbounded, Receiver, Sender};
+use ipc_channel::ipc::{IpcReceiver, IpcSender};
+use ipc_channel::router::ROUTER;
+use log::warn;
 
 use crate::sampler::{NativeStack, Sampler};
 
@@ -49,6 +49,7 @@ impl HangMonitorRegister {
         let (tether, tether_port) = unbounded();
 
         let _ = thread::Builder::new()
+            .name("BackgroundHangMonitor".to_owned())
             .spawn(move || {
                 let mut monitor = BackgroundHangMonitorWorker::new(
                     constellation_chan,
@@ -92,19 +93,32 @@ impl BackgroundHangMonitorRegister for HangMonitorRegister {
             target_os = "windows",
             any(target_arch = "x86_64", target_arch = "x86")
         ))]
-        let sampler = crate::sampler_windows::WindowsSampler::new();
+        let sampler = crate::sampler_windows::WindowsSampler::new_boxed();
         #[cfg(target_os = "macos")]
-        let sampler = crate::sampler_mac::MacOsSampler::new();
+        let sampler = crate::sampler_mac::MacOsSampler::new_boxed();
         #[cfg(all(
             target_os = "linux",
-            not(any(target_arch = "arm", target_arch = "aarch64"))
+            not(any(
+                target_arch = "arm",
+                target_arch = "aarch64",
+                target_env = "ohos",
+                target_env = "musl"
+            )),
         ))]
-        let sampler = crate::sampler_linux::LinuxSampler::new();
+        let sampler = crate::sampler_linux::LinuxSampler::new_boxed();
         #[cfg(any(
             target_os = "android",
-            all(target_os = "linux", any(target_arch = "arm", target_arch = "aarch64"))
+            all(
+                target_os = "linux",
+                any(
+                    target_arch = "arm",
+                    target_arch = "aarch64",
+                    target_env = "ohos",
+                    target_env = "musl"
+                )
+            )
         ))]
-        let sampler = crate::sampler::DummySampler::new();
+        let sampler = crate::sampler::DummySampler::new_boxed();
 
         // When a component is registered, and there's an exit request that
         // reached BHM, we want an exit signal to be delivered to the
@@ -208,7 +222,7 @@ impl BackgroundHangMonitorChan {
         BackgroundHangMonitorChan {
             sender,
             _tether: tether,
-            component_id: component_id,
+            component_id,
             disconnected: Default::default(),
             monitoring_enabled,
         }
@@ -312,14 +326,14 @@ struct BackgroundHangMonitorWorker {
     monitoring_enabled: bool,
 }
 
+type MonitoredComponentSender = Sender<(MonitoredComponentId, MonitoredComponentMsg)>;
+type MonitoredComponentReceiver = Receiver<(MonitoredComponentId, MonitoredComponentMsg)>;
+
 impl BackgroundHangMonitorWorker {
     fn new(
         constellation_chan: IpcSender<HangMonitorAlert>,
         control_port: IpcReceiver<BackgroundHangMonitorControlMsg>,
-        (port_sender, port): (
-            Arc<Sender<(MonitoredComponentId, MonitoredComponentMsg)>>,
-            Receiver<(MonitoredComponentId, MonitoredComponentMsg)>,
-        ),
+        (port_sender, port): (Arc<MonitoredComponentSender>, MonitoredComponentReceiver),
         tether_port: Receiver<Never>,
         monitoring_enabled: bool,
     ) -> Self {
@@ -360,7 +374,7 @@ impl BackgroundHangMonitorWorker {
             let profile = stack.to_hangprofile();
             let name = match self.component_names.get(&id) {
                 Some(ref s) => format!("\"{}\"", s),
-                None => format!("null"),
+                None => "null".to_string(),
             };
             let json = format!(
                 "{}{{ \"name\": {}, \"namespace\": {}, \"index\": {}, \"type\": \"{:?}\", \
@@ -389,12 +403,10 @@ impl BackgroundHangMonitorWorker {
                 .checked_sub(Instant::now() - self.last_sample)
                 .unwrap_or_else(|| Duration::from_millis(0));
             after(duration)
+        } else if self.monitoring_enabled {
+            after(Duration::from_millis(100))
         } else {
-            if self.monitoring_enabled {
-                after(Duration::from_millis(100))
-            } else {
-                never()
-            }
+            never()
         };
 
         let received = select! {
@@ -403,13 +415,8 @@ impl BackgroundHangMonitorWorker {
                 // gets disconnected.
                 Some(event.unwrap())
             },
-            recv(self.tether_port) -> event => {
+            recv(self.tether_port) -> _ => {
                 // This arm can only reached by a tether disconnection
-                match event {
-                    Ok(x) => match x {}
-                    Err(_) => {}
-                }
-
                 // All associated `HangMonitorRegister` and
                 // `BackgroundHangMonitorChan` have been dropped. Suppress
                 // `signal_to_exit` and exit the BHM.

components/background_hang_monitor/lib.rs

@@ -8,7 +8,12 @@ pub mod background_hang_monitor;
 mod sampler;
 #[cfg(all(
     target_os = "linux",
-    not(any(target_arch = "arm", target_arch = "aarch64"))
+    not(any(
+        target_arch = "arm",
+        target_arch = "aarch64",
+        target_env = "ohos",
+        target_env = "musl"
+    ))
 ))]
 mod sampler_linux;
 #[cfg(target_os = "macos")]

components/background_hang_monitor/sampler.rs

@@ -4,8 +4,7 @@
 
 use std::ptr;
 
-use backtrace;
-use msg::constellation_msg::{HangProfile, HangProfileSymbol};
+use background_hang_monitor_api::{HangProfile, HangProfileSymbol};
 
 const MAX_NATIVE_FRAMES: usize = 1024;
 
@@ -18,7 +17,7 @@ pub struct DummySampler;
 
 impl DummySampler {
     #[allow(dead_code)]
-    pub fn new() -> Box<dyn Sampler> {
+    pub fn new_boxed() -> Box<dyn Sampler> {
         Box::new(DummySampler)
     }
 }
@@ -44,13 +43,17 @@ pub struct Registers {
     pub frame_ptr: Address,
 }
 
+#[allow(dead_code)]
 pub struct NativeStack {
     instruction_ptrs: [*mut std::ffi::c_void; MAX_NATIVE_FRAMES],
+    #[allow(dead_code)]
     stack_ptrs: [*mut std::ffi::c_void; MAX_NATIVE_FRAMES],
+    #[allow(dead_code)]
     count: usize,
 }
 
 impl NativeStack {
+    #[allow(dead_code)]
     pub fn new() -> Self {
         NativeStack {
             instruction_ptrs: [ptr::null_mut(); MAX_NATIVE_FRAMES],
@@ -59,17 +62,18 @@ impl NativeStack {
         }
     }
 
+    #[allow(dead_code)]
     pub fn process_register(
         &mut self,
         instruction_ptr: *mut std::ffi::c_void,
         stack_ptr: *mut std::ffi::c_void,
     ) -> Result<(), ()> {
-        if !(self.count < MAX_NATIVE_FRAMES) {
+        if self.count >= MAX_NATIVE_FRAMES {
             return Err(());
         }
         self.instruction_ptrs[self.count] = instruction_ptr;
         self.stack_ptrs[self.count] = stack_ptr;
-        self.count = self.count + 1;
+        self.count += 1;
         Ok(())
     }
 
@@ -85,7 +89,7 @@ impl NativeStack {
                 // TODO: use the demangled or C++ demangled symbols if available.
                 let name = symbol
                     .name()
-                    .map(|n| String::from_utf8_lossy(&n.as_bytes()).to_string());
+                    .map(|n| String::from_utf8_lossy(n.as_bytes()).to_string());
                 let filename = symbol.filename().map(|n| n.to_string_lossy().to_string());
                 let lineno = symbol.lineno();
                 profile.backtrace.push(HangProfileSymbol {

components/background_hang_monitor/sampler_linux.rs

@@ -6,9 +6,8 @@
 
 use std::cell::UnsafeCell;
 use std::sync::atomic::{AtomicPtr, Ordering};
-use std::{io, mem, process, ptr, thread};
+use std::{cmp, io, mem, process, ptr, thread};
 
-use libc;
 use nix::sys::signal::{sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal};
 use unwind_sys::{
     unw_cursor_t, unw_get_reg, unw_init_local, unw_step, UNW_ESUCCESS, UNW_REG_IP, UNW_REG_SP,
@@ -138,7 +137,7 @@ pub struct LinuxSampler {
 
 impl LinuxSampler {
     #[allow(unsafe_code, dead_code)]
-    pub fn new() -> Box<dyn Sampler> {
+    pub fn new_boxed() -> Box<dyn Sampler> {
         let thread_id = unsafe { libc::syscall(libc::SYS_gettid) as libc::pid_t };
         let handler = SigHandler::SigAction(sigprof_handler);
         let action = SigAction::new(
@@ -181,12 +180,10 @@ fn step(cursor: *mut unw_cursor_t) -> Result<bool, i32> {
         }
 
         let ret = unw_step(cursor);
-        if ret > 0 {
-            Ok(true)
-        } else if ret == 0 {
-            Ok(false)
-        } else {
-            Err(ret)
+        match ret.cmp(&0) {
+            cmp::Ordering::Less => Err(ret),
+            cmp::Ordering::Greater => Ok(true),
+            cmp::Ordering::Equal => Ok(false),
         }
     }
 }
@@ -222,6 +219,7 @@ impl Sampler for LinuxSampler {
             let ret = unsafe { unw_init_local(cursor.as_mut_ptr(), context) };
             result = if ret == UNW_ESUCCESS {
                 let mut native_stack = NativeStack::new();
+                #[allow(clippy::while_let_loop)] // False positive
                 loop {
                     let ip = match get_register(cursor.as_mut_ptr(), RegNum::Ip) {
                         Ok(ip) => ip,

components/background_hang_monitor/sampler_mac.rs

@@ -4,8 +4,6 @@
 
 use std::{panic, process};
 
-use {libc, mach2};
-
 use crate::sampler::{Address, NativeStack, Registers, Sampler};
 
 type MonitoredThreadId = mach2::mach_types::thread_act_t;
@@ -16,7 +14,7 @@ pub struct MacOsSampler {
 
 impl MacOsSampler {
     #[allow(unsafe_code)]
-    pub fn new() -> Box<dyn Sampler> {
+    pub fn new_boxed() -> Box<dyn Sampler> {
         let thread_id = unsafe { mach2::mach_init::mach_thread_self() };
         Box::new(MacOsSampler { thread_id })
     }

components/background_hang_monitor/sampler_windows.rs

@@ -4,7 +4,7 @@
 
 use crate::sampler::{NativeStack, Sampler};
 
-type MonitoredThreadId = usize; // TODO: use winapi
+type MonitoredThreadId = usize; // TODO: use the `windows` crate to do this.
 
 #[allow(dead_code)]
 pub struct WindowsSampler {
@@ -13,8 +13,8 @@ pub struct WindowsSampler {
 
 impl WindowsSampler {
     #[allow(unsafe_code, dead_code)]
-    pub fn new() -> Box<dyn Sampler> {
-        let thread_id = 0; // TODO: use winapi::um::processthreadsapi::GetThreadId
+    pub fn new_boxed() -> Box<dyn Sampler> {
+        let thread_id = 0; // TODO: use windows::Win32::System::Threading::GetThreadId
         Box::new(WindowsSampler { thread_id })
     }
 }
@@ -28,11 +28,11 @@ impl Sampler for WindowsSampler {
         // or any other unshareable resource.
 
         // TODO:
-        // 1: use winapi::um::processthreadsapi::SuspendThread
-        // 2: use winapi::um::processthreadsapi::GetThreadContext
+        // 1: use windows::Win32::Threading::SuspendThread
+        // 2: use windows::Win32::Threading::GetThreadContext
         // 3: populate registers using the context, see
         // https://dxr.mozilla.org/mozilla-central/source/tools/profiler/core/platform-win32.cpp#129
-        // 4: use winapi::um::processthreadsapi::ResumeThread
+        // 4: use windows::Win32::Threading::ResumeThread
 
         // NOTE: End of "critical section".
         Err(())

components/background_hang_monitor/tests/hang_monitor_tests.rs

@@ -10,16 +10,14 @@ use std::thread;
 use std::time::Duration;
 
 use background_hang_monitor::HangMonitorRegister;
-use ipc_channel::ipc;
-use msg::constellation_msg::{
+use background_hang_monitor_api::{
     BackgroundHangMonitorControlMsg, BackgroundHangMonitorExitSignal, HangAlert, HangAnnotation,
     HangMonitorAlert, MonitoredComponentId, MonitoredComponentType, ScriptHangAnnotation,
-    TEST_PIPELINE_ID,
 };
+use base::id::TEST_PIPELINE_ID;
+use ipc_channel::ipc;
 
-lazy_static::lazy_static! {
-    static ref SERIAL: Mutex<()> = Mutex::new(());
-}
+static SERIAL: Mutex<()> = Mutex::new(());
 
 #[test]
 fn test_hang_monitoring() {

components/bluetooth/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "bluetooth"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "bluetooth"

components/bluetooth/adapter.rs

@@ -197,6 +197,7 @@ impl BluetoothAdapter {
     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())?,
             )),
@@ -292,7 +293,10 @@ impl BluetoothAdapter {
     pub fn set_id(&self, id: String) -> Result<(), Box<dyn Error>> {
         match self {
             #[cfg(feature = "bluetooth-test")]
-            BluetoothAdapter::Mock(inner) => Ok(inner.set_id(id)),
+            BluetoothAdapter::Mock(inner) => {
+                inner.set_id(id);
+                Ok(())
+            },
             _ => Err(Box::from(
                 "Error! Test functions are not supported on real devices!",
             )),

components/bluetooth/bluetooth.rs

@@ -83,8 +83,7 @@ use super::macros::get_inner_and_call;
 use super::macros::get_inner_and_call_test_func;
 
 #[cfg(feature = "bluetooth-test")]
-const NOT_SUPPORTED_ON_MOCK_ERROR: &'static str =
-    "Error! The first parameter must be a mock structure!";
+const NOT_SUPPORTED_ON_MOCK_ERROR: &str = "Error! The first parameter must be a mock structure!";
 
 #[derive(Debug)]
 pub enum BluetoothDiscoverySession {
@@ -193,9 +192,8 @@ impl BluetoothDevice {
 
     #[cfg(feature = "bluetooth-test")]
     pub fn set_id(&self, id: String) {
-        match self {
-            &BluetoothDevice::Mock(ref fake_adapter) => fake_adapter.set_id(id),
-            _ => (),
+        if let BluetoothDevice::Mock(fake_adapter) = self {
+            fake_adapter.set_id(id)
         }
     }
 
@@ -473,9 +471,8 @@ impl BluetoothGATTService {
 
     #[cfg(feature = "bluetooth-test")]
     pub fn set_id(&self, id: String) {
-        match self {
-            &BluetoothGATTService::Mock(ref fake_service) => fake_service.set_id(id),
-            _ => (),
+        if let BluetoothGATTService::Mock(fake_service) = self {
+            fake_service.set_id(id)
         }
     }
 
@@ -578,11 +575,8 @@ impl BluetoothGATTCharacteristic {
 
     #[cfg(feature = "bluetooth-test")]
     pub fn set_id(&self, id: String) {
-        match self {
-            &BluetoothGATTCharacteristic::Mock(ref fake_characteristic) => {
-                fake_characteristic.set_id(id)
-            },
-            _ => (),
+        if let BluetoothGATTCharacteristic::Mock(fake_characteristic) = self {
+            fake_characteristic.set_id(id)
         }
     }
 
@@ -710,9 +704,8 @@ impl BluetoothGATTDescriptor {
 
     #[cfg(feature = "bluetooth-test")]
     pub fn set_id(&self, id: String) {
-        match self {
-            &BluetoothGATTDescriptor::Mock(ref fake_descriptor) => fake_descriptor.set_id(id),
-            _ => (),
+        if let BluetoothGATTDescriptor::Mock(fake_descriptor) = self {
+            fake_descriptor.set_id(id)
         }
     }
 

components/bluetooth/empty.rs

@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use std::error::Error;
 use std::sync::Arc;
 
-const NOT_SUPPORTED_ERROR: &'static str = "Error! Not supported platform!";
+const NOT_SUPPORTED_ERROR: &str = "Error! Not supported platform!";
 
 #[derive(Clone, Debug)]
 pub struct EmptyAdapter {}

components/bluetooth/lib.rs

@@ -120,7 +120,7 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
     if !filter.get_services().is_empty() {
         if let Ok(device_uuids) = device.get_uuids() {
             for service in filter.get_services() {
-                if device_uuids.iter().find(|x| x == &service).is_none() {
+                if !device_uuids.iter().any(|x| x == service) {
                     return false;
                 }
             }
@@ -128,12 +128,12 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
     }
 
     // Step 4.
-    if let Some(ref manufacturer_data) = filter.get_manufacturer_data() {
+    if let Some(manufacturer_data) = filter.get_manufacturer_data() {
         let advertised_manufacturer_data = match device.get_manufacturer_data() {
             Ok(data) => data,
             Err(_) => return false,
         };
-        for (ref id, &(ref prefix, ref mask)) in manufacturer_data.iter() {
+        for (id, (prefix, mask)) in manufacturer_data.iter() {
             if let Some(advertised_data) = advertised_manufacturer_data.get(id) {
                 if !data_filter_matches(advertised_data, prefix, mask) {
                     return false;
@@ -145,12 +145,12 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
     }
 
     // Step 5.
-    if let Some(ref service_data) = filter.get_service_data() {
+    if let Some(service_data) = filter.get_service_data() {
         let advertised_service_data = match device.get_service_data() {
             Ok(data) => data,
             Err(_) => return false,
         };
-        for (uuid, &(ref prefix, ref mask)) in service_data.iter() {
+        for (uuid, (prefix, mask)) in service_data.iter() {
             if let Some(advertised_data) = advertised_service_data.get(uuid.as_str()) {
                 if !data_filter_matches(advertised_data, prefix, mask) {
                     return false;
@@ -193,10 +193,7 @@ fn matches_filters(device: &BluetoothDevice, filters: &BluetoothScanfilterSequen
 }
 
 fn is_mock_adapter(adapter: &BluetoothAdapter) -> bool {
-    match adapter {
-        &BluetoothAdapter::Mock(_) => true,
-        _ => false,
-    }
+    matches!(adapter, &BluetoothAdapter::Mock(_))
 }
 
 pub struct BluetoothManager {
@@ -299,7 +296,7 @@ impl BluetoothManager {
         self.allowed_services.clear();
         self.adapter = BluetoothAdapter::new_mock().ok();
         match test::test(self, data_set_name) {
-            Ok(_) => return Ok(()),
+            Ok(_) => Ok(()),
             Err(error) => Err(BluetoothError::Type(error.to_string())),
         }
     }
@@ -352,18 +349,19 @@ impl BluetoothManager {
                 if !adapter.is_powered().unwrap_or(false) {
                     return Err(BluetoothError::NotFound);
                 }
-                return Ok(adapter);
+                Ok(adapter)
             },
-            None => return Err(BluetoothError::NotFound),
+            None => Err(BluetoothError::NotFound),
         }
     }
 
     // Device
 
     fn get_and_cache_devices(&mut self, adapter: &mut BluetoothAdapter) -> Vec<BluetoothDevice> {
-        let devices = adapter.get_devices().unwrap_or(vec![]);
+        let devices = adapter.get_devices().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
                 if !self.address_to_id.contains_key(&address) {
                     let generated_id = self.generate_device_id();
                     self.address_to_id.insert(address, generated_id.clone());
@@ -373,7 +371,7 @@ impl BluetoothManager {
                 }
             }
         }
-        self.cached_devices.iter().map(|(_, d)| d.clone()).collect()
+        self.cached_devices.values().cloned().collect()
     }
 
     fn get_device(
@@ -454,7 +452,7 @@ impl BluetoothManager {
     ) -> BluetoothResult<bool> {
         let mut adapter = self.get_adapter()?;
         match self.get_device(&mut adapter, device_id) {
-            Some(ref device) => Ok(matches_filters(device, filters)),
+            Some(device) => Ok(matches_filters(device, filters)),
             None => Ok(false),
         }
     }
@@ -467,14 +465,14 @@ impl BluetoothManager {
         device_id: &str,
     ) -> Vec<BluetoothGATTService> {
         let mut services = match self.get_device(adapter, device_id) {
-            Some(d) => d.get_gatt_services().unwrap_or(vec![]),
+            Some(d) => d.get_gatt_services().unwrap_or_default(),
             None => vec![],
         };
 
         services.retain(|s| {
-            !uuid_is_blocklisted(&s.get_uuid().unwrap_or(String::new()), Blocklist::All) &&
+            !uuid_is_blocklisted(&s.get_uuid().unwrap_or_default(), Blocklist::All) &&
                 self.allowed_services.get(device_id).map_or(false, |uuids| {
-                    uuids.contains(&s.get_uuid().unwrap_or(String::new()))
+                    uuids.contains(&s.get_uuid().unwrap_or_default())
                 })
         });
         for service in &services {
@@ -511,13 +509,12 @@ impl BluetoothManager {
         service_id: &str,
     ) -> Vec<BluetoothGATTCharacteristic> {
         let mut characteristics = match self.get_gatt_service(adapter, service_id) {
-            Some(s) => s.get_gatt_characteristics().unwrap_or(vec![]),
+            Some(s) => s.get_gatt_characteristics().unwrap_or_default(),
             None => vec![],
         };
 
-        characteristics.retain(|c| {
-            !uuid_is_blocklisted(&c.get_uuid().unwrap_or(String::new()), Blocklist::All)
-        });
+        characteristics
+            .retain(|c| !uuid_is_blocklisted(&c.get_uuid().unwrap_or_default(), Blocklist::All));
         for characteristic in &characteristics {
             self.cached_characteristics
                 .insert(characteristic.get_id(), characteristic.clone());
@@ -544,7 +541,7 @@ impl BluetoothManager {
 
     fn get_characteristic_properties(&self, characteristic: &BluetoothGATTCharacteristic) -> Flags {
         let mut props: Flags = Flags::empty();
-        let flags = characteristic.get_flags().unwrap_or(vec![]);
+        let flags = characteristic.get_flags().unwrap_or_default();
         for flag in flags {
             match flag.as_ref() {
                 "broadcast" => props.insert(Flags::BROADCAST),
@@ -576,13 +573,12 @@ impl BluetoothManager {
         characteristic_id: &str,
     ) -> Vec<BluetoothGATTDescriptor> {
         let mut descriptors = match self.get_gatt_characteristic(adapter, characteristic_id) {
-            Some(c) => c.get_gatt_descriptors().unwrap_or(vec![]),
+            Some(c) => c.get_gatt_descriptors().unwrap_or_default(),
             None => vec![],
         };
 
-        descriptors.retain(|d| {
-            !uuid_is_blocklisted(&d.get_uuid().unwrap_or(String::new()), Blocklist::All)
-        });
+        descriptors
+            .retain(|d| !uuid_is_blocklisted(&d.get_uuid().unwrap_or_default(), Blocklist::All));
         for descriptor in &descriptors {
             self.cached_descriptors
                 .insert(descriptor.get_id(), descriptor.clone());
@@ -617,11 +613,10 @@ impl BluetoothManager {
         // 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() {
-                if !is_mock_adapter(&adapter) {
-                    thread::sleep(Duration::from_millis(DISCOVERY_TIMEOUT_MS));
-                }
+            if session.start_discovery().is_ok() && !is_mock_adapter(&adapter) {
+                thread::sleep(Duration::from_millis(DISCOVERY_TIMEOUT_MS));
             }
+
             let _ = session.stop_discovery();
         }
 
@@ -629,10 +624,7 @@ impl BluetoothManager {
 
         // Step 8.
         if !options.is_accepting_all_devices() {
-            matched_devices = matched_devices
-                .into_iter()
-                .filter(|d| matches_filters(d, options.get_filters()))
-                .collect();
+            matched_devices.retain(|d| matches_filters(d, options.get_filters()));
         }
 
         // Step 9.
@@ -655,7 +647,7 @@ impl BluetoothManager {
             }
         }
         // Step 10.
-        return Err(BluetoothError::NotFound);
+        Err(BluetoothError::NotFound)
         // Step 12: Missing, because it is optional.
     }
 
@@ -686,9 +678,9 @@ impl BluetoothManager {
                     // TODO: Step 5.1.4: Use the exchange MTU procedure.
                 }
                 // Step 5.1.3.
-                return Err(BluetoothError::Network);
+                Err(BluetoothError::Network)
             },
-            None => return Err(BluetoothError::NotFound),
+            None => Err(BluetoothError::NotFound),
         }
     }
 
@@ -709,9 +701,9 @@ impl BluetoothManager {
                         return Ok(());
                     }
                 }
-                return Err(BluetoothError::Network);
+                Err(BluetoothError::Network)
             },
-            None => return Err(BluetoothError::NotFound),
+            None => Err(BluetoothError::NotFound),
         }
     }
 
@@ -742,14 +734,14 @@ impl BluetoothManager {
                 }
                 let mut services = self.get_and_cache_gatt_services(&mut adapter, &id);
                 if let Some(uuid) = uuid {
-                    services.retain(|ref e| e.get_uuid().unwrap_or(String::new()) == uuid);
+                    services.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
                 let mut services_vec = vec![];
                 for service in services {
                     if service.is_primary().unwrap_or(false) {
                         if let Ok(uuid) = service.get_uuid() {
                             services_vec.push(BluetoothServiceMsg {
-                                uuid: uuid,
+                                uuid,
                                 is_primary: true,
                                 instance_id: service.get_id(),
                             });
@@ -761,7 +753,7 @@ impl BluetoothManager {
                     return Err(BluetoothError::NotFound);
                 }
 
-                return Ok(BluetoothResponse::GetPrimaryServices(services_vec, single));
+                Ok(BluetoothResponse::GetPrimaryServices(services_vec, single))
             },
             GATTType::Characteristic => {
                 // Step 5.
@@ -772,14 +764,14 @@ impl BluetoothManager {
                 let mut characteristics =
                     self.get_and_cache_gatt_characteristics(&mut adapter, &id);
                 if let Some(uuid) = uuid {
-                    characteristics.retain(|ref e| e.get_uuid().unwrap_or(String::new()) == uuid);
+                    characteristics.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
                 let mut characteristics_vec = vec![];
                 for characteristic in characteristics {
                     if let Ok(uuid) = characteristic.get_uuid() {
                         let properties = self.get_characteristic_properties(&characteristic);
                         characteristics_vec.push(BluetoothCharacteristicMsg {
-                            uuid: uuid,
+                            uuid,
                             instance_id: characteristic.get_id(),
                             broadcast: properties.contains(Flags::BROADCAST),
                             read: properties.contains(Flags::READ),
@@ -801,10 +793,10 @@ impl BluetoothManager {
                     return Err(BluetoothError::NotFound);
                 }
 
-                return Ok(BluetoothResponse::GetCharacteristics(
+                Ok(BluetoothResponse::GetCharacteristics(
                     characteristics_vec,
                     single,
-                ));
+                ))
             },
             GATTType::IncludedService => {
                 // Step 5.
@@ -832,7 +824,7 @@ impl BluetoothManager {
                     }
                 }
                 if let Some(uuid) = uuid {
-                    services_vec.retain(|ref s| s.uuid == uuid);
+                    services_vec.retain(|s| s.uuid == uuid);
                 }
                 services_vec.retain(|s| !uuid_is_blocklisted(&s.uuid, Blocklist::All));
 
@@ -841,7 +833,7 @@ impl BluetoothManager {
                     return Err(BluetoothError::NotFound);
                 }
 
-                return Ok(BluetoothResponse::GetIncludedServices(services_vec, single));
+                Ok(BluetoothResponse::GetIncludedServices(services_vec, single))
             },
             GATTType::Descriptor => {
                 // Step 5.
@@ -851,13 +843,13 @@ impl BluetoothManager {
                 // Step 6.
                 let mut descriptors = self.get_and_cache_gatt_descriptors(&mut adapter, &id);
                 if let Some(uuid) = uuid {
-                    descriptors.retain(|ref e| e.get_uuid().unwrap_or(String::new()) == uuid);
+                    descriptors.retain(|e| e.get_uuid().unwrap_or_default() == uuid);
                 }
                 let mut descriptors_vec = vec![];
                 for descriptor in descriptors {
                     if let Ok(uuid) = descriptor.get_uuid() {
                         descriptors_vec.push(BluetoothDescriptorMsg {
-                            uuid: uuid,
+                            uuid,
                             instance_id: descriptor.get_id(),
                         });
                     }
@@ -867,7 +859,7 @@ impl BluetoothManager {
                 if descriptors_vec.is_empty() {
                     return Err(BluetoothError::NotFound);
                 }
-                return Ok(BluetoothResponse::GetDescriptors(descriptors_vec, single));
+                Ok(BluetoothResponse::GetDescriptors(descriptors_vec, single))
             },
         }
     }
@@ -882,7 +874,7 @@ impl BluetoothManager {
         // (Characteristic) Step 5.3.
         let mut value = self
             .get_gatt_characteristic(&mut adapter, &id)
-            .map(|c| c.read_value().unwrap_or(vec![]));
+            .map(|c| c.read_value().unwrap_or_default());
 
         // (Characteristic) TODO: Step 5.4: Handle all the errors returned from the read_value call.
 
@@ -890,7 +882,7 @@ impl BluetoothManager {
         if value.is_none() {
             value = self
                 .get_gatt_descriptor(&mut adapter, &id)
-                .map(|d| d.read_value().unwrap_or(vec![]));
+                .map(|d| d.read_value().unwrap_or_default());
         }
 
         // (Descriptor) TODO: Step 5.3: Handle all the errors returned from the read_value call.
@@ -898,11 +890,11 @@ impl BluetoothManager {
         match value {
             // (Characteristic) Step 5.5.4.
             // (Descriptor)     Step 5.4.3.
-            Some(v) => return Ok(BluetoothResponse::ReadValue(v)),
+            Some(v) => Ok(BluetoothResponse::ReadValue(v)),
 
             // (Characteristic) Step 4.
             // (Descriptor)     Step 4.
-            None => return Err(BluetoothError::InvalidState),
+            None => Err(BluetoothError::InvalidState),
         }
     }
 
@@ -933,15 +925,15 @@ impl BluetoothManager {
             Some(v) => match v {
                 // (Characteristic) Step 7.5.3.
                 // (Descriptor) Step 7.4.3.
-                Ok(_) => return Ok(BluetoothResponse::WriteValue(value)),
+                Ok(_) => Ok(BluetoothResponse::WriteValue(value)),
 
                 // (Characteristic) Step 7.1.
-                Err(_) => return Err(BluetoothError::NotSupported),
+                Err(_) => Err(BluetoothError::NotSupported),
             },
 
             // (Characteristic) Step 6.
             // (Descriptor)     Step 6.
-            None => return Err(BluetoothError::InvalidState),
+            None => Err(BluetoothError::InvalidState),
         }
     }
 
@@ -969,14 +961,14 @@ impl BluetoothManager {
                 match result {
                     // (StartNotification) Step 11.
                     // (StopNotification)  Step 5.
-                    Ok(_) => return Ok(BluetoothResponse::EnableNotification(())),
+                    Ok(_) => Ok(BluetoothResponse::EnableNotification(())),
 
                     // (StartNotification) Step 5.
-                    Err(_) => return Err(BluetoothError::NotSupported),
+                    Err(_) => Err(BluetoothError::NotSupported),
                 }
             },
             // (StartNotification) Step 4.
-            None => return Err(BluetoothError::InvalidState),
+            None => Err(BluetoothError::InvalidState),
         }
     }
 
@@ -984,7 +976,7 @@ impl BluetoothManager {
     fn watch_advertisements(&mut self, _device_id: String) -> BluetoothResponseResult {
         // Step 2.
         // TODO: Implement this when supported in lower level
-        return Err(BluetoothError::NotSupported);
+        Err(BluetoothError::NotSupported)
     }
 
     // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-getavailability

components/bluetooth/test.rs

@@ -18,110 +18,103 @@ use crate::BluetoothManager;
 
 thread_local!(pub static CACHED_IDS: RefCell<HashSet<Uuid>> = RefCell::new(HashSet::new()));
 
-const ADAPTER_ERROR: &'static str = "No adapter found";
-const WRONG_DATA_SET_ERROR: &'static str = "Wrong data set name was provided";
-const READ_FLAG: &'static str = "read";
-const WRITE_FLAG: &'static str = "write";
-const NOTIFY_FLAG: &'static str = "notify";
+const ADAPTER_ERROR: &str = "No adapter found";
+const WRONG_DATA_SET_ERROR: &str = "Wrong data set name was provided";
+const READ_FLAG: &str = "read";
+const WRITE_FLAG: &str = "write";
+const NOTIFY_FLAG: &str = "notify";
 
 // Adapter names
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=65
-const NOT_PRESENT_ADAPTER: &'static str = "NotPresentAdapter";
+const NOT_PRESENT_ADAPTER: &str = "NotPresentAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=83
-const NOT_POWERED_ADAPTER: &'static str = "NotPoweredAdapter";
+const NOT_POWERED_ADAPTER: &str = "NotPoweredAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=118
-const EMPTY_ADAPTER: &'static str = "EmptyAdapter";
+const EMPTY_ADAPTER: &str = "EmptyAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=126
-const GLUCOSE_HEART_RATE_ADAPTER: &'static str = "GlucoseHeartRateAdapter";
+const GLUCOSE_HEART_RATE_ADAPTER: &str = "GlucoseHeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=135
-const UNICODE_DEVICE_ADAPTER: &'static str = "UnicodeDeviceAdapter";
+const UNICODE_DEVICE_ADAPTER: &str = "UnicodeDeviceAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=205
-const MISSING_SERVICE_HEART_RATE_ADAPTER: &'static str = "MissingServiceHeartRateAdapter";
+const MISSING_SERVICE_HEART_RATE_ADAPTER: &str = "MissingServiceHeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=219
-const MISSING_CHARACTERISTIC_HEART_RATE_ADAPTER: &'static str =
-    "MissingCharacteristicHeartRateAdapter";
-const MISSING_DESCRIPTOR_HEART_RATE_ADAPTER: &'static str = "MissingDescriptorHeartRateAdapter";
+const MISSING_CHARACTERISTIC_HEART_RATE_ADAPTER: &str = "MissingCharacteristicHeartRateAdapter";
+const MISSING_DESCRIPTOR_HEART_RATE_ADAPTER: &str = "MissingDescriptorHeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=234
-const HEART_RATE_ADAPTER: &'static str = "HeartRateAdapter";
+const HEART_RATE_ADAPTER: &str = "HeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=250
-const EMPTY_NAME_HEART_RATE_ADAPTER: &'static str = "EmptyNameHeartRateAdapter";
+const EMPTY_NAME_HEART_RATE_ADAPTER: &str = "EmptyNameHeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=267
-const NO_NAME_HEART_RATE_ADAPTER: &'static str = "NoNameHeartRateAdapter";
+const NO_NAME_HEART_RATE_ADAPTER: &str = "NoNameHeartRateAdapter";
 // https://cs.chromium.org/chromium/src/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h?l=284
-const TWO_HEART_RATE_SERVICES_ADAPTER: &'static str = "TwoHeartRateServicesAdapter";
-const BLOCKLIST_TEST_ADAPTER: &'static str = "BlocklistTestAdapter";
+const TWO_HEART_RATE_SERVICES_ADAPTER: &str = "TwoHeartRateServicesAdapter";
+const BLOCKLIST_TEST_ADAPTER: &str = "BlocklistTestAdapter";
 
 // Device names
-const CONNECTABLE_DEVICE_NAME: &'static str = "Connectable Device";
-const EMPTY_DEVICE_NAME: &'static str = "";
+const CONNECTABLE_DEVICE_NAME: &str = "Connectable Device";
+const EMPTY_DEVICE_NAME: &str = "";
 // https://webbluetoothcg.github.io/web-bluetooth/tests.html#glucosedevice
-const GLUCOSE_DEVICE_NAME: &'static str = "Glucose Device";
+const GLUCOSE_DEVICE_NAME: &str = "Glucose Device";
 // https://webbluetoothcg.github.io/web-bluetooth/tests.html#heartratedevice
-const HEART_RATE_DEVICE_NAME: &'static str = "Heart Rate Device";
-const UNICODE_DEVICE_NAME: &'static str = "❤❤❤❤❤❤❤❤❤";
+const HEART_RATE_DEVICE_NAME: &str = "Heart Rate Device";
+const UNICODE_DEVICE_NAME: &str = "❤❤❤❤❤❤❤❤❤";
 
 // Device addresses
-const CONNECTABLE_DEVICE_ADDRESS: &'static str = "00:00:00:00:00:04";
+const CONNECTABLE_DEVICE_ADDRESS: &str = "00:00:00:00:00:04";
 // https://webbluetoothcg.github.io/web-bluetooth/tests.html#glucosedevice
-const GLUCOSE_DEVICE_ADDRESS: &'static str = "00:00:00:00:00:02";
+const GLUCOSE_DEVICE_ADDRESS: &str = "00:00:00:00:00:02";
 // https://webbluetoothcg.github.io/web-bluetooth/tests.html#heartratedevice
-const HEART_RATE_DEVICE_ADDRESS: &'static str = "00:00:00:00:00:03";
-const UNICODE_DEVICE_ADDRESS: &'static str = "00:00:00:00:00:01";
+const HEART_RATE_DEVICE_ADDRESS: &str = "00:00:00:00:00:03";
+const UNICODE_DEVICE_ADDRESS: &str = "00:00:00:00:00:01";
 
 // Service UUIDs
-const BLOCKLIST_TEST_SERVICE_UUID: &'static str = "611c954a-263b-4f4a-aab6-01ddb953f985";
+const BLOCKLIST_TEST_SERVICE_UUID: &str = "611c954a-263b-4f4a-aab6-01ddb953f985";
 // https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.service.device_information.xml
-const DEVICE_INFORMATION_UUID: &'static str = "0000180a-0000-1000-8000-00805f9b34fb";
+const DEVICE_INFORMATION_UUID: &str = "0000180a-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.service.generic_access.xml
-const GENERIC_ACCESS_SERVICE_UUID: &'static str = "00001800-0000-1000-8000-00805f9b34fb";
+const GENERIC_ACCESS_SERVICE_UUID: &str = "00001800-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.service.glucose.xml
-const GLUCOSE_SERVICE_UUID: &'static str = "00001808-0000-1000-8000-00805f9b34fb";
+const GLUCOSE_SERVICE_UUID: &str = "00001808-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.service.heart_rate.xml
-const HEART_RATE_SERVICE_UUID: &'static str = "0000180d-0000-1000-8000-00805f9b34fb";
+const HEART_RATE_SERVICE_UUID: &str = "0000180d-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.service.human_interface_device.xml
-const HUMAN_INTERFACE_DEVICE_SERVICE_UUID: &'static str = "00001812-0000-1000-8000-00805f9b34fb";
+const HUMAN_INTERFACE_DEVICE_SERVICE_UUID: &str = "00001812-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.service.tx_power.xml
-const TX_POWER_SERVICE_UUID: &'static str = "00001804-0000-1000-8000-00805f9b34fb";
+const TX_POWER_SERVICE_UUID: &str = "00001804-0000-1000-8000-00805f9b34fb";
 
 // Characteristic UUIDs
-const BLOCKLIST_EXCLUDE_READS_CHARACTERISTIC_UUID: &'static str =
-    "bad1c9a2-9a5b-4015-8b60-1579bbbf2135";
+const BLOCKLIST_EXCLUDE_READS_CHARACTERISTIC_UUID: &str = "bad1c9a2-9a5b-4015-8b60-1579bbbf2135";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.characteristic.body_sensor_location.xml
-const BODY_SENSOR_LOCATION_CHARACTERISTIC_UUID: &'static str =
-    "00002a38-0000-1000-8000-00805f9b34fb";
+const BODY_SENSOR_LOCATION_CHARACTERISTIC_UUID: &str = "00002a38-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.characteristic.gap.device_name.xml
-const DEVICE_NAME_CHARACTERISTIC_UUID: &'static str = "00002a00-0000-1000-8000-00805f9b34fb";
+const DEVICE_NAME_CHARACTERISTIC_UUID: &str = "00002a00-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.characteristic.heart_rate_measurement.xml
-const HEART_RATE_MEASUREMENT_CHARACTERISTIC_UUID: &'static str =
-    "00002a37-0000-1000-8000-00805f9b34fb";
+const HEART_RATE_MEASUREMENT_CHARACTERISTIC_UUID: &str = "00002a37-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.characteristic.gap.peripheral_privacy_flag.xml
-const PERIPHERAL_PRIVACY_FLAG_CHARACTERISTIC_UUID: &'static str =
-    "00002a02-0000-1000-8000-00805f9b34fb";
+const PERIPHERAL_PRIVACY_FLAG_CHARACTERISTIC_UUID: &str = "00002a02-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.characteristic.serial_number_string.xml
-const SERIAL_NUMBER_STRING_UUID: &'static str = "00002a25-0000-1000-8000-00805f9b34fb";
+const SERIAL_NUMBER_STRING_UUID: &str = "00002a25-0000-1000-8000-00805f9b34fb";
 
 // Descriptor UUIDs
-const BLOCKLIST_EXCLUDE_READS_DESCRIPTOR_UUID: &'static str =
-    "aaaaaaaa-aaaa-1181-0510-810819516110";
-const BLOCKLIST_DESCRIPTOR_UUID: &'static str = "07711111-6104-0970-7011-1107105110aa";
+const BLOCKLIST_EXCLUDE_READS_DESCRIPTOR_UUID: &str = "aaaaaaaa-aaaa-1181-0510-810819516110";
+const BLOCKLIST_DESCRIPTOR_UUID: &str = "07711111-6104-0970-7011-1107105110aa";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_user_description.xml
-const CHARACTERISTIC_USER_DESCRIPTION_UUID: &'static str = "00002901-0000-1000-8000-00805f9b34fb";
+const CHARACTERISTIC_USER_DESCRIPTION_UUID: &str = "00002901-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml
-const CLIENT_CHARACTERISTIC_CONFIGURATION_UUID: &'static str =
-    "00002902-0000-1000-8000-00805f9b34fb";
+const CLIENT_CHARACTERISTIC_CONFIGURATION_UUID: &str = "00002902-0000-1000-8000-00805f9b34fb";
 // https://www.bluetooth.com/specifications/gatt/
 // viewer?attributeXmlFile=org.bluetooth.descriptor.number_of_digitals.xml
-const NUMBER_OF_DIGITALS_UUID: &'static str = "00002909-0000-1000-8000-00805f9b34fb";
+const NUMBER_OF_DIGITALS_UUID: &str = "00002909-0000-1000-8000-00805f9b34fb";
 
-const HEART_RATE_DEVICE_NAME_DESCRIPTION: &'static str = "The name of this device.";
+const HEART_RATE_DEVICE_NAME_DESCRIPTION: &str = "The name of this device.";
 
 fn generate_id() -> Uuid {
     let mut id = Uuid::nil();
@@ -130,7 +123,7 @@ fn generate_id() -> Uuid {
         id = Uuid::new_v4();
         CACHED_IDS.with(|cache| {
             if !cache.borrow().contains(&id) {
-                cache.borrow_mut().insert(id.clone());
+                cache.borrow_mut().insert(id);
                 generated = true;
             }
         });
@@ -539,7 +532,7 @@ pub fn test(manager: &mut BluetoothManager, data_set_name: String) -> Result<(),
         },
         GLUCOSE_HEART_RATE_ADAPTER => {
             set_adapter(adapter, GLUCOSE_HEART_RATE_ADAPTER.to_owned())?;
-            let _ = create_glucose_heart_rate_devices(adapter)?;
+            create_glucose_heart_rate_devices(adapter)?;
         },
         UNICODE_DEVICE_ADAPTER => {
             set_adapter(adapter, UNICODE_DEVICE_ADAPTER.to_owned())?;
@@ -561,12 +554,12 @@ pub fn test(manager: &mut BluetoothManager, data_set_name: String) -> Result<(),
                 MISSING_CHARACTERISTIC_HEART_RATE_ADAPTER.to_owned(),
             )?;
 
-            let _ = create_missing_characterisitc_heart_rate_device(adapter)?;
+            create_missing_characterisitc_heart_rate_device(adapter)?;
         },
         MISSING_DESCRIPTOR_HEART_RATE_ADAPTER => {
             set_adapter(adapter, MISSING_DESCRIPTOR_HEART_RATE_ADAPTER.to_owned())?;
 
-            let _ = create_missing_descriptor_heart_rate_device(adapter)?;
+            create_missing_descriptor_heart_rate_device(adapter)?;
         },
         HEART_RATE_ADAPTER => {
             set_adapter(adapter, HEART_RATE_ADAPTER.to_owned())?;
@@ -588,14 +581,14 @@ pub fn test(manager: &mut BluetoothManager, data_set_name: String) -> Result<(),
         TWO_HEART_RATE_SERVICES_ADAPTER => {
             set_adapter(adapter, TWO_HEART_RATE_SERVICES_ADAPTER.to_owned())?;
 
-            let _ = create_two_heart_rate_services_device(adapter)?;
+            create_two_heart_rate_services_device(adapter)?;
         },
         BLOCKLIST_TEST_ADAPTER => {
             set_adapter(adapter, BLOCKLIST_TEST_ADAPTER.to_owned())?;
 
-            let _ = create_blocklisted_device(adapter)?;
+            create_blocklisted_device(adapter)?;
         },
         _ => return Err(Box::from(WRONG_DATA_SET_ERROR.to_string())),
     }
-    return Ok(());
+    Ok(())
 }

components/canvas/Cargo.toml

@@ -1,44 +1,46 @@
 [package]
 name = "canvas"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "canvas"
 path = "lib.rs"
 
 [features]
-no-wgl = ["surfman/sm-no-wgl"]
 webgl_backtrace = ["canvas_traits/webgl_backtrace"]
-xr-profile = ["webxr-api/profile", "time"]
 
 [dependencies]
+app_units = { workspace = true }
 bitflags = { workspace = true }
 byteorder = { workspace = true }
 canvas_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 cssparser = { workspace = true }
 euclid = { workspace = true }
-font-kit = "0.11"
+font-kit = { version = "0.14" }
 fnv = { workspace = true }
-gfx = { path = "../gfx" }
+fonts = { path = "../fonts" }
 half = "2"
 ipc-channel = { workspace = true }
 log = { workspace = true }
 lyon_geom = "1.0.4"
+net_traits = { workspace = true }
 num-traits = { workspace = true }
+parking_lot = { workspace = true }
 pathfinder_geometry = "0.5"
 pixels = { path = "../pixels" }
-raqote = "0.8.2"
-servo_arc = { path = "../servo_arc" }
+range = { path = "../range" }
+raqote = { git = "https://github.com/jrmuizel/raqote", rev = "64716c8" }
+servo_arc = { workspace = true }
 sparkle = { workspace = true }
-style = { path = "../style" }
+style = { workspace = true }
 style_traits = { workspace = true }
 surfman = { workspace = true }
-time = { workspace = true, optional = true }
+unicode-script = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
 webrender_traits = { workspace = true }

components/canvas/canvas_data.rs

@@ -2,33 +2,30 @@
  * 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::cell::RefCell;
 use std::mem;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
+use app_units::Au;
 use canvas_traits::canvas::*;
-use cssparser::RGBA;
-use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
-use euclid::{point2, vec2};
-use font_kit::family_name::FamilyName;
-use font_kit::font::Font;
-use font_kit::metrics::Metrics;
-use font_kit::properties::{Properties, Stretch, Style, Weight};
-use font_kit::source::SystemSource;
-use gfx::font::FontHandleMethods;
-use gfx::font_cache_thread::FontCacheThread;
-use gfx::font_context::FontContext;
+use euclid::default::{Box2D, Point2D, Rect, Size2D, Transform2D, Vector2D};
+use euclid::point2;
+use fonts::{
+    ByteIndex, FontBaseline, FontCacheThread, FontContext, FontGroup, FontMetrics, FontRef,
+    GlyphInfo, GlyphStore, ShapingFlags, ShapingOptions, LAST_RESORT_GLYPH_ADVANCE,
+};
 use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
-use log::{debug, error, warn};
+use log::{debug, warn};
 use num_traits::ToPrimitive;
+use range::Range;
 use servo_arc::Arc as ServoArc;
+use style::color::AbsoluteColor;
 use style::properties::style_structs::Font as FontStyleStruct;
-use style::values::computed::font;
-use style_traits::values::ToCss;
+use unicode_script::Script;
 use webrender_api::units::{DeviceIntSize, RectExt as RectExt_};
 use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat, ImageKey};
+use webrender_traits::ImageUpdate;
 
-use crate::canvas_paint_thread::{AntialiasMode, ImageUpdate, WebrenderApi};
+use crate::canvas_paint_thread::{AntialiasMode, WebrenderApi};
 use crate::raqote_backend::Repetition;
 
 /// The canvas data stores a state machine for the current status of
@@ -74,23 +71,23 @@ impl PathState {
 pub trait Backend {
     fn get_composition_op(&self, opts: &DrawOptions) -> CompositionOp;
     fn need_to_draw_shadow(&self, color: &Color) -> bool;
-    fn set_shadow_color<'a>(&mut self, color: RGBA, state: &mut CanvasPaintState<'a>);
-    fn set_fill_style<'a>(
+    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_>);
+    fn set_fill_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
         drawtarget: &dyn GenericDrawTarget,
     );
-    fn set_stroke_style<'a>(
+    fn set_stroke_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
         drawtarget: &dyn GenericDrawTarget,
     );
-    fn set_global_composition<'a>(
+    fn set_global_composition(
         &mut self,
         op: CompositionOrBlending,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
     );
     fn create_drawtarget(&self, size: Size2D<u64>) -> Box<dyn GenericDrawTarget>;
     fn recreate_paint_state<'a>(&self, state: &CanvasPaintState<'a>) -> CanvasPaintState<'a>;
@@ -114,6 +111,7 @@ pub trait GenericPathBuilder {
         control_point3: &Point2D<f32>,
     );
     fn close(&mut self);
+    #[allow(clippy::too_many_arguments)]
     fn ellipse(
         &mut self,
         origin: Point2D<f32>,
@@ -195,6 +193,7 @@ impl<'a> PathBuilderRef<'a> {
             .arc(center, radius, start_angle, end_angle, ccw);
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn ellipse(
         &mut self,
         center: &Point2D<f32>,
@@ -222,10 +221,9 @@ impl<'a> PathBuilderRef<'a> {
             Some(i) => i,
             None => return None,
         };
-        match self.builder.get_current_point() {
-            Some(point) => Some(inverse.transform_point(Point2D::new(point.x, point.y))),
-            None => None,
-        }
+        self.builder
+            .get_current_point()
+            .map(|point| inverse.transform_point(Point2D::new(point.x, point.y)))
     }
 
     fn close(&mut self) {
@@ -233,10 +231,78 @@ impl<'a> PathBuilderRef<'a> {
     }
 }
 
-// TODO(pylbrecht)
-// This defines required methods for DrawTarget of azure and raqote
-// The prototypes are derived from azure's methods.
-// TODO: De-abstract now that Azure is removed?
+#[derive(Debug, Default)]
+struct UnshapedTextRun<'a> {
+    font: Option<FontRef>,
+    script: Script,
+    string: &'a str,
+}
+
+impl<'a> UnshapedTextRun<'a> {
+    fn script_and_font_compatible(&self, script: Script, other_font: &Option<FontRef>) -> bool {
+        if self.script != script {
+            return false;
+        }
+
+        match (&self.font, other_font) {
+            (Some(font_a), Some(font_b)) => font_a.identifier() == font_b.identifier(),
+            (None, None) => true,
+            _ => false,
+        }
+    }
+
+    fn into_shaped_text_run(self) -> Option<TextRun> {
+        let font = self.font?;
+        if self.string.is_empty() {
+            return None;
+        }
+
+        let word_spacing = Au::from_f64_px(
+            font.glyph_index(' ')
+                .map(|glyph_id| font.glyph_h_advance(glyph_id))
+                .unwrap_or(LAST_RESORT_GLYPH_ADVANCE),
+        );
+        let options = ShapingOptions {
+            letter_spacing: None,
+            word_spacing,
+            script: self.script,
+            flags: ShapingFlags::empty(),
+        };
+        let glyphs = font.shape_text(self.string, &options);
+        Some(TextRun { font, glyphs })
+    }
+}
+
+pub struct TextRun {
+    pub font: FontRef,
+    pub glyphs: Arc<GlyphStore>,
+}
+
+impl TextRun {
+    fn bounding_box(&self) -> Rect<f32> {
+        let mut bounding_box = None;
+        let mut bounds_offset: f32 = 0.;
+        let glyph_ids = self
+            .glyphs
+            .iter_glyphs_for_byte_range(&Range::new(ByteIndex(0), self.glyphs.len()))
+            .map(GlyphInfo::id);
+        for glyph_id in glyph_ids {
+            let bounds = self.font.typographic_bounds(glyph_id);
+            let amount = Vector2D::new(bounds_offset, 0.);
+            let bounds = bounds.translate(amount);
+            let initiated_bbox = bounding_box.get_or_insert_with(|| {
+                let origin = Point2D::new(bounds.min_x(), 0.);
+                Box2D::new(origin, origin).to_rect()
+            });
+            bounding_box = Some(initiated_bbox.union(&bounds));
+            bounds_offset = bounds.max_x();
+        }
+        bounding_box.unwrap_or_default()
+    }
+}
+
+// This defines required methods for a DrawTarget (currently only implemented for raqote).  The
+// prototypes are derived from the now-removed Azure backend's methods.
 pub trait GenericDrawTarget {
     fn clear_rect(&mut self, rect: &Rect<f32>);
     fn copy_surface(
@@ -269,9 +335,7 @@ pub trait GenericDrawTarget {
     fn fill(&mut self, path: &Path, pattern: Pattern, draw_options: &DrawOptions);
     fn fill_text(
         &mut self,
-        font: &Font,
-        point_size: f32,
-        text: &str,
+        text_runs: Vec<TextRun>,
         start: Point2D<f32>,
         pattern: &Pattern,
         draw_options: &DrawOptions,
@@ -358,21 +422,6 @@ pub enum Filter {
     Nearest,
 }
 
-pub(crate) type CanvasFontContext = FontContext<FontCacheThread>;
-
-thread_local!(static FONT_CONTEXT: RefCell<Option<CanvasFontContext>> = RefCell::new(None));
-
-pub(crate) fn with_thread_local_font_context<F, R>(canvas_data: &CanvasData, f: F) -> R
-where
-    F: FnOnce(&mut CanvasFontContext) -> R,
-{
-    FONT_CONTEXT.with(|font_context| {
-        f(font_context.borrow_mut().get_or_insert_with(|| {
-            FontContext::new(canvas_data.font_cache_thread.lock().unwrap().clone())
-        }))
-    })
-}
-
 pub struct CanvasData<'a> {
     backend: Box<dyn Backend>,
     drawtarget: Box<dyn GenericDrawTarget>,
@@ -385,7 +434,7 @@ pub struct CanvasData<'a> {
     old_image_key: Option<ImageKey>,
     /// An old webrender image key that can be deleted when the current epoch ends.
     very_old_image_key: Option<ImageKey>,
-    font_cache_thread: Mutex<FontCacheThread>,
+    font_context: Arc<FontContext<FontCacheThread>>,
 }
 
 fn create_backend() -> Box<dyn Backend> {
@@ -397,7 +446,7 @@ impl<'a> CanvasData<'a> {
         size: Size2D<u64>,
         webrender_api: Box<dyn WebrenderApi>,
         antialias: AntialiasMode,
-        font_cache_thread: FontCacheThread,
+        font_context: Arc<FontContext<FontCacheThread>>,
     ) -> CanvasData<'a> {
         let backend = create_backend();
         let draw_target = backend.create_drawtarget(size);
@@ -411,7 +460,7 @@ impl<'a> CanvasData<'a> {
             image_key: None,
             old_image_key: None,
             very_old_image_key: None,
-            font_cache_thread: Mutex::new(font_cache_thread),
+            font_context,
         }
     }
 
@@ -428,7 +477,7 @@ impl<'a> CanvasData<'a> {
         let source_rect = source_rect.ceil();
         // It discards the extra pixels (if any) that won't be painted
         let image_data = if Rect::from_size(image_size).contains_rect(&source_rect) {
-            pixels::rgba8_get_rect(&image_data, image_size.to_u64(), source_rect.to_u64()).into()
+            pixels::rgba8_get_rect(image_data, image_size.to_u64(), source_rect.to_u64()).into()
         } else {
             image_data.into()
         };
@@ -471,7 +520,85 @@ impl<'a> CanvasData<'a> {
         }
     }
 
-    // https://html.spec.whatwg.org/multipage/#text-preparation-algorithm
+    pub fn fill_text_with_size(
+        &mut self,
+        text: String,
+        x: f64,
+        y: f64,
+        max_width: Option<f64>,
+        is_rtl: bool,
+        size: f64,
+    ) {
+        // > Step 2: Replace all ASCII whitespace in text with U+0020 SPACE characters.
+        let text = replace_ascii_whitespace(text);
+
+        // > Step 3: Let font be the current font of target, as given by that object's font
+        // > attribute.
+        let Some(ref font_style) = self.state.font_style else {
+            return;
+        };
+
+        let font_group = self
+            .font_context
+            .font_group_with_size(font_style.clone(), Au::from_f64_px(size));
+        let mut font_group = font_group.write();
+        let Some(first_font) = font_group.first(&self.font_context) else {
+            warn!("Could not render canvas text, because there was no first font.");
+            return;
+        };
+
+        let runs = self.build_unshaped_text_runs(&text, &mut font_group);
+        // TODO: This doesn't do any kind of line layout at all. In particular, there needs
+        // to be some alignment along a baseline and also support for bidi text.
+        let shaped_runs: Vec<_> = runs
+            .into_iter()
+            .filter_map(UnshapedTextRun::into_shaped_text_run)
+            .collect();
+        let total_advance = shaped_runs
+            .iter()
+            .map(|run| run.glyphs.total_advance())
+            .sum::<Au>()
+            .to_f64_px();
+
+        // > Step 6: If maxWidth was provided and the hypothetical width of the inline box in the
+        // > hypothetical line box is greater than maxWidth CSS pixels, then change font to have a
+        // > more condensed font (if one is available or if a reasonably readable one can be
+        // > synthesized by applying a horizontal scale factor to the font) or a smaller font, and
+        // > return to the previous step.
+        //
+        // TODO: We only try decreasing the font size here. Eventually it would make sense to use
+        // other methods to try to decrease the size, such as finding a narrower font or decreasing
+        // spacing.
+        if let Some(max_width) = max_width {
+            let new_size = (max_width / total_advance * size).floor().max(5.);
+            if total_advance > max_width && new_size != size {
+                self.fill_text_with_size(text, x, y, Some(max_width), is_rtl, new_size);
+                return;
+            }
+        }
+
+        // > Step 7: Find the anchor point for the line of text.
+        let start = self.find_anchor_point_for_line_of_text(
+            x as f32,
+            y as f32,
+            &first_font.metrics,
+            total_advance as f32,
+            is_rtl,
+        );
+
+        // > Step 8: Let result be an array constructed by iterating over each glyph in the inline box
+        // > from left to right (if any), adding to the array, for each glyph, the shape of the glyph
+        // > as it is in the inline box, positioned on a coordinate space using CSS pixels with its
+        // > origin is at the anchor point.
+        self.drawtarget.fill_text(
+            shaped_runs,
+            start,
+            &self.state.fill_style,
+            &self.state.draw_options,
+        );
+    }
+
+    /// <https://html.spec.whatwg.org/multipage/#text-preparation-algorithm>
     pub fn fill_text(
         &mut self,
         text: String,
@@ -480,81 +607,138 @@ impl<'a> CanvasData<'a> {
         max_width: Option<f64>,
         is_rtl: bool,
     ) {
-        // Step 2.
-        let text = replace_ascii_whitespace(text);
-
-        // Step 3.
-        let point_size = self
-            .state
-            .font_style
-            .as_ref()
-            .map_or(10., |style| style.font_size.computed_size().px());
-        let font_style = self.state.font_style.as_ref();
-        let font = font_style.map_or_else(
-            || load_system_font_from_style(None),
-            |style| {
-                with_thread_local_font_context(&self, |font_context| {
-                    let font_group = font_context.font_group(ServoArc::new(style.clone()));
-                    let font = font_group
-                        .borrow_mut()
-                        .first(font_context)
-                        .expect("couldn't find font");
-                    let font = font.borrow_mut();
-                    let template = font.handle.template();
-                    Font::from_bytes(Arc::new(template.bytes()), 0)
-                        .ok()
-                        .or_else(|| load_system_font_from_style(Some(style)))
-                })
-            },
-        );
-        let font = match font {
-            Some(f) => f,
-            None => {
-                error!("Couldn't load desired font or system fallback.");
-                return;
-            },
-        };
-        let font_width = font_width(&text, point_size, &font);
-
-        // Step 6.
-        let max_width = max_width.map(|width| width as f32);
-        let (width, scale_factor) = match max_width {
-            Some(max_width) if max_width > font_width => (max_width, 1.),
-            Some(max_width) => (font_width, max_width / font_width),
-            None => (font_width, 1.),
+        let Some(ref font_style) = self.state.font_style else {
+            return;
         };
 
-        // Step 7.
-        let start = self.text_origin(x as f32, y as f32, &font.metrics(), width, is_rtl);
-
-        // TODO: Bidi text layout
-
-        let old_transform = self.get_transform();
-        self.set_transform(
-            &old_transform
-                .pre_translate(vec2(start.x, 0.))
-                .pre_scale(scale_factor, 1.)
-                .pre_translate(vec2(-start.x, 0.)),
-        );
-
-        // Step 8.
-        self.drawtarget.fill_text(
-            &font,
-            point_size,
-            &text,
-            start,
-            &self.state.fill_style,
-            &self.state.draw_options,
-        );
-
-        self.set_transform(&old_transform);
+        let size = font_style.font_size.computed_size();
+        self.fill_text_with_size(text, x, y, max_width, is_rtl, size.px() as f64);
     }
 
-    fn text_origin(
+    /// <https://html.spec.whatwg.org/multipage/#text-preparation-algorithm>
+    /// <https://html.spec.whatwg.org/multipage/#dom-context-2d-measuretext>
+    pub fn measure_text(&mut self, text: String) -> TextMetrics {
+        // > Step 2: Replace all ASCII whitespace in text with U+0020 SPACE characters.
+        let text = replace_ascii_whitespace(text);
+        let Some(ref font_style) = self.state.font_style else {
+            return TextMetrics::default();
+        };
+
+        let font_group = self.font_context.font_group(font_style.clone());
+        let mut font_group = font_group.write();
+        let font = font_group
+            .first(&self.font_context)
+            .expect("couldn't find font");
+        let ascent = font.metrics.ascent.to_f32_px();
+        let descent = font.metrics.descent.to_f32_px();
+        let runs = self.build_unshaped_text_runs(&text, &mut font_group);
+
+        let shaped_runs: Vec<_> = runs
+            .into_iter()
+            .filter_map(UnshapedTextRun::into_shaped_text_run)
+            .collect();
+        let total_advance = shaped_runs
+            .iter()
+            .map(|run| run.glyphs.total_advance())
+            .sum::<Au>()
+            .to_f32_px();
+        let bounding_box = shaped_runs
+            .iter()
+            .map(TextRun::bounding_box)
+            .reduce(|a, b| {
+                let amount = Vector2D::new(a.max_x(), 0.);
+                let bounding_box = b.translate(amount);
+                a.union(&bounding_box)
+            })
+            .unwrap_or_default();
+
+        let FontBaseline {
+            ideographic_baseline,
+            alphabetic_baseline,
+            hanging_baseline,
+        } = match font.get_baseline() {
+            Some(baseline) => baseline,
+            None => FontBaseline {
+                hanging_baseline: ascent * HANGING_BASELINE_DEFAULT,
+                ideographic_baseline: -descent * IDEOGRAPHIC_BASELINE_DEFAULT,
+                alphabetic_baseline: 0.,
+            },
+        };
+
+        let anchor_x = match self.state.text_align {
+            TextAlign::End => total_advance,
+            TextAlign::Center => total_advance / 2.,
+            TextAlign::Right => total_advance,
+            _ => 0.,
+        };
+        let anchor_y = match self.state.text_baseline {
+            TextBaseline::Top => ascent,
+            TextBaseline::Hanging => hanging_baseline,
+            TextBaseline::Ideographic => ideographic_baseline,
+            TextBaseline::Middle => (ascent - descent) / 2.,
+            TextBaseline::Alphabetic => alphabetic_baseline,
+            TextBaseline::Bottom => -descent,
+        };
+
+        TextMetrics {
+            width: total_advance,
+            actual_boundingbox_left: anchor_x - bounding_box.min_x(),
+            actual_boundingbox_right: bounding_box.max_x() - anchor_x,
+            actual_boundingbox_ascent: bounding_box.max_y() - anchor_y,
+            actual_boundingbox_descent: anchor_y - bounding_box.min_y(),
+            font_boundingbox_ascent: ascent - anchor_y,
+            font_boundingbox_descent: descent + anchor_y,
+            em_height_ascent: ascent - anchor_y,
+            em_height_descent: descent + anchor_y,
+            hanging_baseline: hanging_baseline - anchor_y,
+            alphabetic_baseline: alphabetic_baseline - anchor_y,
+            ideographic_baseline: ideographic_baseline - anchor_y,
+        }
+    }
+
+    fn build_unshaped_text_runs<'b>(
+        &self,
+        text: &'b str,
+        font_group: &mut FontGroup,
+    ) -> Vec<UnshapedTextRun<'b>> {
+        let mut runs = Vec::new();
+        let mut current_text_run = UnshapedTextRun::default();
+        let mut current_text_run_start_index = 0;
+
+        for (index, character) in text.char_indices() {
+            // TODO: This should ultimately handle emoji variation selectors, but raqote does not yet
+            // have support for color glyphs.
+            let script = Script::from(character);
+            let font = font_group.find_by_codepoint(&self.font_context, character, None);
+
+            if !current_text_run.script_and_font_compatible(script, &font) {
+                let previous_text_run = mem::replace(
+                    &mut current_text_run,
+                    UnshapedTextRun {
+                        font: font.clone(),
+                        script,
+                        ..Default::default()
+                    },
+                );
+                current_text_run_start_index = index;
+                runs.push(previous_text_run)
+            }
+
+            current_text_run.string =
+                &text[current_text_run_start_index..index + character.len_utf8()];
+        }
+
+        runs.push(current_text_run);
+        runs
+    }
+
+    /// Find the *anchor_point* for the given parameters of a line of text.
+    /// See <https://html.spec.whatwg.org/multipage/#text-preparation-algorithm>.
+    fn find_anchor_point_for_line_of_text(
         &self,
         x: f32,
         y: f32,
-        metrics: &Metrics,
+        metrics: &FontMetrics,
         width: f32,
         is_rtl: bool,
     ) -> Point2D<f32> {
@@ -571,13 +755,15 @@ impl<'a> CanvasData<'a> {
             _ => 0.,
         };
 
+        let ascent = metrics.ascent.to_f32_px();
+        let descent = metrics.descent.to_f32_px();
         let anchor_y = match self.state.text_baseline {
-            TextBaseline::Top => metrics.ascent,
-            TextBaseline::Hanging => metrics.ascent * HANGING_BASELINE_DEFAULT,
-            TextBaseline::Ideographic => -metrics.descent * IDEOGRAPHIC_BASELINE_DEFAULT,
-            TextBaseline::Middle => (metrics.ascent - metrics.descent) / 2.,
+            TextBaseline::Top => ascent,
+            TextBaseline::Hanging => ascent * HANGING_BASELINE_DEFAULT,
+            TextBaseline::Ideographic => -descent * IDEOGRAPHIC_BASELINE_DEFAULT,
+            TextBaseline::Middle => (ascent - descent) / 2.,
             TextBaseline::Alphabetic => 0.,
-            TextBaseline::Bottom => -metrics.descent,
+            TextBaseline::Bottom => -descent,
         };
 
         point2(x + anchor_x, y + anchor_y)
@@ -651,7 +837,7 @@ impl<'a> CanvasData<'a> {
         }
 
         if self.need_to_draw_shadow() {
-            self.draw_with_shadow(&rect, |new_draw_target: &mut dyn GenericDrawTarget| {
+            self.draw_with_shadow(rect, |new_draw_target: &mut dyn GenericDrawTarget| {
                 new_draw_target.stroke_rect(
                     rect,
                     self.state.stroke_style.clone(),
@@ -918,7 +1104,7 @@ impl<'a> CanvasData<'a> {
             Some(p) => p,
             None => {
                 self.path_builder().move_to(cp1);
-                cp1.clone()
+                *cp1
             },
         };
         let cp1 = *cp1;
@@ -979,6 +1165,7 @@ impl<'a> CanvasData<'a> {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn ellipse(
         &mut self,
         center: &Point2D<f32>,
@@ -1042,7 +1229,7 @@ impl<'a> CanvasData<'a> {
                 }
             },
         }
-        self.state.transform = transform.clone();
+        self.state.transform = *transform;
         self.drawtarget.set_transform(transform)
     }
 
@@ -1100,14 +1287,13 @@ impl<'a> CanvasData<'a> {
         match self.image_key {
             Some(image_key) => {
                 debug!("Updating image {:?}.", image_key);
-                updates.push(ImageUpdate::Update(image_key, descriptor, data));
+                updates.push(ImageUpdate::UpdateImage(image_key, descriptor, data));
             },
             None => {
-                let key = match self.webrender_api.generate_key() {
-                    Ok(key) => key,
-                    Err(()) => return,
+                let Some(key) = self.webrender_api.generate_key() else {
+                    return;
                 };
-                updates.push(ImageUpdate::Add(key, descriptor, data));
+                updates.push(ImageUpdate::AddImage(key, descriptor, data));
                 self.image_key = Some(key);
                 debug!("New image {:?}.", self.image_key);
             },
@@ -1116,7 +1302,7 @@ impl<'a> CanvasData<'a> {
         if let Some(image_key) =
             mem::replace(&mut self.very_old_image_key, self.old_image_key.take())
         {
-            updates.push(ImageUpdate::Delete(image_key));
+            updates.push(ImageUpdate::DeleteImage(image_key));
         }
 
         self.webrender_api.update_images(updates);
@@ -1155,12 +1341,12 @@ impl<'a> CanvasData<'a> {
         self.state.shadow_blur = value;
     }
 
-    pub fn set_shadow_color(&mut self, value: RGBA) {
+    pub fn set_shadow_color(&mut self, value: AbsoluteColor) {
         self.backend.set_shadow_color(value, &mut self.state);
     }
 
     pub fn set_font(&mut self, font_style: FontStyleStruct) {
-        self.state.font_style = Some(font_style)
+        self.state.font_style = Some(ServoArc::new(font_style))
     }
 
     pub fn set_text_align(&mut self, text_align: TextAlign) {
@@ -1200,10 +1386,7 @@ impl<'a> CanvasData<'a> {
         draw_shadow_source(&mut *new_draw_target);
         self.drawtarget.draw_surface_with_shadow(
             new_draw_target.snapshot(),
-            &Point2D::new(
-                shadow_src_rect.origin.x as f32,
-                shadow_src_rect.origin.y as f32,
-            ),
+            &Point2D::new(shadow_src_rect.origin.x, shadow_src_rect.origin.y),
             &self.state.shadow_color,
             &Vector2D::new(
                 self.state.shadow_offset_x as f32,
@@ -1237,10 +1420,10 @@ impl<'a> Drop for CanvasData<'a> {
     fn drop(&mut self) {
         let mut updates = vec![];
         if let Some(image_key) = self.old_image_key.take() {
-            updates.push(ImageUpdate::Delete(image_key));
+            updates.push(ImageUpdate::DeleteImage(image_key));
         }
         if let Some(image_key) = self.very_old_image_key.take() {
-            updates.push(ImageUpdate::Delete(image_key));
+            updates.push(ImageUpdate::DeleteImage(image_key));
         }
 
         self.webrender_api.update_images(updates);
@@ -1262,7 +1445,7 @@ pub struct CanvasPaintState<'a> {
     pub shadow_offset_y: f64,
     pub shadow_blur: f64,
     pub shadow_color: Color,
-    pub font_style: Option<FontStyleStruct>,
+    pub font_style: Option<ServoArc<FontStyleStruct>>,
     pub text_align: TextAlign,
     pub text_baseline: TextBaseline,
 }
@@ -1353,71 +1536,6 @@ impl RectExt for Rect<u32> {
     }
 }
 
-fn to_font_kit_family(font_family: &font::SingleFontFamily) -> FamilyName {
-    match font_family {
-        font::SingleFontFamily::FamilyName(family_name) => {
-            FamilyName::Title(family_name.to_css_string())
-        },
-        font::SingleFontFamily::Generic(generic) => match generic {
-            font::GenericFontFamily::Serif => FamilyName::Serif,
-            font::GenericFontFamily::SansSerif => FamilyName::SansSerif,
-            font::GenericFontFamily::Monospace => FamilyName::Monospace,
-            font::GenericFontFamily::Fantasy => FamilyName::Fantasy,
-            font::GenericFontFamily::Cursive => FamilyName::Cursive,
-            // TODO: There is no FontFamily::SystemUi.
-            font::GenericFontFamily::SystemUi => unreachable!("system-ui should be disabled"),
-            font::GenericFontFamily::None => unreachable!("Shouldn't appear in computed values"),
-        },
-    }
-}
-
-fn load_system_font_from_style(font_style: Option<&FontStyleStruct>) -> Option<Font> {
-    let mut properties = Properties::new();
-    let style = match font_style {
-        Some(style) => style,
-        None => return load_default_system_fallback_font(&properties),
-    };
-    let family_names = style
-        .font_family
-        .families
-        .iter()
-        .map(to_font_kit_family)
-        .collect::<Vec<_>>();
-    let properties = properties
-        .style(match style.font_style {
-            font::FontStyle::NORMAL => Style::Normal,
-            font::FontStyle::ITALIC => Style::Italic,
-            _ => {
-                // TODO: support oblique angle.
-                Style::Oblique
-            },
-        })
-        .weight(Weight(style.font_weight.value()))
-        .stretch(Stretch(style.font_stretch.to_percentage().0));
-    let font_handle = match SystemSource::new().select_best_match(&family_names, &properties) {
-        Ok(handle) => handle,
-        Err(e) => {
-            error!("error getting font handle for style {:?}: {}", style, e);
-            return load_default_system_fallback_font(&properties);
-        },
-    };
-    match font_handle.load() {
-        Ok(f) => Some(f),
-        Err(e) => {
-            error!("error loading font for style {:?}: {}", style, e);
-            load_default_system_fallback_font(&properties)
-        },
-    }
-}
-
-fn load_default_system_fallback_font(properties: &Properties) -> Option<Font> {
-    SystemSource::new()
-        .select_best_match(&[FamilyName::SansSerif], properties)
-        .ok()?
-        .load()
-        .ok()
-}
-
 fn replace_ascii_whitespace(text: String) -> String {
     text.chars()
         .map(|c| match c {
@@ -1426,18 +1544,3 @@ fn replace_ascii_whitespace(text: String) -> String {
         })
         .collect()
 }
-
-// TODO: This currently calculates the width using just advances and doesn't
-// determine the fallback font in case a character glyph isn't found.
-fn font_width(text: &str, point_size: f32, font: &Font) -> f32 {
-    let metrics = font.metrics();
-    let mut width = 0.;
-    for c in text.chars() {
-        if let Some(glyph_id) = font.glyph_for_char(c) {
-            if let Ok(advance) = font.advance(glyph_id) {
-                width += advance.x() * point_size / metrics.units_per_em as f32;
-            }
-        }
-    }
-    width
-}

components/canvas/canvas_paint_thread.rs

@@ -4,17 +4,20 @@
 
 use std::borrow::ToOwned;
 use std::collections::HashMap;
+use std::sync::Arc;
 use std::thread;
 
 use canvas_traits::canvas::*;
 use canvas_traits::ConstellationCanvasMsg;
 use crossbeam_channel::{select, unbounded, Sender};
 use euclid::default::Size2D;
-use gfx::font_cache_thread::FontCacheThread;
+use fonts::{FontCacheThread, FontContext};
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use log::warn;
-use webrender_api::{ImageData, ImageDescriptor, ImageKey};
+use net_traits::ResourceThreads;
+use webrender_api::ImageKey;
+use webrender_traits::ImageUpdate;
 
 use crate::canvas_data::*;
 
@@ -23,14 +26,9 @@ pub enum AntialiasMode {
     None,
 }
 
-pub enum ImageUpdate {
-    Add(ImageKey, ImageDescriptor, ImageData),
-    Update(ImageKey, ImageDescriptor, ImageData),
-    Delete(ImageKey),
-}
-
 pub trait WebrenderApi {
-    fn generate_key(&self) -> Result<ImageKey, ()>;
+    /// Attempt to generate an [`ImageKey`], returning `None` in case of failure.
+    fn generate_key(&self) -> Option<ImageKey>;
     fn update_images(&self, updates: Vec<ImageUpdate>);
     fn clone(&self) -> Box<dyn WebrenderApi>;
 }
@@ -39,19 +37,20 @@ pub struct CanvasPaintThread<'a> {
     canvases: HashMap<CanvasId, CanvasData<'a>>,
     next_canvas_id: CanvasId,
     webrender_api: Box<dyn WebrenderApi>,
-    font_cache_thread: FontCacheThread,
+    font_context: Arc<FontContext<FontCacheThread>>,
 }
 
 impl<'a> CanvasPaintThread<'a> {
     fn new(
         webrender_api: Box<dyn WebrenderApi>,
         font_cache_thread: FontCacheThread,
+        resource_threads: ResourceThreads,
     ) -> CanvasPaintThread<'a> {
         CanvasPaintThread {
             canvases: HashMap::new(),
             next_canvas_id: CanvasId(0),
             webrender_api,
-            font_cache_thread,
+            font_context: Arc::new(FontContext::new(font_cache_thread, resource_threads)),
         }
     }
 
@@ -60,6 +59,7 @@ impl<'a> CanvasPaintThread<'a> {
     pub fn start(
         webrender_api: Box<dyn WebrenderApi + Send>,
         font_cache_thread: FontCacheThread,
+        resource_threads: ResourceThreads,
     ) -> (Sender<ConstellationCanvasMsg>, IpcSender<CanvasMsg>) {
         let (ipc_sender, ipc_receiver) = ipc::channel::<CanvasMsg>().unwrap();
         let msg_receiver = ROUTER.route_ipc_receiver_to_new_crossbeam_receiver(ipc_receiver);
@@ -67,7 +67,8 @@ impl<'a> CanvasPaintThread<'a> {
         thread::Builder::new()
             .name("Canvas".to_owned())
             .spawn(move || {
-                let mut canvas_paint_thread = CanvasPaintThread::new(webrender_api, font_cache_thread);
+                let mut canvas_paint_thread = CanvasPaintThread::new(
+                    webrender_api, font_cache_thread, resource_threads);
                 loop {
                     select! {
                         recv(msg_receiver) -> msg => {
@@ -128,18 +129,16 @@ impl<'a> CanvasPaintThread<'a> {
             AntialiasMode::None
         };
 
-        let font_cache_thread = self.font_cache_thread.clone();
-
-        let canvas_id = self.next_canvas_id.clone();
+        let canvas_id = self.next_canvas_id;
         self.next_canvas_id.0 += 1;
 
         let canvas_data = CanvasData::new(
             size,
             self.webrender_api.clone(),
             antialias,
-            font_cache_thread,
+            self.font_context.clone(),
         );
-        self.canvases.insert(canvas_id.clone(), canvas_data);
+        self.canvases.insert(canvas_id, canvas_data);
 
         canvas_id
     }
@@ -181,7 +180,7 @@ impl<'a> CanvasPaintThread<'a> {
                 source_rect,
                 smoothing_enabled,
             ) => self.canvas(canvas_id).draw_image(
-                &*image_data,
+                image_data,
                 image_size,
                 dest_rect,
                 source_rect,
@@ -235,6 +234,10 @@ impl<'a> CanvasPaintThread<'a> {
             Canvas2dMsg::Ellipse(ref center, radius_x, radius_y, rotation, start, end, ccw) => self
                 .canvas(canvas_id)
                 .ellipse(center, radius_x, radius_y, rotation, start, end, ccw),
+            Canvas2dMsg::MeasureText(text, sender) => {
+                let metrics = self.canvas(canvas_id).measure_text(text);
+                sender.send(metrics).unwrap();
+            },
             Canvas2dMsg::RestoreContext => self.canvas(canvas_id).restore_context_state(),
             Canvas2dMsg::SaveContext => self.canvas(canvas_id).save_context_state(),
             Canvas2dMsg::SetLineWidth(width) => self.canvas(canvas_id).set_line_width(width),

components/canvas/raqote_backend.rs

@@ -2,22 +2,36 @@
  * 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::cell::RefCell;
+use std::collections::HashMap;
+
 use canvas_traits::canvas::*;
-use cssparser::RGBA;
+use cssparser::color::clamp_unit_f32;
 use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
 use euclid::Angle;
 use font_kit::font::Font;
+use fonts::{ByteIndex, FontIdentifier, FontTemplateRefMethods};
 use log::warn;
 use lyon_geom::Arc;
+use range::Range;
 use raqote::PathOp;
+use style::color::AbsoluteColor;
 
-use crate::canvas_data;
 use crate::canvas_data::{
-    Backend, CanvasPaintState, Color, CompositionOp, DrawOptions, Filter, GenericDrawTarget,
-    GenericPathBuilder, GradientStop, GradientStops, Path, SourceSurface, StrokeOptions,
+    self, Backend, CanvasPaintState, Color, CompositionOp, DrawOptions, Filter, GenericDrawTarget,
+    GenericPathBuilder, GradientStop, GradientStops, Path, SourceSurface, StrokeOptions, TextRun,
 };
 use crate::canvas_paint_thread::AntialiasMode;
 
+thread_local! {
+    /// The shared font cache used by all canvases that render on a thread. It would be nicer
+    /// to have a global cache, but it looks like font-kit uses a per-thread FreeType, so
+    /// in order to ensure that fonts are particular to a thread we have to make our own
+    /// cache thread local as well.
+    static SHARED_FONT_CACHE: RefCell<HashMap<FontIdentifier, Font>> = RefCell::default();
+}
+
+#[derive(Default)]
 pub struct RaqoteBackend;
 
 impl Backend for RaqoteBackend {
@@ -29,14 +43,14 @@ impl Backend for RaqoteBackend {
         color.as_raqote().a != 0
     }
 
-    fn set_shadow_color<'a>(&mut self, color: RGBA, state: &mut CanvasPaintState<'a>) {
+    fn set_shadow_color(&mut self, color: AbsoluteColor, state: &mut CanvasPaintState<'_>) {
         state.shadow_color = Color::Raqote(color.to_raqote_style());
     }
 
-    fn set_fill_style<'a>(
+    fn set_fill_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
         _drawtarget: &dyn GenericDrawTarget,
     ) {
         if let Some(pattern) = style.to_raqote_pattern() {
@@ -44,10 +58,10 @@ impl Backend for RaqoteBackend {
         }
     }
 
-    fn set_stroke_style<'a>(
+    fn set_stroke_style(
         &mut self,
         style: FillOrStrokeStyle,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
         _drawtarget: &dyn GenericDrawTarget,
     ) {
         if let Some(pattern) = style.to_raqote_pattern() {
@@ -55,10 +69,10 @@ impl Backend for RaqoteBackend {
         }
     }
 
-    fn set_global_composition<'a>(
+    fn set_global_composition(
         &mut self,
         op: CompositionOrBlending,
-        state: &mut CanvasPaintState<'a>,
+        state: &mut CanvasPaintState<'_>,
     ) {
         state.draw_options.as_raqote_mut().blend_mode = op.to_raqote_style();
     }
@@ -125,9 +139,9 @@ pub struct LinearGradientPattern {
 impl LinearGradientPattern {
     fn new(start: Point2D<f32>, end: Point2D<f32>, stops: Vec<raqote::GradientStop>) -> Self {
         LinearGradientPattern {
-            gradient: raqote::Gradient { stops: stops },
-            start: start,
-            end: end,
+            gradient: raqote::Gradient { stops },
+            start,
+            end,
         }
     }
 }
@@ -150,11 +164,11 @@ impl RadialGradientPattern {
         stops: Vec<raqote::GradientStop>,
     ) -> Self {
         RadialGradientPattern {
-            gradient: raqote::Gradient { stops: stops },
-            center1: center1,
-            radius1: radius1,
-            center2: center2,
-            radius2: radius2,
+            gradient: raqote::Gradient { stops },
+            center1,
+            radius1,
+            center2,
+            radius2,
         }
     }
 }
@@ -177,10 +191,10 @@ impl<'a> SurfacePattern<'a> {
             },
         };
         SurfacePattern {
-            image: image,
-            filter: filter,
-            extend: extend,
-            repeat: repeat,
+            image,
+            filter,
+            extend,
+            repeat,
             transform: Transform2D::identity(),
         }
     }
@@ -389,7 +403,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
     fn create_gradient_stops(&self, gradient_stops: Vec<GradientStop>) -> GradientStops {
         let mut stops = gradient_stops
             .into_iter()
-            .map(|item| item.as_raqote().clone())
+            .map(|item| *item.as_raqote())
             .collect::<Vec<raqote::GradientStop>>();
         // https://www.w3.org/html/test/results/2dcontext/annotated-spec/canvas.html#testrefs.2d.gradient.interpolate.overlap
         stops.sort_by(|a, b| a.position.partial_cmp(&b.position).unwrap());
@@ -492,7 +506,7 @@ impl GenericDrawTarget for raqote::DrawTarget {
             raqote::BlendMode::SrcOut |
             raqote::BlendMode::DstIn |
             raqote::BlendMode::DstAtop => {
-                let mut options = draw_options.as_raqote().clone();
+                let mut options = *draw_options.as_raqote();
                 self.push_layer_with_blend(1., options.blend_mode);
                 options.blend_mode = raqote::BlendMode::SrcOver;
                 self.fill(path.as_raqote(), &pattern.source(), &options);
@@ -507,43 +521,61 @@ impl GenericDrawTarget for raqote::DrawTarget {
 
     fn fill_text(
         &mut self,
-        font: &Font,
-        point_size: f32,
-        text: &str,
+        text_runs: Vec<TextRun>,
         start: Point2D<f32>,
         pattern: &canvas_data::Pattern,
-        options: &DrawOptions,
+        draw_options: &DrawOptions,
     ) {
-        let mut start = pathfinder_geometry::vector::vec2f(start.x, start.y);
-        let mut ids = Vec::new();
-        let mut positions = Vec::new();
-        for c in text.chars() {
-            let id = match font.glyph_for_char(c) {
-                Some(id) => id,
-                None => {
-                    warn!("Skipping non-existent glyph {}", c);
-                    continue;
-                },
-            };
-            ids.push(id);
-            positions.push(Point2D::new(start.x(), start.y()));
-            let advance = match font.advance(id) {
-                Ok(advance) => advance,
-                Err(e) => {
-                    warn!("Skipping glyph {} with missing advance: {:?}", c, e);
-                    continue;
-                },
-            };
-            start += advance * point_size / 24. / 96.;
+        let mut advance = 0.;
+        for run in text_runs.iter() {
+            let mut positions = Vec::new();
+            let glyphs = &run.glyphs;
+            let ids: Vec<_> = glyphs
+                .iter_glyphs_for_byte_range(&Range::new(ByteIndex(0), glyphs.len()))
+                .map(|glyph| {
+                    let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
+                    positions.push(Point2D::new(
+                        advance + start.x + glyph_offset.x.to_f32_px(),
+                        start.y + glyph_offset.y.to_f32_px(),
+                    ));
+                    advance += glyph.advance().to_f32_px();
+                    glyph.id()
+                })
+                .collect();
+
+            // TODO: raqote uses font-kit to rasterize glyphs, but font-kit fails an assertion when
+            // using color bitmap fonts in the FreeType backend. For now, simply do not render these
+            // type of fonts.
+            if run.font.has_color_bitmap_or_colr_table() {
+                continue;
+            }
+
+            let template = &run.font.template;
+
+            SHARED_FONT_CACHE.with(|font_cache| {
+                let identifier = template.identifier();
+                if !font_cache.borrow().contains_key(&identifier) {
+                    let Ok(font) = Font::from_bytes(template.data(), identifier.index()) else {
+                        return;
+                    };
+                    font_cache.borrow_mut().insert(identifier.clone(), font);
+                }
+
+                let font_cache = font_cache.borrow();
+                let Some(font) = font_cache.get(&identifier) else {
+                    return;
+                };
+
+                self.draw_glyphs(
+                    font,
+                    run.font.descriptor.pt_size.to_f32_px(),
+                    &ids,
+                    &positions,
+                    &pattern.source(),
+                    draw_options.as_raqote(),
+                );
+            })
         }
-        self.draw_glyphs(
-            font,
-            point_size,
-            &ids,
-            &positions,
-            &pattern.source(),
-            options.as_raqote(),
-        );
     }
 
     fn fill_rect(
@@ -654,28 +686,23 @@ impl GenericDrawTarget for raqote::DrawTarget {
     #[allow(unsafe_code)]
     fn snapshot_data(&self, f: &dyn Fn(&[u8]) -> Vec<u8>) -> Vec<u8> {
         let v = self.get_data();
-        f(unsafe {
-            std::slice::from_raw_parts(
-                v.as_ptr() as *const u8,
-                v.len() * std::mem::size_of::<u32>(),
-            )
-        })
+        f(
+            unsafe {
+                std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v))
+            },
+        )
     }
     #[allow(unsafe_code)]
     fn snapshot_data_owned(&self) -> Vec<u8> {
         let v = self.get_data();
         unsafe {
-            std::slice::from_raw_parts(
-                v.as_ptr() as *const u8,
-                v.len() * std::mem::size_of::<u32>(),
-            )
-            .into()
+            std::slice::from_raw_parts(v.as_ptr() as *const u8, std::mem::size_of_val(v)).into()
         }
     }
 }
 
 impl Filter {
-    fn to_raqote(&self) -> raqote::FilterMode {
+    fn to_raqote(self) -> raqote::FilterMode {
         match self {
             Filter::Bilinear => raqote::FilterMode::Bilinear,
             Filter::Nearest => raqote::FilterMode::Nearest,
@@ -852,61 +879,38 @@ pub trait ToRaqotePattern<'a> {
 }
 
 pub trait ToRaqoteGradientStop {
-    fn to_raqote(&self) -> raqote::GradientStop;
-}
-
-/// Clamp a 0..1 number to a 0..255 range to u8.
-///
-/// Whilst scaling by 256 and flooring would provide
-/// an equal distribution of integers to percentage inputs,
-/// this is not what Gecko does so we instead multiply by 255
-/// and round (adding 0.5 and flooring is equivalent to rounding)
-///
-/// Chrome does something similar for the alpha value, but not
-/// the rgb values.
-///
-/// See <https://bugzilla.mozilla.org/show_bug.cgi?id=1340484>
-///
-/// Clamping to 256 and rounding after would let 1.0 map to 256, and
-/// `256.0_f32 as u8` is undefined behavior:
-///
-/// <https://github.com/rust-lang/rust/issues/10184>
-#[inline]
-pub fn clamp_unit_f32(val: f32) -> u8 {
-    clamp_floor_256_f32(val * 255.)
-}
-
-/// Round and clamp a single number to a u8.
-#[inline]
-pub fn clamp_floor_256_f32(val: f32) -> u8 {
-    val.round().clamp(0., 255.) as u8
+    fn to_raqote(self) -> raqote::GradientStop;
 }
 
 impl ToRaqoteGradientStop for CanvasGradientStop {
-    fn to_raqote(&self) -> raqote::GradientStop {
+    fn to_raqote(self) -> raqote::GradientStop {
+        let srgb = self.color.into_srgb_legacy();
         let color = raqote::Color::new(
-            self.color.alpha.map(clamp_unit_f32).unwrap_or(0),
-            self.color.red.unwrap_or(0),
-            self.color.green.unwrap_or(0),
-            self.color.blue.unwrap_or(0),
+            clamp_unit_f32(srgb.alpha),
+            clamp_unit_f32(srgb.components.0),
+            clamp_unit_f32(srgb.components.1),
+            clamp_unit_f32(srgb.components.2),
         );
         let position = self.offset as f32;
         raqote::GradientStop { position, color }
     }
 }
 
-impl<'a> ToRaqotePattern<'_> for FillOrStrokeStyle {
+impl ToRaqotePattern<'_> for FillOrStrokeStyle {
     #[allow(unsafe_code)]
     fn to_raqote_pattern(self) -> Option<Pattern<'static>> {
         use canvas_traits::canvas::FillOrStrokeStyle::*;
 
         match self {
-            Color(color) => Some(Pattern::Color(
-                color.alpha.map(clamp_unit_f32).unwrap_or(0),
-                color.red.unwrap_or(0),
-                color.green.unwrap_or(0),
-                color.blue.unwrap_or(0),
-            )),
+            Color(color) => {
+                let srgb = color.into_srgb_legacy();
+                Some(Pattern::Color(
+                    clamp_unit_f32(srgb.alpha),
+                    clamp_unit_f32(srgb.components.0),
+                    clamp_unit_f32(srgb.components.1),
+                    clamp_unit_f32(srgb.components.2),
+                ))
+            },
             LinearGradient(style) => {
                 let start = Point2D::new(style.x0 as f32, style.y0 as f32);
                 let end = Point2D::new(style.x1 as f32, style.y1 as f32);
@@ -956,15 +960,16 @@ impl Color {
     }
 }
 
-impl ToRaqoteStyle for RGBA {
+impl ToRaqoteStyle for AbsoluteColor {
     type Target = raqote::SolidSource;
 
     fn to_raqote_style(self) -> Self::Target {
+        let srgb = self.into_srgb_legacy();
         raqote::SolidSource::from_unpremultiplied_argb(
-            self.alpha.map(clamp_unit_f32).unwrap_or(0),
-            self.red.unwrap_or(0),
-            self.green.unwrap_or(0),
-            self.blue.unwrap_or(0),
+            clamp_unit_f32(srgb.alpha),
+            clamp_unit_f32(srgb.components.0),
+            clamp_unit_f32(srgb.components.1),
+            clamp_unit_f32(srgb.components.2),
         )
     }
 }

components/canvas/webgl_mode/inprocess.rs

@@ -8,7 +8,6 @@ use std::sync::{Arc, Mutex};
 use canvas_traits::webgl::{webgl_channel, WebGLContextId, WebGLMsg, WebGLThreads};
 use euclid::default::Size2D;
 use fnv::FnvHashMap;
-use gfx::rendering_context::RenderingContext;
 use log::debug;
 use sparkle::gl::GlType;
 use surfman::chains::{SwapChainAPI, SwapChains, SwapChainsAPI};
@@ -16,7 +15,8 @@ use surfman::{Device, SurfaceInfo, SurfaceTexture};
 use webrender::RenderApiSender;
 use webrender_api::DocumentId;
 use webrender_traits::{
-    WebrenderExternalImageApi, WebrenderExternalImageRegistry, WebrenderImageSource,
+    RenderingContext, WebrenderExternalImageApi, WebrenderExternalImageRegistry,
+    WebrenderImageSource,
 };
 use webxr::SurfmanGL as WebXRSurfman;
 use webxr_api::LayerGrandManager as WebXRLayerGrandManager;
@@ -65,7 +65,7 @@ impl WebGLComm {
         WebGLComm {
             webgl_threads: WebGLThreads(sender),
             image_handler: Box::new(external),
-            webxr_layer_grand_manager: webxr_layer_grand_manager,
+            webxr_layer_grand_manager,
         }
     }
 }

components/canvas/webgl_thread.rs

@@ -51,11 +51,6 @@ use webxr_api::{
 
 use crate::webgl_limits::GLLimitsDetect;
 
-#[cfg(feature = "xr-profile")]
-fn to_ms(ns: u64) -> f64 {
-    ns as f64 / 1_000_000.
-}
-
 struct GLContextData {
     ctx: Context,
     gl: Rc<Gl>,
@@ -289,7 +284,7 @@ impl WebGLThread {
             let exit = self.handle_msg(msg, &webgl_chan);
             if exit {
                 // Call remove_context functions in order to correctly delete WebRender image keys.
-                let context_ids: Vec<WebGLContextId> = self.contexts.keys().map(|id| *id).collect();
+                let context_ids: Vec<WebGLContextId> = self.contexts.keys().copied().collect();
                 for id in context_ids {
                     self.remove_webgl_context(id);
                 }
@@ -323,7 +318,7 @@ impl WebGLThread {
                             &mut self.bound_context_id,
                         )
                         .expect("WebGLContext not found");
-                        let glsl_version = Self::get_glsl_version(&*data.gl);
+                        let glsl_version = Self::get_glsl_version(&data.gl);
                         let api_type = match data.gl.get_type() {
                             gl::GlType::Gl => GlType::Gl,
                             gl::GlType::Gles => GlType::Gles,
@@ -373,7 +368,10 @@ impl WebGLThread {
             WebGLMsg::SwapBuffers(swap_ids, sender, sent_time) => {
                 self.handle_swap_buffers(swap_ids, sender, sent_time);
             },
-            WebGLMsg::Exit => {
+            WebGLMsg::Exit(sender) => {
+                if let Err(e) = sender.send(()) {
+                    warn!("Failed to send response to WebGLMsg::Exit ({e})");
+                }
                 return true;
             },
         }
@@ -458,7 +456,7 @@ impl WebGLThread {
             WebGLImpl::apply(
                 &self.device,
                 &data.ctx,
-                &*data.gl,
+                &data.gl,
                 &mut data.state,
                 &data.attributes,
                 command,
@@ -497,12 +495,12 @@ impl WebGLThread {
             ContextAttributeFlags::STENCIL;
         let context_attributes = &ContextAttributes {
             version: webgl_version.to_surfman_version(self.api_type),
-            flags: flags,
+            flags,
         };
 
         let context_descriptor = self
             .device
-            .create_context_descriptor(&context_attributes)
+            .create_context_descriptor(context_attributes)
             .map_err(|err| format!("Failed to create context descriptor: {:?}", err))?;
 
         let safe_size = Size2D::new(
@@ -562,7 +560,7 @@ impl WebGLThread {
             })),
         };
 
-        let limits = GLLimits::detect(&*gl, webgl_version);
+        let limits = GLLimits::detect(&gl, webgl_version);
 
         let size = clamp_viewport(&gl, requested_size);
         if safe_size != size {
@@ -583,7 +581,7 @@ impl WebGLThread {
             .device
             .context_surface_info(&ctx)
             .map_err(|err| format!("Failed to get context surface info: {:?}", err))?
-            .ok_or_else(|| format!("Failed to get context surface info"))?
+            .ok_or_else(|| "Failed to get context surface info".to_string())?
             .framebuffer_object;
 
         gl.bind_framebuffer(gl::FRAMEBUFFER, framebuffer);
@@ -616,7 +614,7 @@ impl WebGLThread {
         };
         debug!("Created state {:?}", state);
 
-        state.restore_invariant(&*gl);
+        state.restore_invariant(&gl);
         debug_assert_eq!(gl.get_error(), gl::NO_ERROR);
 
         self.contexts.insert(
@@ -663,7 +661,7 @@ impl WebGLThread {
         // Check to see if any of the current framebuffer bindings are the surface we're about to
         // throw out. If so, we'll have to reset them after destroying the surface.
         let framebuffer_rebinding_info =
-            FramebufferRebindingInfo::detect(&self.device, &data.ctx, &*data.gl);
+            FramebufferRebindingInfo::detect(&self.device, &data.ctx, &data.gl);
 
         // Resize the swap chains
         if let Some(swap_chain) = self.webrender_swap_chains.get(context_id) {
@@ -676,14 +674,14 @@ impl WebGLThread {
                 .resize(&mut self.device, &mut data.ctx, size.to_i32())
                 .map_err(|err| format!("Failed to resize swap chain: {:?}", err))?;
             swap_chain
-                .clear_surface(&mut self.device, &mut data.ctx, &*data.gl, clear_color)
+                .clear_surface(&mut self.device, &mut data.ctx, &data.gl, clear_color)
                 .map_err(|err| format!("Failed to clear resized swap chain: {:?}", err))?;
         } else {
             error!("Failed to find swap chain");
         }
 
         // Reset framebuffer bindings as appropriate.
-        framebuffer_rebinding_info.apply(&self.device, &data.ctx, &*data.gl);
+        framebuffer_rebinding_info.apply(&self.device, &data.ctx, &data.gl);
         debug_assert_eq!(data.gl.get_error(), gl::NO_ERROR);
 
         let has_alpha = data
@@ -764,7 +762,7 @@ impl WebGLThread {
             // Check to see if any of the current framebuffer bindings are the surface we're about
             // to swap out. If so, we'll have to reset them after destroying the surface.
             let framebuffer_rebinding_info =
-                FramebufferRebindingInfo::detect(&self.device, &data.ctx, &*data.gl);
+                FramebufferRebindingInfo::detect(&self.device, &data.ctx, &data.gl);
             debug_assert_eq!(data.gl.get_error(), gl::NO_ERROR);
 
             debug!("Getting swap chain for {:?}", context_id);
@@ -779,7 +777,7 @@ impl WebGLThread {
                     &mut self.device,
                     &mut data.ctx,
                     if data.attributes.preserve_drawing_buffer {
-                        PreserveBuffer::Yes(&*data.gl)
+                        PreserveBuffer::Yes(&data.gl)
                     } else {
                         PreserveBuffer::No
                     },
@@ -795,14 +793,14 @@ impl WebGLThread {
                     .contains(ContextAttributeFlags::ALPHA);
                 let clear_color = [0.0, 0.0, 0.0, !alpha as i32 as f32];
                 swap_chain
-                    .clear_surface(&mut self.device, &mut data.ctx, &*data.gl, clear_color)
+                    .clear_surface(&mut self.device, &mut data.ctx, &data.gl, clear_color)
                     .unwrap();
                 debug_assert_eq!(data.gl.get_error(), gl::NO_ERROR);
             }
 
             // Rebind framebuffers as appropriate.
             debug!("Rebinding {:?}", context_id);
-            framebuffer_rebinding_info.apply(&self.device, &data.ctx, &*data.gl);
+            framebuffer_rebinding_info.apply(&self.device, &data.ctx, &data.gl);
             debug_assert_eq!(data.gl.get_error(), gl::NO_ERROR);
 
             let SurfaceInfo {
@@ -829,14 +827,6 @@ impl WebGLThread {
 
         #[allow(unused)]
         let mut end_swap = 0;
-        #[cfg(feature = "xr-profile")]
-        {
-            end_swap = time::precise_time_ns();
-            println!(
-                "WEBXR PROFILING [swap buffer]:\t{}ms",
-                to_ms(end_swap - start_swap)
-            );
-        }
         completed_sender.send(end_swap).unwrap();
     }
 
@@ -941,7 +931,7 @@ impl WebGLThread {
         image_buffer_kind: ImageBufferKind,
     ) -> ImageData {
         let data = ExternalImageData {
-            id: ExternalImageId(context_id.0 as u64),
+            id: ExternalImageId(context_id.0),
             channel_index: 0,
             image_type: ExternalImageType::TextureHandle(image_buffer_kind),
         };
@@ -1054,7 +1044,7 @@ impl WebGLImpl {
                 gl.clear_color(r, g, b, a);
             },
             WebGLCommand::ClearDepth(depth) => {
-                let value = depth.max(0.).min(1.) as f64;
+                let value = depth.clamp(0., 1.) as f64;
                 state.depth_clear_value = value;
                 gl.clear_depth(value)
             },
@@ -1093,7 +1083,7 @@ impl WebGLImpl {
                 state.restore_depth_invariant(gl);
             },
             WebGLCommand::DepthRange(near, far) => {
-                gl.depth_range(near.max(0.).min(1.) as f64, far.max(0.).min(1.) as f64)
+                gl.depth_range(near.clamp(0., 1.) as f64, far.clamp(0., 1.) as f64)
             },
             WebGLCommand::Disable(cap) => match cap {
                 gl::SCISSOR_TEST => {
@@ -1288,7 +1278,7 @@ impl WebGLImpl {
                 sender.send(location).unwrap();
             },
             WebGLCommand::GetUniformLocation(program_id, ref name, ref chan) => {
-                Self::uniform_location(gl, program_id, &name, chan)
+                Self::uniform_location(gl, program_id, name, chan)
             },
             WebGLCommand::GetShaderInfoLog(shader_id, ref chan) => {
                 Self::shader_info_log(gl, shader_id, chan)
@@ -1297,7 +1287,7 @@ impl WebGLImpl {
                 Self::program_info_log(gl, program_id, chan)
             },
             WebGLCommand::CompileShader(shader_id, ref source) => {
-                Self::compile_shader(gl, shader_id, &source)
+                Self::compile_shader(gl, shader_id, source)
             },
             WebGLCommand::CreateBuffer(ref chan) => Self::create_buffer(gl, chan),
             WebGLCommand::CreateFramebuffer(ref chan) => Self::create_framebuffer(gl, chan),
@@ -1426,7 +1416,7 @@ impl WebGLImpl {
                     alpha_treatment,
                     y_axis_treatment,
                     pixel_format,
-                    Cow::Borrowed(&*data),
+                    Cow::Borrowed(data),
                 );
 
                 gl.pixel_store_i(gl::UNPACK_ALIGNMENT, unpacking_alignment as i32);
@@ -1489,7 +1479,7 @@ impl WebGLImpl {
                     alpha_treatment,
                     y_axis_treatment,
                     pixel_format,
-                    Cow::Borrowed(&*data),
+                    Cow::Borrowed(data),
                 );
 
                 gl.pixel_store_i(gl::UNPACK_ALIGNMENT, unpacking_alignment as i32);
@@ -1519,7 +1509,7 @@ impl WebGLImpl {
                     size.width as i32,
                     size.height as i32,
                     0,
-                    &*data,
+                    data,
                 );
             },
             WebGLCommand::CompressedTexSubImage2D {
@@ -1533,13 +1523,13 @@ impl WebGLImpl {
             } => {
                 gl.compressed_tex_sub_image_2d(
                     target,
-                    level as i32,
-                    xoffset as i32,
-                    yoffset as i32,
+                    level,
+                    xoffset,
+                    yoffset,
                     size.width as i32,
                     size.height as i32,
                     format,
-                    &*data,
+                    data,
                 );
             },
             WebGLCommand::TexStorage2D(target, levels, internal_format, width, height) => gl
@@ -1561,7 +1551,7 @@ impl WebGLImpl {
                 ),
             WebGLCommand::DrawingBufferWidth(ref sender) => {
                 let size = device
-                    .context_surface_info(&ctx)
+                    .context_surface_info(ctx)
                     .unwrap()
                     .expect("Where's the front buffer?")
                     .size;
@@ -1569,7 +1559,7 @@ impl WebGLImpl {
             },
             WebGLCommand::DrawingBufferHeight(ref sender) => {
                 let size = device
-                    .context_surface_info(&ctx)
+                    .context_surface_info(ctx)
                     .unwrap()
                     .expect("Where's the front buffer?")
                     .size;
@@ -1615,7 +1605,7 @@ impl WebGLImpl {
                 sender.send(value).unwrap();
             },
             WebGLCommand::ClientWaitSync(sync_id, flags, timeout, ref sender) => {
-                let value = gl.client_wait_sync(sync_id.get() as *const _, flags, timeout as u64);
+                let value = gl.client_wait_sync(sync_id.get() as *const _, flags, timeout);
                 sender.send(value).unwrap();
             },
             WebGLCommand::WaitSync(sync_id, flags, timeout) => {
@@ -1744,10 +1734,10 @@ impl WebGLImpl {
                 }
             },
             WebGLCommand::TexParameteri(target, param, value) => {
-                gl.tex_parameter_i(target, param as u32, value)
+                gl.tex_parameter_i(target, param, value)
             },
             WebGLCommand::TexParameterf(target, param, value) => {
-                gl.tex_parameter_f(target, param as u32, value)
+                gl.tex_parameter_f(target, param, value)
             },
             WebGLCommand::LinkProgram(program_id, ref sender) => {
                 return sender.send(Self::link_program(gl, program_id)).unwrap();
@@ -2503,7 +2493,7 @@ impl WebGLImpl {
 ///
 /// To avoid hard-coding this we would need to use the `sh::GetAttributes` and `sh::GetUniforms`
 /// API to look up the `x.name` and `x.mappedName` members.
-const ANGLE_NAME_PREFIX: &'static str = "_u";
+const ANGLE_NAME_PREFIX: &str = "_u";
 
 fn to_name_in_compiled_shader(s: &str) -> String {
     map_dot_separated(s, |s, mapped| {
@@ -2514,8 +2504,8 @@ fn to_name_in_compiled_shader(s: &str) -> String {
 
 fn from_name_in_compiled_shader(s: &str) -> String {
     map_dot_separated(s, |s, mapped| {
-        mapped.push_str(if s.starts_with(ANGLE_NAME_PREFIX) {
-            &s[ANGLE_NAME_PREFIX.len()..]
+        mapped.push_str(if let Some(stripped) = s.strip_prefix(ANGLE_NAME_PREFIX) {
+            stripped
         } else {
             s
         })
@@ -2533,6 +2523,7 @@ fn map_dot_separated<F: Fn(&str, &mut String)>(s: &str, f: F) -> String {
     mapped
 }
 
+#[allow(clippy::too_many_arguments)]
 fn prepare_pixels(
     internal_format: TexFormat,
     data_type: TexDataType,
@@ -2885,8 +2876,8 @@ fn flip_pixels_y(
 
 // Clamp a size to the current GL context's max viewport
 fn clamp_viewport(gl: &Gl, size: Size2D<u32>) -> Size2D<u32> {
-    let mut max_viewport = [i32::max_value(), i32::max_value()];
-    let mut max_renderbuffer = [i32::max_value()];
+    let mut max_viewport = [i32::MAX, i32::MAX];
+    let mut max_renderbuffer = [i32::MAX];
     #[allow(unsafe_code)]
     unsafe {
         gl.get_integer_v(gl::MAX_VIEWPORT_DIMS, &mut max_viewport);
@@ -3057,7 +3048,7 @@ impl WebXRBridge {
             .map_err(|_| WebXRError::CommunicationError)?;
         let manager = factory.build(device, contexts)?;
         let manager_id = unsafe { WebXRLayerManagerId::new(self.next_manager_id) };
-        self.next_manager_id = self.next_manager_id + 1;
+        self.next_manager_id += 1;
         self.managers.insert(manager_id, manager);
         Ok(manager_id)
     }
@@ -3100,7 +3091,8 @@ impl WebXRBridge {
         contexts: &mut dyn WebXRContexts<WebXRSurfman>,
         context_id: WebXRContextId,
     ) {
-        for (_, manager) in &mut self.managers {
+        for manager in self.managers.values_mut() {
+            #[allow(clippy::unnecessary_to_owned)] // Needs mutable borrow later in destroy
             for (other_id, layer_id) in manager.layers().to_vec() {
                 if other_id == context_id {
                     manager.destroy_layer(device, contexts, context_id, layer_id);
@@ -3178,7 +3170,7 @@ impl WebXRLayerGrandManagerAPI<WebXRSurfman> for WebXRBridgeGrandManager {
         &self,
         factory: WebXRLayerManagerFactory<WebXRSurfman>,
     ) -> Result<WebXRLayerManager, WebXRError> {
-        let (sender, receiver) = webgl_channel().map_err(|_| WebXRError::CommunicationError)?;
+        let (sender, receiver) = webgl_channel().ok_or(WebXRError::CommunicationError)?;
         let _ = self.factory_sender.send(factory);
         let _ = self
             .sender
@@ -3219,7 +3211,7 @@ impl<GL: WebXRTypes> WebXRLayerManagerAPI<GL> for WebXRBridgeManager {
         context_id: WebXRContextId,
         init: WebXRLayerInit,
     ) -> Result<WebXRLayerId, WebXRError> {
-        let (sender, receiver) = webgl_channel().map_err(|_| WebXRError::CommunicationError)?;
+        let (sender, receiver) = webgl_channel().ok_or(WebXRError::CommunicationError)?;
         let _ = self
             .sender
             .send(WebGLMsg::WebXRCommand(WebXRCommand::CreateLayer(
@@ -3262,7 +3254,7 @@ impl<GL: WebXRTypes> WebXRLayerManagerAPI<GL> for WebXRBridgeManager {
         _: &mut dyn WebXRContexts<GL>,
         layers: &[(WebXRContextId, WebXRLayerId)],
     ) -> Result<Vec<WebXRSubImages>, WebXRError> {
-        let (sender, receiver) = webgl_channel().map_err(|_| WebXRError::CommunicationError)?;
+        let (sender, receiver) = webgl_channel().ok_or(WebXRError::CommunicationError)?;
         let _ = self
             .sender
             .send(WebGLMsg::WebXRCommand(WebXRCommand::BeginFrame(
@@ -3281,7 +3273,7 @@ impl<GL: WebXRTypes> WebXRLayerManagerAPI<GL> for WebXRBridgeManager {
         _: &mut dyn WebXRContexts<GL>,
         layers: &[(WebXRContextId, WebXRLayerId)],
     ) -> Result<(), WebXRError> {
-        let (sender, receiver) = webgl_channel().map_err(|_| WebXRError::CommunicationError)?;
+        let (sender, receiver) = webgl_channel().ok_or(WebXRError::CommunicationError)?;
         let _ = self
             .sender
             .send(WebGLMsg::WebXRCommand(WebXRCommand::EndFrame(
@@ -3315,8 +3307,8 @@ impl<'a> WebXRContexts<WebXRSurfman> for WebXRBridgeContexts<'a> {
         let data = WebGLThread::make_current_if_needed_mut(
             device,
             WebGLContextId::from(context_id),
-            &mut self.contexts,
-            &mut self.bound_context_id,
+            self.contexts,
+            self.bound_context_id,
         )?;
         Some(&mut data.ctx)
     }
@@ -3324,8 +3316,8 @@ impl<'a> WebXRContexts<WebXRSurfman> for WebXRBridgeContexts<'a> {
         let data = WebGLThread::make_current_if_needed(
             device,
             WebGLContextId::from(context_id),
-            &self.contexts,
-            &mut self.bound_context_id,
+            self.contexts,
+            self.bound_context_id,
         )?;
         Some(&data.gl)
     }

components/compositing/Cargo.toml

@@ -1,11 +1,10 @@
 [package]
 name = "compositing"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
-build = "build.rs"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "compositing"
@@ -16,34 +15,37 @@ default = []
 multiview = []
 
 [dependencies]
+base = { workspace = true }
 canvas = { path = "../canvas" }
 compositing_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
 fnv = { workspace = true }
-gfx = { path = "../gfx" }
-gfx_traits = { workspace = true }
+fonts = { path = "../fonts" }
+fonts_traits = { workspace = true }
 gleam = { workspace = true }
 image = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
-msg = { workspace = true }
+net = { path = "../net" }
 net_traits = { workspace = true }
 pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
 script_traits = { workspace = true }
 servo_config = { path = "../config" }
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
 style_traits = { workspace = true }
 time = { workspace = true }
+tracing = { workspace = true }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
+webrender_traits = { workspace = true }
 webxr = { git = "https://github.com/servo/webxr" }
 
-[build-dependencies]
-toml = "0.5"
+[dev-dependencies]
+surfman = { workspace = true }

components/compositing/build.rs

@@ -1,52 +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 std::env;
-use std::fs::File;
-use std::io::{Read, Write};
-use std::path::Path;
-
-fn main() {
-    let lockfile_path = Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
-        .join("..")
-        .join("..")
-        .join("Cargo.lock");
-    let revision_file_path =
-        Path::new(&env::var_os("OUT_DIR").unwrap()).join("webrender_revision.rs");
-
-    let mut lockfile = String::new();
-    File::open(lockfile_path)
-        .expect("Cannot open lockfile")
-        .read_to_string(&mut lockfile)
-        .expect("Failed to read lockfile");
-
-    match toml::from_str::<toml::value::Table>(&lockfile) {
-        Ok(result) => {
-            let packages = result
-                .get("package")
-                .expect("Cargo lockfile should contain package list");
-
-            match *packages {
-                toml::Value::Array(ref arr) => {
-                    let source = arr
-                        .iter()
-                        .find(|pkg| {
-                            pkg.get("name").and_then(|name| name.as_str()).unwrap_or("") ==
-                                "webrender"
-                        })
-                        .and_then(|pkg| pkg.get("source").and_then(|source| source.as_str()))
-                        .unwrap_or("unknown");
-
-                    let parsed: Vec<&str> = source.split("#").collect();
-                    let revision = if parsed.len() > 1 { parsed[1] } else { source };
-
-                    let mut revision_module_file = File::create(&revision_file_path).unwrap();
-                    write!(&mut revision_module_file, "{}", format!("\"{}\"", revision)).unwrap();
-                },
-                _ => panic!("Cannot find package definitions in lockfile"),
-            }
-        },
-        Err(e) => panic!("{}", e),
-    }
-}

components/compositing/gl.rs

@@ -5,8 +5,8 @@
 use std::rc::Rc;
 
 use gleam::gl::{self, Gl};
-use image::RgbImage;
-use log::trace;
+use image::RgbaImage;
+use log::{trace, warn};
 use servo_geometry::FramebufferUintLength;
 
 pub struct RenderTargetInfo {
@@ -31,11 +31,11 @@ impl RenderTargetInfo {
         gl.tex_image_2d(
             gl::TEXTURE_2D,
             0,
-            gl::RGB as gl::GLint,
+            gl::RGBA as gl::GLint,
             width.get() as gl::GLsizei,
             height.get() as gl::GLsizei,
             0,
-            gl::RGB,
+            gl::RGBA,
             gl::UNSIGNED_BYTE,
             None,
         );
@@ -105,7 +105,7 @@ impl RenderTargetInfo {
         y: i32,
         width: FramebufferUintLength,
         height: FramebufferUintLength,
-    ) -> RgbImage {
+    ) -> RgbaImage {
         let width = width.get() as usize;
         let height = height.get() as usize;
         // For some reason, OSMesa fails to render on the 3rd
@@ -121,21 +121,25 @@ impl RenderTargetInfo {
             y,
             width as gl::GLsizei,
             height as gl::GLsizei,
-            gl::RGB,
+            gl::RGBA,
             gl::UNSIGNED_BYTE,
         );
+        let gl_error = self.gl.get_error();
+        if gl_error != gl::NO_ERROR {
+            warn!("GL error code 0x{gl_error:x} set after read_pixels");
+        }
 
         // flip image vertically (texture is upside down)
         let orig_pixels = pixels.clone();
-        let stride = width * 3;
+        let stride = width * 4;
         for y in 0..height {
             let dst_start = y * stride;
             let src_start = (height - y - 1) * stride;
             let src_slice = &orig_pixels[src_start..src_start + stride];
-            (&mut pixels[dst_start..dst_start + stride]).clone_from_slice(&src_slice[..stride]);
+            pixels[dst_start..dst_start + stride].clone_from_slice(&src_slice[..stride]);
         }
 
-        RgbImage::from_raw(width as u32, height as u32, pixels).expect("Flipping image failed!")
+        RgbaImage::from_raw(width as u32, height as u32, pixels).expect("Flipping image failed!")
     }
 }
 
@@ -148,3 +152,57 @@ impl Drop for RenderTargetInfo {
         self.gl.delete_framebuffers(&self.framebuffer_ids);
     }
 }
+
+#[cfg(test)]
+mod test {
+    use gleam::gl;
+    use image::Rgba;
+    use servo_geometry::FramebufferUintLength;
+    use surfman::{Connection, ContextAttributeFlags, ContextAttributes, Error, GLApi, GLVersion};
+
+    use super::RenderTargetInfo;
+
+    #[test]
+    #[allow(unsafe_code)]
+    fn test_read_pixels() -> Result<(), Error> {
+        let connection = Connection::new()?;
+        let adapter = connection.create_software_adapter()?;
+        let mut device = connection.create_device(&adapter)?;
+        let context_descriptor = device.create_context_descriptor(&ContextAttributes {
+            version: GLVersion::new(3, 0),
+            flags: ContextAttributeFlags::empty(),
+        })?;
+        let mut context = device.create_context(&context_descriptor, None)?;
+
+        let gl = match connection.gl_api() {
+            GLApi::GL => unsafe { gl::GlFns::load_with(|s| device.get_proc_address(&context, s)) },
+            GLApi::GLES => unsafe {
+                gl::GlesFns::load_with(|s| device.get_proc_address(&context, s))
+            },
+        };
+
+        device.make_context_current(&context)?;
+
+        {
+            const WIDTH: FramebufferUintLength = FramebufferUintLength::new(16);
+            const HEIGHT: FramebufferUintLength = FramebufferUintLength::new(16);
+            let render_target = RenderTargetInfo::new(gl, WIDTH, HEIGHT);
+            render_target.bind();
+            render_target
+                .gl
+                .clear_color(12.0 / 255.0, 34.0 / 255.0, 56.0 / 255.0, 78.0 / 255.0);
+            render_target.gl.clear(gl::COLOR_BUFFER_BIT);
+
+            let img = render_target.read_back_from_gpu(0, 0, WIDTH, HEIGHT);
+            assert_eq!(img.width(), WIDTH.get());
+            assert_eq!(img.height(), HEIGHT.get());
+
+            let expected_pixel: Rgba<u8> = Rgba([12, 34, 56, 78]);
+            assert!(img.pixels().all(|&p| p == expected_pixel));
+        }
+
+        device.destroy_context(&mut context)?;
+
+        Ok(())
+    }
+}

components/compositing/lib.rs

@@ -8,16 +8,20 @@ use std::rc::Rc;
 
 use compositing_traits::{CompositorProxy, CompositorReceiver, ConstellationMsg};
 use crossbeam_channel::Sender;
-use gfx::rendering_context::RenderingContext;
 use profile_traits::{mem, time};
 use webrender::RenderApi;
 use webrender_api::DocumentId;
+use webrender_traits::RenderingContext;
 
 pub use crate::compositor::{CompositeTarget, IOCompositor, ShutdownState};
 
+#[macro_use]
+mod tracing;
+
 mod compositor;
 mod gl;
 mod touch;
+pub mod webview;
 pub mod windowing;
 
 /// Data used to construct a compositor.

components/compositing/touch.rs

@@ -25,10 +25,7 @@ pub struct TouchPoint {
 
 impl TouchPoint {
     pub fn new(id: TouchId, point: Point2D<f32, DevicePixel>) -> Self {
-        TouchPoint {
-            id: id,
-            point: point,
-        }
+        TouchPoint { id, point }
     }
 }
 

components/compositing/tracing.rs

@@ -0,0 +1,58 @@
+/* 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/. */
+
+/// Log an event from constellation at trace level.
+/// - To disable tracing: RUST_LOG='compositor<constellation@=off'
+/// - To enable tracing: RUST_LOG='compositor<constellation@'
+macro_rules! trace_msg_from_constellation {
+    // This macro only exists to put the docs in the same file as the target prefix,
+    // so the macro definition is always the same.
+    ($event:expr, $($rest:tt)+) => {
+        ::log::trace!(target: $crate::tracing::LogTarget::log_target(&$event), $($rest)+)
+    };
+}
+
+/// Get the log target for an event, as a static string.
+pub(crate) trait LogTarget {
+    fn log_target(&self) -> &'static str;
+}
+
+mod from_constellation {
+    use super::LogTarget;
+
+    macro_rules! target {
+        ($($name:literal)+) => {
+            concat!("compositor<constellation@", $($name),+)
+        };
+    }
+
+    impl LogTarget for compositing_traits::CompositorMsg {
+        fn log_target(&self) -> &'static str {
+            match self {
+                Self::ShutdownComplete => target!("ShutdownComplete"),
+                Self::ChangeRunningAnimationsState(..) => target!("ChangeRunningAnimationsState"),
+                Self::CreateOrUpdateWebView(..) => target!("CreateOrUpdateWebView"),
+                Self::RemoveWebView(..) => target!("RemoveWebView"),
+                Self::MoveResizeWebView(..) => target!("MoveResizeWebView"),
+                Self::ShowWebView(..) => target!("ShowWebView"),
+                Self::HideWebView(..) => target!("HideWebView"),
+                Self::RaiseWebViewToTop(..) => target!("RaiseWebViewToTop"),
+                Self::TouchEventProcessed(..) => target!("TouchEventProcessed"),
+                Self::CreatePng(..) => target!("CreatePng"),
+                Self::IsReadyToSaveImageReply(..) => target!("IsReadyToSaveImageReply"),
+                Self::SetThrottled(..) => target!("SetThrottled"),
+                Self::NewWebRenderFrameReady(..) => target!("NewWebRenderFrameReady"),
+                Self::PipelineExited(..) => target!("PipelineExited"),
+                Self::PendingPaintMetric(..) => target!("PendingPaintMetric"),
+                Self::LoadComplete(..) => target!("LoadComplete"),
+                Self::WebDriverMouseButtonEvent(..) => target!("WebDriverMouseButtonEvent"),
+                Self::WebDriverMouseMoveEvent(..) => target!("WebDriverMouseMoveEvent"),
+                Self::GetClientWindow(..) => target!("GetClientWindow"),
+                Self::GetScreenSize(..) => target!("GetScreenSize"),
+                Self::GetScreenAvailSize(..) => target!("GetScreenAvailSize"),
+                Self::Forwarded(..) => target!("Forwarded"),
+            }
+        }
+    }
+}

components/compositing/webview.rs

@@ -0,0 +1,245 @@
+/* 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::collections::HashMap;
+
+use base::id::{PipelineId, WebViewId};
+use webrender_api::units::DeviceRect;
+
+#[derive(Debug, Default)]
+pub struct WebView {
+    pub pipeline_id: Option<PipelineId>,
+    pub rect: DeviceRect,
+}
+
+#[derive(Debug, Default)]
+pub struct WebViewManager<WebView> {
+    /// Our top-level browsing contexts. In the WebRender scene, their pipelines are the children of
+    /// a single root pipeline that also applies any pinch zoom transformation.
+    webviews: HashMap<WebViewId, WebView>,
+
+    /// The order to paint them in, topmost last.
+    painting_order: Vec<WebViewId>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct WebViewAlreadyExists(pub WebViewId);
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct UnknownWebView(pub WebViewId);
+
+impl<WebView> WebViewManager<WebView> {
+    pub fn add(
+        &mut self,
+        webview_id: WebViewId,
+        webview: WebView,
+    ) -> Result<&mut WebView, WebViewAlreadyExists> {
+        if self.webviews.contains_key(&webview_id) {
+            return Err(WebViewAlreadyExists(webview_id));
+        }
+        Ok(self.webviews.entry(webview_id).or_insert(webview))
+    }
+
+    pub fn remove(&mut self, webview_id: WebViewId) -> Result<WebView, UnknownWebView> {
+        self.painting_order.retain(|b| *b != webview_id);
+        self.webviews
+            .remove(&webview_id)
+            .ok_or(UnknownWebView(webview_id))
+    }
+
+    pub fn get(&self, webview_id: WebViewId) -> Option<&WebView> {
+        self.webviews.get(&webview_id)
+    }
+
+    pub fn get_mut(&mut self, webview_id: WebViewId) -> Option<&mut WebView> {
+        self.webviews.get_mut(&webview_id)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn show(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if !self.painting_order.contains(&webview_id) {
+            self.painting_order.push(webview_id);
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn hide(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if self.painting_order.contains(&webview_id) {
+            self.painting_order.retain(|b| *b != webview_id);
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn hide_all(&mut self) -> bool {
+        if !self.painting_order.is_empty() {
+            self.painting_order.clear();
+            return true;
+        }
+        false
+    }
+
+    /// Returns true iff the painting order actually changed.
+    pub fn raise_to_top(&mut self, webview_id: WebViewId) -> Result<bool, UnknownWebView> {
+        if !self.webviews.contains_key(&webview_id) {
+            return Err(UnknownWebView(webview_id));
+        }
+        if self.painting_order.last() != Some(&webview_id) {
+            self.hide(webview_id)?;
+            self.show(webview_id)?;
+            return Ok(true);
+        }
+        Ok(false)
+    }
+
+    pub fn painting_order(&self) -> impl Iterator<Item = (&WebViewId, &WebView)> {
+        self.painting_order
+            .iter()
+            .flat_map(move |webview_id| self.get(*webview_id).map(|b| (webview_id, b)))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::num::NonZeroU32;
+
+    use base::id::{
+        BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId,
+        TopLevelBrowsingContextId,
+    };
+
+    use crate::webview::{UnknownWebView, WebViewAlreadyExists, WebViewManager};
+
+    fn top_level_id(namespace_id: u32, index: u32) -> TopLevelBrowsingContextId {
+        TopLevelBrowsingContextId(BrowsingContextId {
+            namespace_id: PipelineNamespaceId(namespace_id),
+            index: BrowsingContextIndex(NonZeroU32::new(index).unwrap()),
+        })
+    }
+
+    fn webviews_sorted<WebView: Clone>(
+        webviews: &WebViewManager<WebView>,
+    ) -> Vec<(TopLevelBrowsingContextId, WebView)> {
+        let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
+        keys.sort();
+        keys.iter()
+            .map(|&id| (*id, webviews.webviews.get(id).cloned().unwrap()))
+            .collect()
+    }
+
+    #[test]
+    fn test() {
+        PipelineNamespace::install(PipelineNamespaceId(0));
+        let mut webviews = WebViewManager::default();
+
+        // add() adds the webview to the map, but not the painting order.
+        assert!(webviews.add(TopLevelBrowsingContextId::new(), 'a').is_ok());
+        assert!(webviews.add(TopLevelBrowsingContextId::new(), 'b').is_ok());
+        assert!(webviews.add(TopLevelBrowsingContextId::new(), 'c').is_ok());
+        assert_eq!(
+            webviews_sorted(&webviews),
+            vec![
+                (top_level_id(0, 1), 'a'),
+                (top_level_id(0, 2), 'b'),
+                (top_level_id(0, 3), 'c'),
+            ]
+        );
+        assert!(webviews.painting_order.is_empty());
+
+        // add() returns WebViewAlreadyExists if the webview id already exists.
+        assert_eq!(
+            webviews.add(top_level_id(0, 3), 'd'),
+            Err(WebViewAlreadyExists(top_level_id(0, 3)))
+        );
+
+        // Other methods return UnknownWebView or None if the webview id doesn’t exist.
+        assert_eq!(
+            webviews.remove(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(webviews.get(top_level_id(1, 1)), None);
+        assert_eq!(webviews.get_mut(top_level_id(1, 1)), None);
+        assert_eq!(
+            webviews.show(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(
+            webviews.hide(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+        assert_eq!(
+            webviews.raise_to_top(top_level_id(1, 1)),
+            Err(UnknownWebView(top_level_id(1, 1)))
+        );
+
+        // For webviews not yet visible, both show() and raise_to_top() add the given webview on top.
+        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(true));
+        assert_eq!(webviews.show(top_level_id(0, 2)), Ok(false));
+        assert_eq!(webviews.painting_order, vec![top_level_id(0, 2)]);
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1)]
+        );
+        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(true));
+        assert_eq!(webviews.show(top_level_id(0, 3)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
+        );
+
+        // For webviews already visible, show() does nothing, while raise_to_top() makes it on top.
+        assert_eq!(webviews.show(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
+        );
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(true));
+        assert_eq!(webviews.raise_to_top(top_level_id(0, 1)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 3), top_level_id(0, 1)]
+        );
+
+        // hide() removes the webview from the painting order, but not the map.
+        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(true));
+        assert_eq!(webviews.hide(top_level_id(0, 3)), Ok(false));
+        assert_eq!(
+            webviews.painting_order,
+            vec![top_level_id(0, 2), top_level_id(0, 1)]
+        );
+        assert_eq!(
+            webviews_sorted(&webviews),
+            vec![
+                (top_level_id(0, 1), 'a'),
+                (top_level_id(0, 2), 'b'),
+                (top_level_id(0, 3), 'c'),
+            ]
+        );
+
+        // painting_order() returns only the visible webviews, in painting order.
+        let mut painting_order = webviews.painting_order();
+        assert_eq!(painting_order.next(), Some((&top_level_id(0, 2), &'b')));
+        assert_eq!(painting_order.next(), Some((&top_level_id(0, 1), &'a')));
+        assert_eq!(painting_order.next(), None);
+        drop(painting_order);
+
+        // remove() removes the given webview from both the map and the painting order.
+        assert!(webviews.remove(top_level_id(0, 1)).is_ok());
+        assert!(webviews.remove(top_level_id(0, 2)).is_ok());
+        assert!(webviews.remove(top_level_id(0, 3)).is_ok());
+        assert!(webviews_sorted(&webviews).is_empty());
+        assert!(webviews.painting_order.is_empty());
+    }
+}

components/compositing/windowing.rs

@@ -7,20 +7,22 @@
 use std::fmt::{Debug, Error, Formatter};
 use std::time::Duration;
 
+use base::id::{PipelineId, TopLevelBrowsingContextId};
 use embedder_traits::{EmbedderProxy, EventLoopWaker};
 use euclid::Scale;
-use gfx::rendering_context::RenderingContext;
 use keyboard_types::KeyboardEvent;
 use libc::c_void;
-use msg::constellation_msg::{PipelineId, TopLevelBrowsingContextId, TraversalDirection};
+use net::protocols::ProtocolRegistry;
 use script_traits::{
-    GamepadEvent, MediaSessionActionType, MouseButton, TouchEventType, TouchId, WheelDelta,
+    GamepadEvent, MediaSessionActionType, MouseButton, TouchEventType, TouchId, TraversalDirection,
+    WheelDelta,
 };
 use servo_geometry::DeviceIndependentPixel;
 use servo_url::ServoUrl;
 use style_traits::DevicePixel;
-use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint};
+use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint, DeviceRect};
 use webrender_api::ScrollLocation;
+use webrender_traits::RenderingContext;
 
 #[derive(Clone)]
 pub enum MouseWindowEvent {
@@ -51,7 +53,7 @@ pub enum EmbedderEvent {
     /// message, the window must make the same GL context as in `PrepareRenderingEvent` current.
     Refresh,
     /// Sent when the window is resized.
-    Resize,
+    WindowResize,
     /// Sent when a navigation request from script is allowed/refused.
     AllowNavigationResponse(PipelineId, bool),
     /// Sent when a new URL is to be loaded.
@@ -83,15 +85,24 @@ pub enum EmbedderEvent {
     Keyboard(KeyboardEvent),
     /// Sent when Ctr+R/Apple+R is called to reload the current page.
     Reload(TopLevelBrowsingContextId),
-    /// Create a new top level browsing context
+    /// Create a new top-level browsing context.
     NewWebView(ServoUrl, TopLevelBrowsingContextId),
-    /// Close a top level browsing context
+    /// Close a top-level browsing context.
     CloseWebView(TopLevelBrowsingContextId),
-    /// Panic a top level browsing context.
+    /// Panic a top-level browsing context.
     SendError(Option<TopLevelBrowsingContextId>, String),
-    /// Make a top level browsing context visible, hiding the previous
-    /// visible one.
+    /// Move and/or resize a webview to the given rect.
+    MoveResizeWebView(TopLevelBrowsingContextId, DeviceRect),
+    /// Start painting a webview, and optionally stop painting all others.
+    ShowWebView(TopLevelBrowsingContextId, bool),
+    /// Stop painting a webview.
+    HideWebView(TopLevelBrowsingContextId),
+    /// Start painting a webview on top of all others, and optionally stop painting all others.
+    RaiseWebViewToTop(TopLevelBrowsingContextId, bool),
+    /// Make a webview focused.
     FocusWebView(TopLevelBrowsingContextId),
+    /// Make none of the webviews focused.
+    BlurWebView,
     /// Toggles a debug flag in WebRender
     ToggleWebRenderDebug(WebRenderDebugOption),
     /// Capture current WebRender
@@ -103,8 +114,8 @@ pub enum EmbedderEvent {
     /// Sent when the user triggers a media action through the UA exposed media UI
     /// (play, pause, seek, etc.).
     MediaSessionAction(MediaSessionActionType),
-    /// The visibility of the webview has changed.
-    WebViewVisibilityChanged(TopLevelBrowsingContextId, bool),
+    /// Set whether to use less resources, by stopping animations and running timers at a heavily limited rate.
+    SetWebViewThrottled(TopLevelBrowsingContextId, bool),
     /// Virtual keyboard was dismissed
     IMEDismissed,
     /// Sent on platforms like Android where the native widget surface can be
@@ -124,7 +135,7 @@ impl Debug for EmbedderEvent {
         match *self {
             EmbedderEvent::Idle => write!(f, "Idle"),
             EmbedderEvent::Refresh => write!(f, "Refresh"),
-            EmbedderEvent::Resize => write!(f, "Resize"),
+            EmbedderEvent::WindowResize => write!(f, "Resize"),
             EmbedderEvent::Keyboard(..) => write!(f, "Keyboard"),
             EmbedderEvent::AllowNavigationResponse(..) => write!(f, "AllowNavigationResponse"),
             EmbedderEvent::LoadUrl(..) => write!(f, "LoadUrl"),
@@ -139,16 +150,38 @@ impl Debug for EmbedderEvent {
             EmbedderEvent::Navigation(..) => write!(f, "Navigation"),
             EmbedderEvent::Quit => write!(f, "Quit"),
             EmbedderEvent::Reload(..) => write!(f, "Reload"),
-            EmbedderEvent::NewWebView(..) => write!(f, "NewWebView"),
+            EmbedderEvent::NewWebView(_, TopLevelBrowsingContextId(webview_id)) => {
+                write!(f, "NewWebView({webview_id:?})")
+            },
             EmbedderEvent::SendError(..) => write!(f, "SendError"),
-            EmbedderEvent::CloseWebView(..) => write!(f, "CloseWebView"),
-            EmbedderEvent::FocusWebView(..) => write!(f, "FocusWebView"),
+            EmbedderEvent::CloseWebView(TopLevelBrowsingContextId(webview_id)) => {
+                write!(f, "CloseWebView({webview_id:?})")
+            },
+            EmbedderEvent::MoveResizeWebView(webview_id, _) => {
+                write!(f, "MoveResizeWebView({webview_id:?})")
+            },
+            EmbedderEvent::ShowWebView(TopLevelBrowsingContextId(webview_id), hide_others) => {
+                write!(f, "ShowWebView({webview_id:?}, {hide_others})")
+            },
+            EmbedderEvent::HideWebView(TopLevelBrowsingContextId(webview_id)) => {
+                write!(f, "HideWebView({webview_id:?})")
+            },
+            EmbedderEvent::RaiseWebViewToTop(
+                TopLevelBrowsingContextId(webview_id),
+                hide_others,
+            ) => {
+                write!(f, "RaiseWebViewToTop({webview_id:?}, {hide_others})")
+            },
+            EmbedderEvent::FocusWebView(TopLevelBrowsingContextId(webview_id)) => {
+                write!(f, "FocusWebView({webview_id:?})")
+            },
+            EmbedderEvent::BlurWebView => write!(f, "BlurWebView"),
             EmbedderEvent::ToggleWebRenderDebug(..) => write!(f, "ToggleWebRenderDebug"),
             EmbedderEvent::CaptureWebRender => write!(f, "CaptureWebRender"),
             EmbedderEvent::ToggleSamplingProfiler(..) => write!(f, "ToggleSamplingProfiler"),
             EmbedderEvent::ExitFullScreen(..) => write!(f, "ExitFullScreen"),
             EmbedderEvent::MediaSessionAction(..) => write!(f, "MediaSessionAction"),
-            EmbedderEvent::WebViewVisibilityChanged(..) => write!(f, "WebViewVisibilityChanged"),
+            EmbedderEvent::SetWebViewThrottled(..) => write!(f, "SetWebViewThrottled"),
             EmbedderEvent::IMEDismissed => write!(f, "IMEDismissed"),
             EmbedderEvent::ClearCache => write!(f, "ClearCache"),
             EmbedderEvent::InvalidateNativeSurface => write!(f, "InvalidateNativeSurface"),
@@ -190,6 +223,17 @@ pub trait EmbedderMethods {
     fn get_user_agent_string(&self) -> Option<String> {
         None
     }
+
+    /// Returns the version string of this embedder.
+    fn get_version_string(&self) -> Option<String> {
+        None
+    }
+
+    /// Returns the protocol handlers implemented by that embedder.
+    /// They will be merged with the default internal ones.
+    fn get_protocol_handlers(&self) -> ProtocolRegistry {
+        ProtocolRegistry::default()
+    }
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -211,15 +255,85 @@ pub struct EmbedderCoordinates {
 impl EmbedderCoordinates {
     /// Get the unflipped viewport rectangle for use with the WebRender API.
     pub fn get_viewport(&self) -> DeviceIntRect {
-        DeviceIntRect::from_untyped(&self.viewport.to_untyped())
+        self.viewport
     }
 
-    /// Get the flipped viewport rectangle. This should be used when drawing directly
-    /// to the framebuffer with OpenGL commands.
+    /// Flip the given rect.
+    /// This should be used when drawing directly to the framebuffer with OpenGL commands.
+    pub fn flip_rect(&self, rect: &DeviceIntRect) -> DeviceIntRect {
+        let mut result = *rect;
+        let min_y = self.framebuffer.height - result.max.y;
+        let max_y = self.framebuffer.height - result.min.y;
+        result.min.y = min_y;
+        result.max.y = max_y;
+        result
+    }
+
+    /// Get the flipped viewport rectangle.
+    /// This should be used when drawing directly to the framebuffer with OpenGL commands.
     pub fn get_flipped_viewport(&self) -> DeviceIntRect {
-        let fb_height = self.framebuffer.height;
-        let mut view = self.viewport.clone();
-        view.origin.y = fb_height - view.origin.y - view.size.height;
-        DeviceIntRect::from_untyped(&view.to_untyped())
+        self.flip_rect(&self.get_viewport())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use euclid::{Point2D, Scale, Size2D};
+    use webrender_api::units::DeviceIntRect;
+
+    use super::EmbedderCoordinates;
+
+    #[test]
+    fn test() {
+        let pos = Point2D::new(0, 0);
+        let viewport = Size2D::new(800, 600);
+        let screen = Size2D::new(1080, 720);
+        let coordinates = EmbedderCoordinates {
+            hidpi_factor: Scale::new(1.),
+            screen,
+            screen_avail: screen,
+            window: (viewport, pos),
+            framebuffer: viewport,
+            viewport: DeviceIntRect::from_origin_and_size(pos, viewport),
+        };
+
+        // Check if viewport conversion is correct.
+        let viewport = DeviceIntRect::new(Point2D::new(0, 0), Point2D::new(800, 600));
+        assert_eq!(coordinates.get_viewport(), viewport);
+        assert_eq!(coordinates.get_flipped_viewport(), viewport);
+
+        // Check rects with different y positions inside the viewport.
+        let rect1 = DeviceIntRect::new(Point2D::new(0, 0), Point2D::new(800, 400));
+        let rect2 = DeviceIntRect::new(Point2D::new(0, 100), Point2D::new(800, 600));
+        let rect3 = DeviceIntRect::new(Point2D::new(0, 200), Point2D::new(800, 500));
+        assert_eq!(
+            coordinates.flip_rect(&rect1),
+            DeviceIntRect::new(Point2D::new(0, 200), Point2D::new(800, 600))
+        );
+        assert_eq!(
+            coordinates.flip_rect(&rect2),
+            DeviceIntRect::new(Point2D::new(0, 0), Point2D::new(800, 500))
+        );
+        assert_eq!(
+            coordinates.flip_rect(&rect3),
+            DeviceIntRect::new(Point2D::new(0, 100), Point2D::new(800, 400))
+        );
+
+        // Check rects with different x positions.
+        let rect1 = DeviceIntRect::new(Point2D::new(0, 0), Point2D::new(700, 400));
+        let rect2 = DeviceIntRect::new(Point2D::new(100, 100), Point2D::new(800, 600));
+        let rect3 = DeviceIntRect::new(Point2D::new(300, 200), Point2D::new(600, 500));
+        assert_eq!(
+            coordinates.flip_rect(&rect1),
+            DeviceIntRect::new(Point2D::new(0, 200), Point2D::new(700, 600))
+        );
+        assert_eq!(
+            coordinates.flip_rect(&rect2),
+            DeviceIntRect::new(Point2D::new(100, 0), Point2D::new(800, 500))
+        );
+        assert_eq!(
+            coordinates.flip_rect(&rect3),
+            DeviceIntRect::new(Point2D::new(300, 100), Point2D::new(600, 400))
+        );
     }
 }

components/config/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_config"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_config"
@@ -14,7 +14,6 @@ path = "lib.rs"
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
 getopts = { workspace = true }
-lazy_static = { workspace = true }
 log = { workspace = true }
 num_cpus = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -22,7 +21,8 @@ serde_json = { workspace = true }
 servo_config_plugins = { path = "../config_plugins" }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
+style_config = { workspace = true }
 url = { workspace = true }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-dirs-next = "2.0"
+dirs = "5.0"

components/config/basedir.rs

@@ -15,7 +15,7 @@ use std::path::PathBuf;
     not(target_os = "android")
 ))]
 pub fn default_config_dir() -> Option<PathBuf> {
-    let mut config_dir = ::dirs_next::config_dir().unwrap();
+    let mut config_dir = ::dirs::config_dir().unwrap();
     config_dir.push("servo");
     config_dir.push("default");
     Some(config_dir)
@@ -30,14 +30,14 @@ pub fn default_config_dir() -> Option<PathBuf> {
 pub fn default_config_dir() -> Option<PathBuf> {
     // FIXME: use `config_dir()` ($HOME/Library/Preferences)
     // instead of `data_dir()` ($HOME/Library/Application Support) ?
-    let mut config_dir = ::dirs_next::data_dir().unwrap();
+    let mut config_dir = ::dirs::data_dir().unwrap();
     config_dir.push("Servo");
     Some(config_dir)
 }
 
-#[cfg(all(target_os = "windows"))]
+#[cfg(target_os = "windows")]
 pub fn default_config_dir() -> Option<PathBuf> {
-    let mut config_dir = ::dirs_next::config_dir().unwrap();
+    let mut config_dir = ::dirs::config_dir().unwrap();
     config_dir.push("Servo");
     Some(config_dir)
 }

components/config/opts.rs

@@ -7,15 +7,14 @@
 
 use std::default::Default;
 use std::fs::{self, File};
-use std::io::{self, Read, Write};
+use std::io::Read;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{RwLock, RwLockReadGuard};
+use std::sync::{LazyLock, RwLock, RwLockReadGuard};
 use std::{env, process};
 
 use euclid::Size2D;
 use getopts::{Matches, Options};
-use lazy_static::lazy_static;
 use log::error;
 use serde::{Deserialize, Serialize};
 use servo_geometry::DeviceIndependentPixel;
@@ -27,8 +26,6 @@ use crate::{pref, set_pref};
 /// Global flags for Servo, currently set on the command line.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Opts {
-    pub is_running_problem_test: bool,
-
     /// Whether or not the legacy layout system is enabled.
     pub legacy_layout: bool,
 
@@ -385,7 +382,7 @@ pub enum OutputOptions {
 }
 
 fn args_fail(msg: &str) -> ! {
-    writeln!(io::stderr(), "{}", msg).unwrap();
+    eprintln!("{}", msg);
     process::exit(1)
 }
 
@@ -398,7 +395,6 @@ pub fn multiprocess() -> bool {
 
 pub fn default_opts() -> Opts {
     Opts {
-        is_running_problem_test: false,
         legacy_layout: false,
         tile_size: 512,
         time_profiling: None,
@@ -598,18 +594,6 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
         DebugOptions::print_usage(app_name)
     }
 
-    let cwd = env::current_dir().unwrap();
-    let url_opt = if !opt_match.free.is_empty() {
-        Some(&opt_match.free[0][..])
-    } else {
-        None
-    };
-    let is_running_problem_test = url_opt.as_ref().map_or(false, |url| {
-        url.starts_with("http://web-platform.test:8000/2dcontext/drawing-images-to-the-canvas/") ||
-            url.starts_with("http://web-platform.test:8000/_mozilla/mozilla/canvas/") ||
-            url.starts_with("http://web-platform.test:8000/_mozilla/css/canvas_over_area.html")
-    });
-
     let tile_size: usize = match opt_match.opt_str("s") {
         Some(tile_size_str) => tile_size_str
             .parse()
@@ -733,6 +717,7 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
         .opt_strs("user-stylesheet")
         .iter()
         .map(|filename| {
+            let cwd = env::current_dir().unwrap();
             let path = cwd.join(filename);
             let url = ServoUrl::from_url(Url::from_file_path(&path).unwrap());
             let mut contents = Vec::new();
@@ -749,12 +734,10 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
     let legacy_layout = opt_match.opt_present("legacy-layout");
     if legacy_layout {
         set_pref!(layout.legacy_layout, true);
-        set_pref!(layout.flexbox.enabled, true);
     }
 
     let opts = Opts {
         debug: debug_options.clone(),
-        is_running_problem_test,
         legacy_layout,
         tile_size,
         time_profiling,
@@ -793,7 +776,7 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
         set_pref!(layout.threads, layout_threads as i64);
     }
 
-    return ArgumentParsingResult::ChromeProcess(opt_match);
+    ArgumentParsingResult::ChromeProcess(opt_match)
 }
 
 pub enum ArgumentParsingResult {
@@ -804,9 +787,7 @@ pub enum ArgumentParsingResult {
 // Make Opts available globally. This saves having to clone and pass
 // opts everywhere it is used, which gets particularly cumbersome
 // when passing through the DOM structures.
-lazy_static! {
-    static ref OPTIONS: RwLock<Opts> = RwLock::new(default_opts());
-}
+static OPTIONS: LazyLock<RwLock<Opts>> = LazyLock::new(|| RwLock::new(default_opts()));
 
 pub fn set_options(opts: Opts) {
     MULTIPROCESS.store(opts.multiprocess, Ordering::SeqCst);

components/config/pref_util.rs

@@ -3,7 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::collections::HashMap;
-use std::convert::TryInto;
 use std::fmt;
 use std::str::FromStr;
 use std::sync::RwLock;
@@ -55,10 +54,7 @@ impl PrefValue {
     }
 
     pub fn is_missing(&self) -> bool {
-        match self {
-            PrefValue::Missing => true,
-            _ => false,
-        }
+        matches!(self, PrefValue::Missing)
     }
 
     pub fn from_json_value(value: &Value) -> Option<Self> {
@@ -161,10 +157,9 @@ impl From<PrefValue> for [f64; 4] {
     fn from(other: PrefValue) -> [f64; 4] {
         match other {
             PrefValue::Array(values) if values.len() == 4 => {
-                let mut f = values.into_iter().map(|v| v.try_into());
-                if f.all(|v| v.is_ok()) {
-                    let f = f.flatten().collect::<Vec<f64>>();
-                    return [f[0], f[1], f[2], f[3]];
+                let f = values.into_iter().map(Into::into).collect::<Vec<f64>>();
+                if f.len() == 4 {
+                    [f[0], f[1], f[2], f[3]]
                 } else {
                     panic!(
                         "Cannot convert PrefValue to {:?}",
@@ -191,7 +186,7 @@ pub enum PrefError {
 impl fmt::Display for PrefError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            PrefError::NoSuchPref(s) | PrefError::InvalidValue(s) => f.write_str(&s),
+            PrefError::NoSuchPref(s) | PrefError::InvalidValue(s) => f.write_str(s),
             PrefError::JsonParseErr(e) => e.fmt(f),
         }
     }
@@ -200,15 +195,16 @@ impl fmt::Display for PrefError {
 impl std::error::Error for PrefError {}
 
 pub struct Accessor<P, V> {
-    pub getter: Box<dyn Fn(&P) -> V + Sync>,
-    pub setter: Box<dyn Fn(&mut P, V) + Sync>,
+    pub getter: Box<dyn Fn(&P) -> V + Sync + Send>,
+    #[allow(clippy::type_complexity)]
+    pub setter: Box<dyn Fn(&mut P, V) + Sync + Send>,
 }
 
 impl<P, V> Accessor<P, V> {
     pub fn new<G, S>(getter: G, setter: S) -> Self
     where
-        G: Fn(&P) -> V + Sync + 'static,
-        S: Fn(&mut P, V) + Sync + 'static,
+        G: Fn(&P) -> V + Sync + Send + 'static,
+        S: Fn(&mut P, V) + Sync + Send + 'static,
     {
         Accessor {
             getter: Box::new(getter),
@@ -261,7 +257,7 @@ impl<'m, P: Clone> Preferences<'m, P> {
     }
 
     /// Creates an iterator over all keys and values
-    pub fn iter<'a>(&'a self) -> impl Iterator<Item = (String, PrefValue)> + 'a {
+    pub fn iter(&self) -> impl Iterator<Item = (String, PrefValue)> + '_ {
         let prefs = self.user_prefs.read().unwrap();
         self.accessors
             .iter()
@@ -269,16 +265,17 @@ impl<'m, P: Clone> Preferences<'m, P> {
     }
 
     /// Creates an iterator over all keys
-    pub fn keys<'a>(&'a self) -> impl Iterator<Item = &'a str> + 'a {
+    pub fn keys(&self) -> impl Iterator<Item = &'_ str> {
         self.accessors.keys().map(String::as_str)
     }
 
-    fn set_inner<V>(&self, key: &str, mut prefs: &mut P, val: V) -> Result<(), PrefError>
+    fn set_inner<V>(&self, key: &str, prefs: &mut P, val: V) -> Result<(), PrefError>
     where
         V: Into<PrefValue>,
     {
         if let Some(accessor) = self.accessors.get(key) {
-            Ok((accessor.setter)(&mut prefs, val.into()))
+            (accessor.setter)(prefs, val.into());
+            Ok(())
         } else {
             Err(PrefError::NoSuchPref(String::from(key)))
         }

components/config/prefs.rs

@@ -4,22 +4,26 @@
 
 use std::borrow::ToOwned;
 use std::collections::HashMap;
+use std::convert::{TryFrom, TryInto};
+use std::sync::LazyLock;
 
 use embedder_traits::resources::{self, Resource};
 use gen::Prefs;
-use lazy_static::lazy_static;
+use log::warn;
 use serde_json::{self, Value};
 
 use crate::pref_util::Preferences;
 pub use crate::pref_util::{PrefError, PrefValue};
 
-lazy_static! {
-    static ref PREFS: Preferences<'static, Prefs> = {
-        let def_prefs: Prefs = serde_json::from_str(&resources::read_string(Resource::Preferences))
-            .expect("Failed to initialize config preferences.");
-        Preferences::new(def_prefs, &gen::PREF_ACCESSORS)
-    };
-}
+static PREFS: LazyLock<Preferences<'static, Prefs>> = LazyLock::new(|| {
+    let def_prefs: Prefs = serde_json::from_str(&resources::read_string(Resource::Preferences))
+        .expect("Failed to initialize config preferences.");
+    let result = Preferences::new(def_prefs, &gen::PREF_ACCESSORS);
+    for (key, value) in result.iter() {
+        set_stylo_pref_ref(&key, &value);
+    }
+    result
+});
 
 /// A convenience macro for accessing a preference value using its static path.
 /// Passing an invalid path is a compile-time error.
@@ -38,9 +42,11 @@ macro_rules! pref {
 #[macro_export]
 macro_rules! set_pref {
     ($($segment: ident).+, $value: expr) => {{
+        let value = $value;
+        $crate::prefs::set_stylo_pref(stringify!($($segment).+), value);
         let values = $crate::prefs::pref_map().values();
         let mut lock = values.write().unwrap();
-        lock$ (.$segment)+ = $value;
+        lock$ (.$segment)+ = value;
     }};
 }
 
@@ -56,14 +62,65 @@ pub fn pref_map() -> &'static Preferences<'static, Prefs> {
 }
 
 pub fn add_user_prefs(prefs: HashMap<String, PrefValue>) {
-    if let Err(error) = PREFS.set_all(prefs.into_iter()) {
+    for (key, value) in prefs.iter() {
+        set_stylo_pref_ref(key, value);
+    }
+    if let Err(error) = PREFS.set_all(prefs) {
         panic!("Error setting preference: {:?}", error);
     }
 }
 
+pub fn set_stylo_pref(key: &str, value: impl Into<PrefValue>) {
+    set_stylo_pref_ref(key, &value.into());
+}
+
+fn set_stylo_pref_ref(key: &str, value: &PrefValue) {
+    match value.try_into() {
+        Ok(StyloPrefValue::Bool(value)) => style_config::set_bool(key, value),
+        Ok(StyloPrefValue::Int(value)) => style_config::set_i32(key, value),
+        Err(TryFromPrefValueError::IntegerOverflow(value)) => {
+            // TODO: logging doesn’t actually work this early, so we should
+            // split PrefValue into i32 and i64 variants.
+            warn!("Pref value too big for Stylo: {} ({})", key, value);
+        },
+        Err(TryFromPrefValueError::UnmappedType) => {
+            // Most of Servo’s prefs will hit this. When adding a new pref type
+            // in Stylo, update TryFrom<&PrefValue> for StyloPrefValue as well.
+        },
+    }
+}
+
+enum StyloPrefValue {
+    Bool(bool),
+    Int(i32),
+}
+
+enum TryFromPrefValueError {
+    IntegerOverflow(i64),
+    UnmappedType,
+}
+
+impl TryFrom<&PrefValue> for StyloPrefValue {
+    type Error = TryFromPrefValueError;
+
+    fn try_from(value: &PrefValue) -> Result<Self, Self::Error> {
+        match *value {
+            PrefValue::Int(value) => {
+                if let Ok(value) = value.try_into() {
+                    Ok(Self::Int(value))
+                } else {
+                    Err(TryFromPrefValueError::IntegerOverflow(value))
+                }
+            },
+            PrefValue::Bool(value) => Ok(Self::Bool(value)),
+            _ => Err(TryFromPrefValueError::UnmappedType),
+        }
+    }
+}
+
 pub fn read_prefs_map(txt: &str) -> Result<HashMap<String, PrefValue>, PrefError> {
     let prefs: HashMap<String, Value> =
-        serde_json::from_str(txt).map_err(|e| PrefError::JsonParseErr(e))?;
+        serde_json::from_str(txt).map_err(PrefError::JsonParseErr)?;
     prefs
         .into_iter()
         .map(|(k, pref_value)| {
@@ -74,7 +131,7 @@ pub fn read_prefs_map(txt: &str) -> Result<HashMap<String, PrefValue>, PrefError
                     Value::Number(n) if n.is_f64() => PrefValue::Float(n.as_f64().unwrap()),
                     Value::String(s) => PrefValue::Str(s.to_owned()),
                     Value::Array(v) => {
-                        let mut array = v.iter().map(|v| PrefValue::from_json_value(v));
+                        let mut array = v.iter().map(PrefValue::from_json_value);
                         if array.all(|v| v.is_some()) {
                             PrefValue::Array(array.flatten().collect())
                         } else {
@@ -106,6 +163,14 @@ mod gen {
         std::cmp::max(num_cpus::get() * 3 / 4, 1) as i64
     }
 
+    fn default_font_size() -> i64 {
+        16
+    }
+
+    fn default_monospace_font_size() -> i64 {
+        13
+    }
+
     fn black() -> i64 {
         0x000000
     }
@@ -129,6 +194,23 @@ mod gen {
                     foreground_color: i64,
                 }
             },
+            fonts: {
+                #[serde(default)]
+                default: String,
+                #[serde(default)]
+                serif: String,
+                #[serde(default)]
+                #[serde(rename = "fonts.sans-serif")]
+                sans_serif: String,
+                #[serde(default)]
+                monospace: String,
+                #[serde(default = "default_font_size")]
+                #[serde(rename = "fonts.default-size")]
+                default_size: i64,
+                #[serde(default = "default_monospace_font_size")]
+                #[serde(rename = "fonts.default-monospace-size")]
+                default_monospace_size: i64,
+            },
             css: {
                 animations: {
                     testing: {
@@ -147,6 +229,8 @@ mod gen {
                 webgpu: {
                     /// Enable WebGPU APIs.
                     enabled: bool,
+                    /// List of comma-separated backends to be used by wgpu
+                    wgpu_backend: String,
                 },
                 bluetooth: {
                     enabled: bool,
@@ -154,6 +238,7 @@ mod gen {
                         enabled: bool,
                     }
                 },
+                allow_scripts_to_close_windows: bool,
                 canvas_capture: {
                     enabled: bool,
                 },
@@ -207,6 +292,9 @@ mod gen {
                         allowed_in_nonsecure_contexts: bool,
                     }
                 },
+                resize_observer: {
+                    enabled: bool,
+                },
                 script: {
                     asynch: bool,
                 },
@@ -311,6 +399,9 @@ mod gen {
                     layers: {
                         enabled: bool,
                     },
+                    openxr: {
+                        enabled: bool,
+                    },
                     sessionavailable: bool,
                     #[serde(rename = "dom.webxr.unsafe-assume-user-intent")]
                     unsafe_assume_user_intent: bool,
@@ -419,12 +510,6 @@ mod gen {
                 shared_memory: {
                     enabled: bool,
                 },
-                strict: {
-                    debug: {
-                        enabled: bool,
-                    },
-                    enabled: bool,
-                },
                 throw_on_asmjs_validation_failure: {
                     enabled: bool,
                 },
@@ -460,9 +545,6 @@ mod gen {
                     enabled: bool,
                 },
                 legacy_layout: bool,
-                tables: {
-                    enabled: bool,
-                },
                 #[serde(default = "default_layout_threads")]
                 threads: i64,
                 writing_mode: {
@@ -490,6 +572,9 @@ mod gen {
                     #[serde(rename = "network.http-cache.disabled")]
                     disabled: bool,
                 },
+                local_directory_listing: {
+                    enabled: bool,
+                },
                 mime: {
                     sniff: bool,
                 }

components/config_plugins/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_config_plugins"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_config_plugins"

components/config_plugins/lib.rs

@@ -108,13 +108,12 @@ impl Build {
         let num_prefs = self.path_map.len();
 
         self.output.extend(quote! {
-            lazy_static::lazy_static! {
-                pub static ref #gen_accessors: std::collections::HashMap<String, #accessor_type> = {
+            pub static #gen_accessors: std::sync::LazyLock<std::collections::HashMap<String, #accessor_type>> =
+                std::sync::LazyLock::new(|| {
                     let mut map = std::collections::HashMap::with_capacity(#num_prefs);
                     #(#values)*
                     map
-                };
-            }
+                });
         });
     }
 

components/config_plugins/parse.rs

@@ -132,7 +132,7 @@ impl Parse for RootTypeDef {
 impl Parse for NewTypeDef {
     fn parse(input: ParseStream<'_>) -> Result<Self> {
         let content;
-        #[allow(clippy::eval_order_dependence)]
+        #[allow(clippy::mixed_read_write_in_expression)]
         Ok(NewTypeDef {
             _braces: braced!(content in input),
             fields: Punctuated::parse_terminated_with(&content, Field::parse)?,

components/constellation/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "constellation"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "constellation"
@@ -15,8 +15,10 @@ default = []
 multiview = []
 
 [dependencies]
+background_hang_monitor_api = { workspace = true }
 background_hang_monitor = { path = "../background_hang_monitor" }
 backtrace = { workspace = true }
+base = { workspace = true }
 bluetooth_traits = { workspace = true }
 canvas_traits = { workspace = true }
 compositing_traits = { workspace = true }
@@ -24,30 +26,29 @@ crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
 euclid = { workspace = true }
-gfx = { path = "../gfx" }
-gfx_traits = { workspace = true }
+fonts = { path = "../fonts" }
+fonts_traits = { workspace = true }
 http = { workspace = true }
 ipc-channel = { workspace = true }
 keyboard-types = { workspace = true }
-layout_traits = { workspace = true }
 log = { workspace = true }
 media = { path = "../media" }
-metrics = { path = "../metrics" }
-msg = { workspace = true }
 net = { path = "../net" }
 net_traits = { workspace = true }
+parking_lot = { workspace = true }
 profile_traits = { workspace = true }
+script_layout_interface = { workspace = true }
 script_traits = { workspace = true }
 serde = { workspace = true }
 servo_config = { path = "../config" }
 servo_rand = { path = "../rand" }
-servo_remutex = { path = "../remutex" }
 servo_url = { path = "../url" }
 style_traits = { workspace = true }
 webgpu = { path = "../webgpu" }
 webrender = { workspace = true }
 webrender_api = { workspace = true }
 webrender_traits = { workspace = true }
+tracing = { workspace = true }
 webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 
 [target.'cfg(any(target_os="macos", all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64"))))'.dependencies]

components/constellation/browsingcontext.rs

@@ -4,11 +4,9 @@
 
 use std::collections::{HashMap, HashSet};
 
+use base::id::{BrowsingContextGroupId, BrowsingContextId, PipelineId, TopLevelBrowsingContextId};
 use euclid::Size2D;
 use log::warn;
-use msg::constellation_msg::{
-    BrowsingContextGroupId, BrowsingContextId, PipelineId, TopLevelBrowsingContextId,
-};
 use style_traits::CSSPixel;
 
 use crate::pipeline::Pipeline;
@@ -30,9 +28,9 @@ pub struct NewBrowsingContextInfo {
     /// Whether this browsing context inherits a secure context.
     pub inherited_secure_context: Option<bool>,
 
-    /// Whether this browsing context should be treated as visible for the
-    /// purposes of scheduling and resource management.
-    pub is_visible: bool,
+    /// Whether this browsing context should be throttled, using less resources
+    /// by stopping animations and running timers at a heavily limited rate.
+    pub throttled: bool,
 }
 
 /// The constellation's view of a browsing context.
@@ -60,9 +58,9 @@ pub struct BrowsingContext {
     /// Whether this browsing context inherits a secure context.
     pub inherited_secure_context: Option<bool>,
 
-    /// Whether this browsing context should be treated as visible for the
-    /// purposes of scheduling and resource management.
-    pub is_visible: bool,
+    /// Whether this browsing context should be throttled, using less resources
+    /// by stopping animations and running timers at a heavily limited rate.
+    pub throttled: bool,
 
     /// The pipeline for the current session history entry.
     pub pipeline_id: PipelineId,
@@ -79,6 +77,7 @@ pub struct BrowsingContext {
 impl BrowsingContext {
     /// Create a new browsing context.
     /// Note this just creates the browsing context, it doesn't add it to the constellation's set of browsing contexts.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         bc_group_id: BrowsingContextGroupId,
         id: BrowsingContextId,
@@ -88,7 +87,7 @@ impl BrowsingContext {
         size: Size2D<f32, CSSPixel>,
         is_private: bool,
         inherited_secure_context: Option<bool>,
-        is_visible: bool,
+        throttled: bool,
     ) -> BrowsingContext {
         let mut pipelines = HashSet::new();
         pipelines.insert(pipeline_id);
@@ -99,7 +98,7 @@ impl BrowsingContext {
             size,
             is_private,
             inherited_secure_context,
-            is_visible,
+            throttled,
             pipeline_id,
             parent_pipeline_id,
             pipelines,
@@ -198,7 +197,7 @@ impl<'a> Iterator for AllBrowsingContextsIterator<'a> {
             let child_browsing_context_ids = browsing_context
                 .pipelines
                 .iter()
-                .filter_map(|pipeline_id| pipelines.get(&pipeline_id))
+                .filter_map(|pipeline_id| pipelines.get(pipeline_id))
                 .flat_map(|pipeline| pipeline.children.iter());
             self.stack.extend(child_browsing_context_ids);
             return Some(browsing_context);

components/constellation/event_loop.rs

@@ -31,7 +31,7 @@ impl EventLoop {
     /// Create a new event loop from the channel to its script thread.
     pub fn new(script_chan: IpcSender<ConstellationControlMsg>) -> Rc<EventLoop> {
         Rc::new(EventLoop {
-            script_chan: script_chan,
+            script_chan,
             dont_send_or_sync: PhantomData,
         })
     }

components/constellation/lib.rs

@@ -4,6 +4,9 @@
 
 #![deny(unsafe_code)]
 
+#[macro_use]
+mod tracing;
+
 mod browsingcontext;
 mod constellation;
 mod event_loop;

components/constellation/logging.rs

@@ -7,12 +7,12 @@ use std::sync::Arc;
 use std::thread;
 
 use backtrace::Backtrace;
+use base::id::TopLevelBrowsingContextId;
 use compositing_traits::ConstellationMsg as FromCompositorMsg;
 use crossbeam_channel::Sender;
 use log::{Level, LevelFilter, Log, Metadata, Record};
-use msg::constellation_msg::TopLevelBrowsingContextId;
+use parking_lot::ReentrantMutex;
 use script_traits::{LogEntry, ScriptMsg as FromScriptMsg, ScriptToConstellationChan};
-use servo_remutex::ReentrantMutex;
 
 /// The constellation uses logging to perform crash reporting.
 /// The constellation receives all `warn!`, `error!` and `panic!` messages,
@@ -55,10 +55,7 @@ impl Log for FromScriptLogger {
         if let Some(entry) = log_entry(record) {
             let thread_name = thread::current().name().map(ToOwned::to_owned);
             let msg = FromScriptMsg::LogEntry(thread_name, entry);
-            let chan = self
-                .script_to_constellation_chan
-                .lock()
-                .unwrap_or_else(|err| err.into_inner());
+            let chan = self.script_to_constellation_chan.lock();
             let _ = chan.send(msg);
         }
     }
@@ -97,10 +94,7 @@ impl Log for FromCompositorLogger {
             let top_level_id = TopLevelBrowsingContextId::installed();
             let thread_name = thread::current().name().map(ToOwned::to_owned);
             let msg = FromCompositorMsg::LogEntry(top_level_id, thread_name, entry);
-            let chan = self
-                .constellation_chan
-                .lock()
-                .unwrap_or_else(|err| err.into_inner());
+            let chan = self.constellation_chan.lock();
             let _ = chan.send(msg);
         }
     }

components/constellation/network_listener.rs

@@ -6,14 +6,14 @@
 //! Any redirects that are encountered are followed. Whenever a non-redirect
 //! response is received, it is forwarded to the appropriate script thread.
 
+use base::id::PipelineId;
 use crossbeam_channel::Sender;
-use http::HeaderMap;
+use http::{header, HeaderMap};
 use ipc_channel::ipc;
 use ipc_channel::router::ROUTER;
 use log::warn;
-use msg::constellation_msg::PipelineId;
-use net::http_loader::{set_default_accept, set_default_accept_language};
-use net_traits::request::{Destination, Referrer, RequestBuilder};
+use net::http_loader::{set_default_accept_language, DOCUMENT_ACCEPT_HEADER_VALUE};
+use net_traits::request::{Referrer, RequestBuilder};
 use net_traits::response::ResponseInit;
 use net_traits::{
     CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseMsg, IpcSend, NetworkError,
@@ -54,7 +54,7 @@ impl NetworkListener {
             request_builder: self.request_builder.clone(),
             resource_threads: self.resource_threads.clone(),
             sender: self.sender.clone(),
-            pipeline_id: self.pipeline_id.clone(),
+            pipeline_id: self.pipeline_id,
             should_send: false,
         };
 
@@ -66,7 +66,17 @@ impl NetworkListener {
                 None,
             ),
             None => {
-                set_default_accept(Destination::Document, &mut listener.request_builder.headers);
+                if !listener
+                    .request_builder
+                    .headers
+                    .contains_key(header::ACCEPT)
+                {
+                    listener
+                        .request_builder
+                        .headers
+                        .insert(header::ACCEPT, DOCUMENT_ACCEPT_HEADER_VALUE);
+                }
+
                 set_default_accept_language(&mut listener.request_builder.headers);
 
                 CoreResourceMsg::Fetch(
@@ -119,7 +129,7 @@ impl NetworkListener {
                         self.request_builder.referrer = metadata
                             .referrer
                             .clone()
-                            .map(|referrer_url| Referrer::ReferrerUrl(referrer_url))
+                            .map(Referrer::ReferrerUrl)
                             .unwrap_or(Referrer::NoReferrer);
                         self.request_builder.referrer_policy = metadata.referrer_policy;
 

components/constellation/pipeline.rs

@@ -5,37 +5,37 @@
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
-use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
 use background_hang_monitor::HangMonitorRegister;
+use background_hang_monitor_api::{
+    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, HangMonitorAlert,
+};
+use base::id::{
+    BrowsingContextId, HistoryStateId, PipelineId, PipelineNamespace, PipelineNamespaceId,
+    PipelineNamespaceRequest, TopLevelBrowsingContextId,
+};
+use base::Epoch;
 use bluetooth_traits::BluetoothRequest;
 use canvas_traits::webgl::WebGLPipeline;
 use compositing_traits::{CompositionPipeline, CompositorMsg, CompositorProxy};
 use crossbeam_channel::{unbounded, Sender};
 use devtools_traits::{DevtoolsControlMsg, ScriptToDevtoolsControlMsg};
-use embedder_traits::EventLoopWaker;
-use gfx::font_cache_thread::FontCacheThread;
+use fonts::FontCacheThread;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use ipc_channel::Error;
-use layout_traits::LayoutThreadFactory;
 use log::{debug, error, warn};
 use media::WindowGLContext;
-use metrics::PaintTimeMetrics;
-use msg::constellation_msg::{
-    BackgroundHangMonitorControlMsg, BackgroundHangMonitorRegister, BrowsingContextId,
-    HangMonitorAlert, HistoryStateId, PipelineId, PipelineNamespace, PipelineNamespaceId,
-    PipelineNamespaceRequest, TopLevelBrowsingContextId,
-};
 use net::image_cache::ImageCacheImpl;
 use net_traits::image_cache::ImageCache;
 use net_traits::ResourceThreads;
 use profile_traits::{mem as profile_mem, time};
+use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
 use script_traits::{
     AnimationState, ConstellationControlMsg, DiscardBrowsingContext, DocumentActivity,
-    InitialScriptState, LayoutControlMsg, LayoutMsg, LoadData, NewLayoutInfo, SWManagerMsg,
-    ScriptThreadFactory, ScriptToConstellationChan, TimerSchedulerMsg, WindowSizeData,
+    InitialScriptState, LayoutMsg, LoadData, NewLayoutInfo, SWManagerMsg,
+    ScriptToConstellationChan, TimerSchedulerMsg, WindowSizeData,
 };
 use serde::{Deserialize, Serialize};
 use servo_config::opts::{self, Opts};
@@ -47,10 +47,8 @@ use webrender_api::DocumentId;
 use crate::event_loop::EventLoop;
 use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
 
-/// A `Pipeline` is the constellation's view of a `Document`. Each pipeline has an
-/// event loop (executed by a script thread) and a layout thread. A script thread
-/// may be responsible for many pipelines, but a layout thread is only responsible
-/// for one.
+/// A `Pipeline` is the constellation's view of a `Window`. Each pipeline has an event loop
+/// (executed by a script thread). A script thread may be responsible for many pipelines.
 pub struct Pipeline {
     /// The ID of the pipeline.
     pub id: PipelineId,
@@ -66,9 +64,6 @@ pub struct Pipeline {
     /// The event loop handling this pipeline.
     pub event_loop: Rc<EventLoop>,
 
-    /// A channel to layout, for performing reflows and shutdown.
-    pub layout_chan: IpcSender<LayoutControlMsg>,
-
     /// A channel to the compositor.
     pub compositor_proxy: CompositorProxy,
 
@@ -98,6 +93,10 @@ pub struct Pipeline {
 
     /// The title of this pipeline's document.
     pub title: String,
+
+    /// The last compositor [`Epoch`] that was laid out in this pipeline if "exit after load" is
+    /// enabled.
+    pub layout_epoch: Epoch,
 }
 
 /// Initial setup data needed to construct a pipeline.
@@ -133,9 +132,12 @@ pub struct InitialPipelineState {
     /// A channel for the background hang monitor to send messages to the constellation.
     pub background_hang_monitor_to_constellation_chan: IpcSender<HangMonitorAlert>,
 
-    /// A channel for the layout thread to send messages to the constellation.
+    /// A channel for the layout to send messages to the constellation.
     pub layout_to_constellation_chan: IpcSender<LayoutMsg>,
 
+    /// A fatory for creating layouts to be used by the ScriptThread.
+    pub layout_factory: Arc<dyn LayoutFactory>,
+
     /// A channel to schedule timer events.
     pub scheduler_chan: IpcSender<TimerSchedulerMsg>,
 
@@ -175,17 +177,17 @@ pub struct InitialPipelineState {
     /// Information about the page to load.
     pub load_data: LoadData,
 
-    /// Whether the browsing context in which pipeline is embedded is visible
-    /// for the purposes of scheduling and resource management. This field is
-    /// only used to notify script and compositor threads after spawning
-    /// a pipeline.
-    pub prev_visibility: bool,
+    /// Whether the browsing context in which pipeline is embedded is throttled,
+    /// using less resources by stopping animations and running timers at a
+    /// heavily limited rate. This field is only used to notify script and
+    /// compositor threads after spawning a pipeline.
+    pub prev_throttled: bool,
 
     /// Webrender api.
-    pub webrender_image_api_sender: net_traits::WebrenderIpcSender,
+    pub webrender_image_api_sender: webrender_traits::WebRenderNetApi,
 
     /// Webrender api.
-    pub webrender_api_sender: script_traits::WebrenderIpcSender,
+    pub webrender_api_sender: webrender_traits::WebRenderScriptApi,
 
     /// The ID of the document processed by this script thread.
     pub webrender_document: DocumentId,
@@ -199,9 +201,6 @@ pub struct InitialPipelineState {
     /// Application window's GL Context for Media player
     pub player_context: WindowGLContext,
 
-    /// Mechanism to force the compositor to process events.
-    pub event_loop_waker: Option<Box<dyn EventLoopWaker>>,
-
     /// User agent string to report in network requests.
     pub user_agent: Cow<'static, str>,
 }
@@ -212,17 +211,12 @@ pub struct NewPipeline {
 }
 
 impl Pipeline {
-    /// Starts a layout thread, and possibly a script thread, in
-    /// a new process if requested.
-    pub fn spawn<Message, LTF, STF>(state: InitialPipelineState) -> Result<NewPipeline, Error>
-    where
-        LTF: LayoutThreadFactory<Message = Message>,
-        STF: ScriptThreadFactory<Message = Message>,
-    {
+    /// Possibly starts a script thread, in a new process if requested.
+    pub fn spawn<STF: ScriptThreadFactory>(
+        state: InitialPipelineState,
+    ) -> Result<NewPipeline, Error> {
         // Note: we allow channel creation to panic, since recovering from this
         // probably requires a general low-memory strategy.
-        let (pipeline_chan, pipeline_port) = ipc::channel().expect("Pipeline main chan");
-
         let (script_chan, bhm_control_chan) = match state.event_loop {
             Some(script_chan) => {
                 let new_layout_info = NewLayoutInfo {
@@ -233,7 +227,6 @@ impl Pipeline {
                     opener: state.opener,
                     load_data: state.load_data.clone(),
                     window_size: state.window_size,
-                    pipeline_port: pipeline_port,
                 };
 
                 if let Err(e) =
@@ -296,10 +289,9 @@ impl Pipeline {
                     layout_to_constellation_chan: state.layout_to_constellation_chan,
                     script_chan: script_chan.clone(),
                     load_data: state.load_data.clone(),
-                    script_port: script_port,
+                    script_port,
                     opts: (*opts::get()).clone(),
                     prefs: prefs::pref_map().iter().collect(),
-                    pipeline_port: pipeline_port,
                     pipeline_namespace_id: state.pipeline_namespace_id,
                     webrender_api_sender: state.webrender_api_sender,
                     webrender_image_api_sender: state.webrender_image_api_sender,
@@ -317,14 +309,18 @@ impl Pipeline {
                     let (bhm_control_chan, bhm_control_port) =
                         ipc::channel().expect("Sampler chan");
                     unprivileged_pipeline_content.bhm_control_port = Some(bhm_control_port);
-                    let _ = unprivileged_pipeline_content.spawn_multiprocess()?;
+                    unprivileged_pipeline_content.spawn_multiprocess()?;
                     Some(bhm_control_chan)
                 } else {
                     // Should not be None in single-process mode.
                     let register = state
                         .background_monitor_register
                         .expect("Couldn't start content, no background monitor has been initiated");
-                    unprivileged_pipeline_content.start_all::<Message, LTF, STF>(false, register);
+                    unprivileged_pipeline_content.start_all::<STF>(
+                        false,
+                        state.layout_factory,
+                        register,
+                    );
                     None
                 };
 
@@ -338,9 +334,8 @@ impl Pipeline {
             state.top_level_browsing_context_id,
             state.opener,
             script_chan,
-            pipeline_chan,
             state.compositor_proxy,
-            state.prev_visibility,
+            state.prev_throttled,
             state.load_data,
         );
         Ok(NewPipeline {
@@ -349,38 +344,37 @@ impl Pipeline {
         })
     }
 
-    /// Creates a new `Pipeline`, after the script and layout threads have been
-    /// spawned.
+    /// Creates a new `Pipeline`, after the script has been spawned.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         id: PipelineId,
         browsing_context_id: BrowsingContextId,
         top_level_browsing_context_id: TopLevelBrowsingContextId,
         opener: Option<BrowsingContextId>,
         event_loop: Rc<EventLoop>,
-        layout_chan: IpcSender<LayoutControlMsg>,
         compositor_proxy: CompositorProxy,
-        is_visible: bool,
+        throttled: bool,
         load_data: LoadData,
     ) -> Pipeline {
         let pipeline = Pipeline {
-            id: id,
-            browsing_context_id: browsing_context_id,
-            top_level_browsing_context_id: top_level_browsing_context_id,
-            opener: opener,
-            event_loop: event_loop,
-            layout_chan: layout_chan,
-            compositor_proxy: compositor_proxy,
+            id,
+            browsing_context_id,
+            top_level_browsing_context_id,
+            opener,
+            event_loop,
+            compositor_proxy,
             url: load_data.url.clone(),
             children: vec![],
             animation_state: AnimationState::NoAnimationsPresent,
-            load_data: load_data,
+            load_data,
             history_state_id: None,
             history_states: HashSet::new(),
             completely_loaded: false,
             title: String::new(),
+            layout_epoch: Epoch(0),
         };
 
-        pipeline.notify_visibility(is_visible);
+        pipeline.set_throttled(throttled);
 
         pipeline
     }
@@ -418,9 +412,6 @@ impl Pipeline {
         if let Err(e) = self.event_loop.send(msg) {
             warn!("Sending script exit message failed ({}).", e);
         }
-        if let Err(e) = self.layout_chan.send(LayoutControlMsg::ExitNow) {
-            warn!("Sending layout exit message failed ({}).", e);
-        }
     }
 
     /// Notify this pipeline of its activity.
@@ -434,10 +425,9 @@ impl Pipeline {
     /// The compositor's view of a pipeline.
     pub fn to_sendable(&self) -> CompositionPipeline {
         CompositionPipeline {
-            id: self.id.clone(),
-            top_level_browsing_context_id: self.top_level_browsing_context_id.clone(),
+            id: self.id,
+            top_level_browsing_context_id: self.top_level_browsing_context_id,
             script_chan: self.event_loop.sender(),
-            layout_chan: self.layout_chan.clone(),
         }
     }
 
@@ -454,22 +444,25 @@ impl Pipeline {
             .position(|id| *id == browsing_context_id)
         {
             None => {
-                return warn!(
+                warn!(
                     "Pipeline remove child already removed ({:?}).",
                     browsing_context_id
-                );
+                )
             },
-            Some(index) => self.children.remove(index),
-        };
+            Some(index) => {
+                self.children.remove(index);
+            },
+        }
     }
 
-    /// Notify the script thread that this pipeline is visible.
-    pub fn notify_visibility(&self, is_visible: bool) {
-        let script_msg = ConstellationControlMsg::ChangeFrameVisibilityStatus(self.id, is_visible);
-        let compositor_msg = CompositorMsg::PipelineVisibilityChanged(self.id, is_visible);
+    /// Set whether to make pipeline use less resources, by stopping animations and
+    /// running timers at a heavily limited rate.
+    pub fn set_throttled(&self, throttled: bool) {
+        let script_msg = ConstellationControlMsg::SetThrottled(self.id, throttled);
+        let compositor_msg = CompositorMsg::SetThrottled(self.id, throttled);
         let err = self.event_loop.send(script_msg);
         if let Err(e) = err {
-            warn!("Sending visibility change failed ({}).", e);
+            warn!("Sending SetThrottled to script failed ({}).", e);
         }
         self.compositor_proxy.send(compositor_msg);
     }
@@ -504,10 +497,9 @@ pub struct UnprivilegedPipelineContent {
     script_port: IpcReceiver<ConstellationControlMsg>,
     opts: Opts,
     prefs: HashMap<String, PrefValue>,
-    pipeline_port: IpcReceiver<LayoutControlMsg>,
     pipeline_namespace_id: PipelineNamespaceId,
-    webrender_api_sender: script_traits::WebrenderIpcSender,
-    webrender_image_api_sender: net_traits::WebrenderIpcSender,
+    webrender_api_sender: webrender_traits::WebRenderScriptApi,
+    webrender_image_api_sender: webrender_traits::WebRenderNetApi,
     webrender_document: DocumentId,
     webgl_chan: Option<WebGLPipeline>,
     webxr_registry: webxr_api::Registry,
@@ -516,29 +508,19 @@ pub struct UnprivilegedPipelineContent {
 }
 
 impl UnprivilegedPipelineContent {
-    pub fn start_all<Message, LTF, STF>(
+    pub fn start_all<STF: ScriptThreadFactory>(
         self,
         wait_for_completion: bool,
+        layout_factory: Arc<dyn LayoutFactory>,
         background_hang_monitor_register: Box<dyn BackgroundHangMonitorRegister>,
-    ) where
-        LTF: LayoutThreadFactory<Message = Message>,
-        STF: ScriptThreadFactory<Message = Message>,
-    {
+    ) {
         // Setup pipeline-namespace-installing for all threads in this process.
         // Idempotent in single-process mode.
         PipelineNamespace::set_installer_sender(self.namespace_request_sender);
 
         let image_cache = Arc::new(ImageCacheImpl::new(self.webrender_image_api_sender.clone()));
-        let paint_time_metrics = PaintTimeMetrics::new(
-            self.id,
-            self.time_profiler_chan.clone(),
-            self.layout_to_constellation_chan.clone(),
-            self.script_chan.clone(),
-            self.load_data.url.clone(),
-        );
         let (content_process_shutdown_chan, content_process_shutdown_port) = unbounded();
-        let layout_thread_busy_flag = Arc::new(AtomicBool::new(false));
-        let layout_pair = STF::create(
+        STF::create(
             InitialScriptState {
                 id: self.id,
                 browsing_context_id: self.browsing_context_id,
@@ -559,39 +541,20 @@ impl UnprivilegedPipelineContent {
                 devtools_chan: self.devtools_ipc_sender,
                 window_size: self.window_size,
                 pipeline_namespace_id: self.pipeline_namespace_id,
-                content_process_shutdown_chan: content_process_shutdown_chan,
+                content_process_shutdown_chan,
                 webgl_chan: self.webgl_chan,
                 webxr_registry: self.webxr_registry,
                 webrender_document: self.webrender_document,
                 webrender_api_sender: self.webrender_api_sender.clone(),
-                layout_is_busy: layout_thread_busy_flag.clone(),
                 player_context: self.player_context.clone(),
-                inherited_secure_context: self.load_data.inherited_secure_context.clone(),
+                inherited_secure_context: self.load_data.inherited_secure_context,
             },
+            layout_factory,
+            self.font_cache_thread.clone(),
             self.load_data.clone(),
             self.user_agent,
         );
 
-        LTF::create(
-            self.id,
-            self.top_level_browsing_context_id,
-            self.load_data.url,
-            self.parent_pipeline_id.is_some(),
-            layout_pair,
-            self.pipeline_port,
-            background_hang_monitor_register,
-            self.layout_to_constellation_chan,
-            self.script_chan,
-            image_cache,
-            self.font_cache_thread,
-            self.time_profiler_chan,
-            self.mem_profiler_chan,
-            self.webrender_api_sender,
-            paint_time_metrics,
-            layout_thread_busy_flag.clone(),
-            self.window_size,
-        );
-
         if wait_for_completion {
             match content_process_shutdown_port.recv() {
                 Ok(()) => {},

components/constellation/sandboxing.rs

@@ -28,6 +28,7 @@ use crate::pipeline::UnprivilegedPipelineContent;
 use crate::serviceworker::ServiceWorkerUnprivilegedContent;
 
 #[derive(Deserialize, Serialize)]
+#[allow(clippy::large_enum_variant)]
 pub enum UnprivilegedContent {
     Pipeline(UnprivilegedPipelineContent),
     ServiceWorker(ServiceWorkerUnprivilegedContent),
@@ -242,6 +243,7 @@ fn setup_common<C: CommandMethods>(command: &mut C, token: String) {
 }
 
 /// A trait to unify commands launched as multiprocess with or without a sandbox.
+#[allow(dead_code)]
 trait CommandMethods {
     /// A command line argument.
     fn arg<T>(&mut self, arg: T)

components/constellation/session_history.rs

@@ -3,13 +3,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::cmp::PartialEq;
-use std::{fmt, mem};
+use std::fmt;
 
+use base::id::{BrowsingContextId, HistoryStateId, PipelineId, TopLevelBrowsingContextId};
 use euclid::Size2D;
 use log::debug;
-use msg::constellation_msg::{
-    BrowsingContextId, HistoryStateId, PipelineId, TopLevelBrowsingContextId,
-};
 use script_traits::LoadData;
 use servo_url::ServoUrl;
 use style_traits::CSSPixel;
@@ -44,7 +42,7 @@ impl JointSessionHistory {
     pub fn push_diff(&mut self, diff: SessionHistoryDiff) -> Vec<SessionHistoryDiff> {
         debug!("pushing a past entry; removing future");
         self.past.push(diff);
-        mem::replace(&mut self.future, vec![])
+        std::mem::take(&mut self.future)
     }
 
     pub fn replace_reloader(&mut self, old_reloader: NeedsToReload, new_reloader: NeedsToReload) {
@@ -59,12 +57,12 @@ impl JointSessionHistory {
         history_state_id: HistoryStateId,
         url: ServoUrl,
     ) {
-        if let Some(SessionHistoryDiff::PipelineDiff {
+        if let Some(SessionHistoryDiff::Pipeline {
             ref mut new_history_state_id,
             ref mut new_url,
             ..
         }) = self.past.iter_mut().find(|diff| match diff {
-            SessionHistoryDiff::PipelineDiff {
+            SessionHistoryDiff::Pipeline {
                 pipeline_reloader: NeedsToReload::No(id),
                 ..
             } => pipeline_id == *id,
@@ -74,12 +72,12 @@ impl JointSessionHistory {
             *new_url = url.clone();
         }
 
-        if let Some(SessionHistoryDiff::PipelineDiff {
+        if let Some(SessionHistoryDiff::Pipeline {
             ref mut old_history_state_id,
             ref mut old_url,
             ..
         }) = self.future.iter_mut().find(|diff| match diff {
-            SessionHistoryDiff::PipelineDiff {
+            SessionHistoryDiff::Pipeline {
                 pipeline_reloader: NeedsToReload::No(id),
                 ..
             } => pipeline_id == *id,
@@ -93,14 +91,14 @@ impl JointSessionHistory {
     pub fn remove_entries_for_browsing_context(&mut self, context_id: BrowsingContextId) {
         debug!("{}: Removing entries for browsing context", context_id);
         self.past.retain(|diff| match diff {
-            SessionHistoryDiff::BrowsingContextDiff {
+            SessionHistoryDiff::BrowsingContext {
                 browsing_context_id,
                 ..
             } => *browsing_context_id != context_id,
             _ => true,
         });
         self.future.retain(|diff| match diff {
-            SessionHistoryDiff::BrowsingContextDiff {
+            SessionHistoryDiff::BrowsingContext {
                 browsing_context_id,
                 ..
             } => *browsing_context_id != context_id,
@@ -180,7 +178,7 @@ impl PartialEq for NeedsToReload {
 #[derive(Debug)]
 pub enum SessionHistoryDiff {
     /// Represents a diff where the active pipeline of an entry changed.
-    BrowsingContextDiff {
+    BrowsingContext {
         /// The browsing context whose pipeline changed
         browsing_context_id: BrowsingContextId,
         /// The previous pipeline (used when traversing into the past)
@@ -189,7 +187,7 @@ pub enum SessionHistoryDiff {
         new_reloader: NeedsToReload,
     },
     /// Represents a diff where the active state of a pipeline changed.
-    PipelineDiff {
+    Pipeline {
         /// The pipeline whose history state changed.
         pipeline_reloader: NeedsToReload,
         /// The old history state id.
@@ -201,7 +199,7 @@ pub enum SessionHistoryDiff {
         /// The new url
         new_url: ServoUrl,
     },
-    HashDiff {
+    Hash {
         pipeline_reloader: NeedsToReload,
         old_url: ServoUrl,
         new_url: ServoUrl,
@@ -212,7 +210,7 @@ impl SessionHistoryDiff {
     /// Returns the old pipeline id if that pipeline is still alive, otherwise returns `None`
     pub fn alive_old_pipeline(&self) -> Option<PipelineId> {
         match *self {
-            SessionHistoryDiff::BrowsingContextDiff {
+            SessionHistoryDiff::BrowsingContext {
                 ref old_reloader, ..
             } => match *old_reloader {
                 NeedsToReload::No(pipeline_id) => Some(pipeline_id),
@@ -225,7 +223,7 @@ impl SessionHistoryDiff {
     /// Returns the new pipeline id if that pipeline is still alive, otherwise returns `None`
     pub fn alive_new_pipeline(&self) -> Option<PipelineId> {
         match *self {
-            SessionHistoryDiff::BrowsingContextDiff {
+            SessionHistoryDiff::BrowsingContext {
                 ref new_reloader, ..
             } => match *new_reloader {
                 NeedsToReload::No(pipeline_id) => Some(pipeline_id),
@@ -242,7 +240,7 @@ impl SessionHistoryDiff {
         reloader: &NeedsToReload,
     ) {
         match *self {
-            SessionHistoryDiff::BrowsingContextDiff {
+            SessionHistoryDiff::BrowsingContext {
                 ref mut old_reloader,
                 ref mut new_reloader,
                 ..
@@ -254,7 +252,7 @@ impl SessionHistoryDiff {
                     *new_reloader = reloader.clone();
                 }
             },
-            SessionHistoryDiff::PipelineDiff {
+            SessionHistoryDiff::Pipeline {
                 ref mut pipeline_reloader,
                 ..
             } => {
@@ -262,7 +260,7 @@ impl SessionHistoryDiff {
                     *pipeline_reloader = reloader.clone();
                 }
             },
-            SessionHistoryDiff::HashDiff {
+            SessionHistoryDiff::Hash {
                 ref mut pipeline_reloader,
                 ..
             } => {

components/constellation/timer_scheduler.rs

@@ -30,7 +30,7 @@ impl PartialOrd for ScheduledEvent {
 impl Eq for ScheduledEvent {}
 impl PartialEq for ScheduledEvent {
     fn eq(&self, other: &ScheduledEvent) -> bool {
-        self as *const ScheduledEvent == other as *const ScheduledEvent
+        std::ptr::eq(self, other)
     }
 }
 
@@ -64,10 +64,9 @@ impl TimerScheduler {
     /// Handle an incoming timer request.
     pub fn handle_timer_request(&mut self, request: TimerSchedulerMsg) {
         let TimerEventRequest(_, _, _, delay) = request.0;
-        let schedule = Instant::now() + Duration::from_millis(delay.get());
         let event = ScheduledEvent {
             request: request.0,
-            for_time: schedule,
+            for_time: Instant::now() + delay,
         };
         self.0.push(event);
     }

components/constellation/tracing.rs

@@ -0,0 +1,264 @@
+/* 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/. */
+
+/// Log an event from compositor at trace level.
+/// - To disable tracing: RUST_LOG='constellation<compositor@=off'
+/// - To enable tracing: RUST_LOG='constellation<compositor@'
+/// - Recommended filters when tracing is enabled:
+///   - constellation<compositor@ForwardEvent(MouseMoveEvent)=off
+///   - constellation<compositor@LogEntry=off
+///   - constellation<compositor@ReadyToPresent=off
+macro_rules! trace_msg_from_compositor {
+    // This macro only exists to put the docs in the same file as the target prefix,
+    // so the macro definition is always the same.
+    ($event:expr, $($rest:tt)+) => {
+        ::log::trace!(target: $crate::tracing::LogTarget::log_target(&$event), $($rest)+)
+    };
+}
+
+/// Log an event from script at trace level.
+/// - To disable tracing: RUST_LOG='constellation<script@=off'
+/// - To enable tracing: RUST_LOG='constellation<script@'
+/// - Recommended filters when tracing is enabled:
+///   - constellation<script@LogEntry=off
+macro_rules! trace_script_msg {
+    // This macro only exists to put the docs in the same file as the target prefix,
+    // so the macro definition is always the same.
+    ($event:expr, $($rest:tt)+) => {
+        ::log::trace!(target: $crate::tracing::LogTarget::log_target(&$event), $($rest)+)
+    };
+}
+
+/// Log an event from layout at trace level.
+/// - To disable tracing: RUST_LOG='constellation<layout@=off'
+/// - To enable tracing: RUST_LOG='constellation<layout@'
+macro_rules! trace_layout_msg {
+    // This macro only exists to put the docs in the same file as the target prefix,
+    // so the macro definition is always the same.
+    ($event:expr, $($rest:tt)+) => {
+        ::log::trace!(target: $crate::tracing::LogTarget::log_target(&$event), $($rest)+)
+    };
+}
+
+/// Get the log target for an event, as a static string.
+pub(crate) trait LogTarget {
+    fn log_target(&self) -> &'static str;
+}
+
+mod from_compositor {
+    use super::LogTarget;
+
+    macro_rules! target {
+        ($($name:literal)+) => {
+            concat!("constellation<compositor@", $($name),+)
+        };
+    }
+
+    impl LogTarget for compositing_traits::ConstellationMsg {
+        fn log_target(&self) -> &'static str {
+            match self {
+                Self::Exit => target!("Exit"),
+                Self::GetBrowsingContext(..) => target!("GetBrowsingContext"),
+                Self::GetPipeline(..) => target!("GetPipeline"),
+                Self::GetFocusTopLevelBrowsingContext(..) => {
+                    target!("GetFocusTopLevelBrowsingContext")
+                },
+                Self::IsReadyToSaveImage(..) => target!("IsReadyToSaveImage"),
+                Self::Keyboard(..) => target!("Keyboard"),
+                Self::AllowNavigationResponse(..) => target!("AllowNavigationResponse"),
+                Self::LoadUrl(..) => target!("LoadUrl"),
+                Self::ClearCache => target!("ClearCache"),
+                Self::TraverseHistory(..) => target!("TraverseHistory"),
+                Self::WindowSize(..) => target!("WindowSize"),
+                Self::TickAnimation(..) => target!("TickAnimation"),
+                Self::WebDriverCommand(..) => target!("WebDriverCommand"),
+                Self::Reload(..) => target!("Reload"),
+                Self::LogEntry(..) => target!("LogEntry"),
+                Self::NewWebView(..) => target!("NewWebView"),
+                Self::WebViewOpened(..) => target!("WebViewOpened"),
+                Self::CloseWebView(..) => target!("CloseWebView"),
+                Self::SendError(..) => target!("SendError"),
+                Self::FocusWebView(..) => target!("FocusWebView"),
+                Self::BlurWebView => target!("BlurWebView"),
+                Self::ForwardEvent(_, event) => event.log_target(),
+                Self::SetCursor(..) => target!("SetCursor"),
+                Self::EnableProfiler(..) => target!("EnableProfiler"),
+                Self::DisableProfiler => target!("DisableProfiler"),
+                Self::ExitFullScreen(_) => target!("ExitFullScreen"),
+                Self::MediaSessionAction(_) => target!("MediaSessionAction"),
+                Self::SetWebViewThrottled(_, _) => target!("SetWebViewThrottled"),
+                Self::IMEDismissed => target!("IMEDismissed"),
+                Self::ReadyToPresent(..) => target!("ReadyToPresent"),
+                Self::Gamepad(..) => target!("Gamepad"),
+            }
+        }
+    }
+
+    impl LogTarget for script_traits::CompositorEvent {
+        fn log_target(&self) -> &'static str {
+            macro_rules! target_variant {
+                ($name:literal) => {
+                    target!("ForwardEvent(" $name ")")
+                };
+            }
+            match self {
+                Self::ResizeEvent(..) => target_variant!("ResizeEvent"),
+                Self::MouseButtonEvent(..) => target_variant!("MouseButtonEvent"),
+                Self::MouseMoveEvent(..) => target_variant!("MouseMoveEvent"),
+                Self::TouchEvent(..) => target_variant!("TouchEvent"),
+                Self::WheelEvent(..) => target_variant!("WheelEvent"),
+                Self::KeyboardEvent(..) => target_variant!("KeyboardEvent"),
+                Self::CompositionEvent(..) => target_variant!("CompositionEvent"),
+                Self::IMEDismissedEvent => target_variant!("IMEDismissedEvent"),
+                Self::GamepadEvent(..) => target_variant!("GamepadEvent"),
+            }
+        }
+    }
+}
+
+mod from_script {
+    use super::LogTarget;
+
+    macro_rules! target {
+        ($($name:literal)+) => {
+            concat!("constellation<script@", $($name),+)
+        };
+    }
+
+    impl LogTarget for script_traits::ScriptMsg {
+        fn log_target(&self) -> &'static str {
+            match self {
+                Self::CompleteMessagePortTransfer(..) => target!("CompleteMessagePortTransfer"),
+                Self::MessagePortTransferResult(..) => target!("MessagePortTransferResult"),
+                Self::NewMessagePort(..) => target!("NewMessagePort"),
+                Self::NewMessagePortRouter(..) => target!("NewMessagePortRouter"),
+                Self::RemoveMessagePortRouter(..) => target!("RemoveMessagePortRouter"),
+                Self::RerouteMessagePort(..) => target!("RerouteMessagePort"),
+                Self::MessagePortShipped(..) => target!("MessagePortShipped"),
+                Self::RemoveMessagePort(..) => target!("RemoveMessagePort"),
+                Self::EntanglePorts(..) => target!("EntanglePorts"),
+                Self::NewBroadcastChannelRouter(..) => target!("NewBroadcastChannelRouter"),
+                Self::RemoveBroadcastChannelRouter(..) => target!("RemoveBroadcastChannelRouter"),
+                Self::NewBroadcastChannelNameInRouter(..) => {
+                    target!("NewBroadcastChannelNameInRouter")
+                },
+                Self::RemoveBroadcastChannelNameInRouter(..) => {
+                    target!("RemoveBroadcastChannelNameInRouter")
+                },
+                Self::ScheduleBroadcast(..) => target!("ScheduleBroadcast"),
+                Self::ForwardToEmbedder(msg) => msg.log_target(),
+                Self::InitiateNavigateRequest(..) => target!("InitiateNavigateRequest"),
+                Self::BroadcastStorageEvent(..) => target!("BroadcastStorageEvent"),
+                Self::ChangeRunningAnimationsState(..) => target!("ChangeRunningAnimationsState"),
+                Self::CreateCanvasPaintThread(..) => target!("CreateCanvasPaintThread"),
+                Self::Focus => target!("Focus"),
+                Self::GetTopForBrowsingContext(..) => target!("GetTopForBrowsingContext"),
+                Self::GetBrowsingContextInfo(..) => target!("GetBrowsingContextInfo"),
+                Self::GetChildBrowsingContextId(..) => target!("GetChildBrowsingContextId"),
+                Self::LoadComplete => target!("LoadComplete"),
+                Self::LoadUrl(..) => target!("LoadUrl"),
+                Self::AbortLoadUrl => target!("AbortLoadUrl"),
+                Self::PostMessage { .. } => target!("PostMessage"),
+                Self::NavigatedToFragment(..) => target!("NavigatedToFragment"),
+                Self::TraverseHistory(..) => target!("TraverseHistory"),
+                Self::PushHistoryState(..) => target!("PushHistoryState"),
+                Self::ReplaceHistoryState(..) => target!("ReplaceHistoryState"),
+                Self::JointSessionHistoryLength(..) => target!("JointSessionHistoryLength"),
+                Self::RemoveIFrame(..) => target!("RemoveIFrame"),
+                Self::SetThrottledComplete(..) => target!("SetThrottledComplete"),
+                Self::ScriptLoadedURLInIFrame(..) => target!("ScriptLoadedURLInIFrame"),
+                Self::ScriptNewIFrame(..) => target!("ScriptNewIFrame"),
+                Self::ScriptNewAuxiliary(..) => target!("ScriptNewAuxiliary"),
+                Self::ActivateDocument => target!("ActivateDocument"),
+                Self::SetDocumentState(..) => target!("SetDocumentState"),
+                Self::SetLayoutEpoch(..) => target!("SetLayoutEpoch"),
+                Self::SetFinalUrl(..) => target!("SetFinalUrl"),
+                Self::TouchEventProcessed(..) => target!("TouchEventProcessed"),
+                Self::LogEntry(..) => target!("LogEntry"),
+                Self::DiscardDocument => target!("DiscardDocument"),
+                Self::DiscardTopLevelBrowsingContext => target!("DiscardTopLevelBrowsingContext"),
+                Self::PipelineExited => target!("PipelineExited"),
+                Self::ForwardDOMMessage(..) => target!("ForwardDOMMessage"),
+                Self::ScheduleJob(..) => target!("ScheduleJob"),
+                Self::GetClientWindow(..) => target!("GetClientWindow"),
+                Self::GetScreenSize(..) => target!("GetScreenSize"),
+                Self::GetScreenAvailSize(..) => target!("GetScreenAvailSize"),
+                Self::MediaSessionEvent(..) => target!("MediaSessionEvent"),
+                Self::RequestAdapter(..) => target!("RequestAdapter"),
+                Self::GetWebGPUChan(..) => target!("GetWebGPUChan"),
+                Self::TitleChanged(..) => target!("TitleChanged"),
+            }
+        }
+    }
+
+    impl LogTarget for embedder_traits::EmbedderMsg {
+        fn log_target(&self) -> &'static str {
+            macro_rules! target_variant {
+                ($name:literal) => {
+                    target!("ForwardToEmbedder(" $name ")")
+                };
+            }
+            match self {
+                Self::Status(..) => target_variant!("Status"),
+                Self::ChangePageTitle(..) => target_variant!("ChangePageTitle"),
+                Self::MoveTo(..) => target_variant!("MoveTo"),
+                Self::ResizeTo(..) => target_variant!("ResizeTo"),
+                Self::Prompt(..) => target_variant!("Prompt"),
+                Self::ShowContextMenu(..) => target_variant!("ShowContextMenu"),
+                Self::AllowNavigationRequest(..) => target_variant!("AllowNavigationRequest"),
+                Self::AllowOpeningWebView(..) => target_variant!("AllowOpeningWebView"),
+                Self::WebViewOpened(..) => target_variant!("WebViewOpened"),
+                Self::WebViewClosed(..) => target_variant!("WebViewClosed"),
+                Self::WebViewFocused(..) => target_variant!("WebViewFocused"),
+                Self::WebViewBlurred => target_variant!("WebViewBlurred"),
+                Self::AllowUnload(..) => target_variant!("AllowUnload"),
+                Self::Keyboard(..) => target_variant!("Keyboard"),
+                Self::GetClipboardContents(..) => target_variant!("GetClipboardContents"),
+                Self::SetClipboardContents(..) => target_variant!("SetClipboardContents"),
+                Self::SetCursor(..) => target_variant!("SetCursor"),
+                Self::NewFavicon(..) => target_variant!("NewFavicon"),
+                Self::HeadParsed => target_variant!("HeadParsed"),
+                Self::HistoryChanged(..) => target_variant!("HistoryChanged"),
+                Self::SetFullscreenState(..) => target_variant!("SetFullscreenState"),
+                Self::LoadStart => target_variant!("LoadStart"),
+                Self::LoadComplete => target_variant!("LoadComplete"),
+                Self::Panic(..) => target_variant!("Panic"),
+                Self::GetSelectedBluetoothDevice(..) => {
+                    target_variant!("GetSelectedBluetoothDevice")
+                },
+                Self::SelectFiles(..) => target_variant!("SelectFiles"),
+                Self::PromptPermission(..) => target_variant!("PromptPermission"),
+                Self::ShowIME(..) => target_variant!("ShowIME"),
+                Self::HideIME => target_variant!("HideIME"),
+                Self::Shutdown => target_variant!("Shutdown"),
+                Self::ReportProfile(..) => target_variant!("ReportProfile"),
+                Self::MediaSessionEvent(..) => target_variant!("MediaSessionEvent"),
+                Self::OnDevtoolsStarted(..) => target_variant!("OnDevtoolsStarted"),
+                Self::ReadyToPresent(..) => target_variant!("ReadyToPresent"),
+                Self::EventDelivered(..) => target_variant!("EventDelivered"),
+                Self::PlayGamepadHapticEffect(..) => target_variant!("PlayGamepadHapticEffect"),
+                Self::StopGamepadHapticEffect(..) => target_variant!("StopGamepadHapticEffect"),
+            }
+        }
+    }
+}
+
+mod from_layout {
+    use super::LogTarget;
+
+    macro_rules! target {
+        ($($name:literal)+) => {
+            concat!("constellation<layout@", $($name),+)
+        };
+    }
+
+    impl LogTarget for script_traits::LayoutMsg {
+        fn log_target(&self) -> &'static str {
+            match self {
+                Self::IFrameSizes(..) => target!("IFrameSizes"),
+                Self::PendingPaintMetric(..) => target!("PendingPaintMetric"),
+            }
+        }
+    }
+}

components/constellation/webview.rs

@@ -4,7 +4,7 @@
 
 use std::collections::HashMap;
 
-use msg::constellation_msg::TopLevelBrowsingContextId;
+use base::id::TopLevelBrowsingContextId;
 
 #[derive(Debug)]
 pub struct WebViewManager<WebView> {
@@ -99,14 +99,14 @@ impl<WebView> WebViewManager<WebView> {
 mod test {
     use std::num::NonZeroU32;
 
-    use msg::constellation_msg::{
+    use base::id::{
         BrowsingContextId, BrowsingContextIndex, PipelineNamespace, PipelineNamespaceId,
-        TopLevelBrowsingContextId,
+        TopLevelBrowsingContextId, WebViewId,
     };
 
     use crate::webview::WebViewManager;
 
-    fn top_level_id(namespace_id: u32, index: u32) -> TopLevelBrowsingContextId {
+    fn id(namespace_id: u32, index: u32) -> WebViewId {
         TopLevelBrowsingContextId(BrowsingContextId {
             namespace_id: PipelineNamespaceId(namespace_id),
             index: BrowsingContextIndex(NonZeroU32::new(index).expect("Incorrect test case")),
@@ -115,7 +115,7 @@ mod test {
 
     fn webviews_sorted<WebView: Clone>(
         webviews: &WebViewManager<WebView>,
-    ) -> Vec<(TopLevelBrowsingContextId, WebView)> {
+    ) -> Vec<(WebViewId, WebView)> {
         let mut keys = webviews.webviews.keys().collect::<Vec<_>>();
         keys.sort();
         keys.iter()
@@ -138,59 +138,59 @@ mod test {
         let mut webviews = WebViewManager::default();
 
         // add() adds the webview to the map, but does not focus it.
-        webviews.add(TopLevelBrowsingContextId::new(), 'a');
-        webviews.add(TopLevelBrowsingContextId::new(), 'b');
-        webviews.add(TopLevelBrowsingContextId::new(), 'c');
+        webviews.add(WebViewId::new(), 'a');
+        webviews.add(WebViewId::new(), 'b');
+        webviews.add(WebViewId::new(), 'c');
         assert_eq!(
             webviews_sorted(&webviews),
-            vec![
-                (top_level_id(0, 1), 'a'),
-                (top_level_id(0, 2), 'b'),
-                (top_level_id(0, 3), 'c'),
-            ]
+            vec![(id(0, 1), 'a'), (id(0, 2), 'b'), (id(0, 3), 'c'),]
         );
         assert!(webviews.focus_order.is_empty());
         assert_eq!(webviews.is_focused, false);
 
         // focus() makes the given webview the latest in focus order.
-        webviews.focus(top_level_id(0, 2));
-        assert_eq!(webviews.focus_order, vec![top_level_id(0, 2)]);
+        webviews.focus(id(0, 2));
+        assert_eq!(webviews.focus_order, vec![id(0, 2)]);
         assert_eq!(webviews.is_focused, true);
-        webviews.focus(top_level_id(0, 1));
-        assert_eq!(
-            webviews.focus_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1)]
-        );
+        webviews.focus(id(0, 1));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1)]);
         assert_eq!(webviews.is_focused, true);
-        webviews.focus(top_level_id(0, 3));
-        assert_eq!(
-            webviews.focus_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
-        );
+        webviews.focus(id(0, 3));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
         assert_eq!(webviews.is_focused, true);
 
         // unfocus() clears the “is focused” flag, but does not touch the focus order.
         webviews.unfocus();
-        assert_eq!(
-            webviews.focus_order,
-            vec![top_level_id(0, 2), top_level_id(0, 1), top_level_id(0, 3)]
-        );
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 1), id(0, 3)]);
         assert_eq!(webviews.is_focused, false);
 
         // focus() avoids duplicates in focus order, when the given webview has been focused before.
-        webviews.focus(top_level_id(0, 1));
-        assert_eq!(
-            webviews.focus_order,
-            vec![top_level_id(0, 2), top_level_id(0, 3), top_level_id(0, 1)]
-        );
+        webviews.focus(id(0, 1));
+        assert_eq!(webviews.focus_order, vec![id(0, 2), id(0, 3), id(0, 1)]);
         assert_eq!(webviews.is_focused, true);
 
         // remove() clears the “is focused” flag iff the given webview was focused.
-        webviews.remove(top_level_id(0, 2));
+        webviews.remove(id(1, 1));
         assert_eq!(webviews.is_focused, true);
-        webviews.remove(top_level_id(0, 1));
+        webviews.remove(id(1, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 3));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(2, 4));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(3, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(4, 1));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(0, 2));
+        assert_eq!(webviews.is_focused, true);
+        webviews.remove(id(0, 1));
         assert_eq!(webviews.is_focused, false);
-        webviews.remove(top_level_id(0, 3));
+        webviews.remove(id(0, 3));
         assert_eq!(webviews.is_focused, false);
 
         // remove() removes the given webview from both the map and the focus order.

components/deny_public_fields/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "deny_public_fields"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"

components/derive_common/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "derive_common"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-publish = false
-
-[lib]
-path = "lib.rs"
-
-[dependencies]
-darling = { workspace = true }
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { workspace = true }
-synstructure = { workspace = true }

components/derive_common/cg.rs

@@ -1,396 +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 darling::{FromDeriveInput, FromField, FromVariant};
-use proc_macro2::{Span, TokenStream};
-use quote::TokenStreamExt;
-use syn::{
-    self, AngleBracketedGenericArguments, AssocType, DeriveInput, Field, GenericArgument,
-    GenericParam, Ident, Path, PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup,
-    TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple, Variant, WherePredicate,
-};
-use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
-
-/// Given an input type which has some where clauses already, like:
-///
-/// struct InputType<T>
-/// where
-///     T: Zero,
-/// {
-///     ...
-/// }
-///
-/// Add the necessary `where` clauses so that the output type of a trait
-/// fulfils them.
-///
-/// For example:
-///
-/// ```ignore
-///     <T as ToComputedValue>::ComputedValue: Zero,
-/// ```
-///
-/// This needs to run before adding other bounds to the type parameters.
-pub fn propagate_clauses_to_output_type(
-    where_clause: &mut Option<syn::WhereClause>,
-    generics: &syn::Generics,
-    trait_path: &Path,
-    trait_output: &Ident,
-) {
-    let where_clause = match *where_clause {
-        Some(ref mut clause) => clause,
-        None => return,
-    };
-    let mut extra_bounds = vec![];
-    for pred in &where_clause.predicates {
-        let ty = match *pred {
-            syn::WherePredicate::Type(ref ty) => ty,
-            ref predicate => panic!("Unhanded complex where predicate: {:?}", predicate),
-        };
-
-        let path = match ty.bounded_ty {
-            syn::Type::Path(ref p) => &p.path,
-            ref ty => panic!("Unhanded complex where type: {:?}", ty),
-        };
-
-        assert!(
-            ty.lifetimes.is_none(),
-            "Unhanded complex lifetime bound: {:?}",
-            ty,
-        );
-
-        let ident = match path_to_ident(path) {
-            Some(i) => i,
-            None => panic!("Unhanded complex where type path: {:?}", path),
-        };
-
-        if generics.type_params().any(|param| param.ident == *ident) {
-            extra_bounds.push(ty.clone());
-        }
-    }
-
-    for bound in extra_bounds {
-        let ty = bound.bounded_ty;
-        let bounds = bound.bounds;
-        where_clause
-            .predicates
-            .push(parse_quote!(<#ty as #trait_path>::#trait_output: #bounds))
-    }
-}
-
-pub fn add_predicate(where_clause: &mut Option<syn::WhereClause>, pred: WherePredicate) {
-    where_clause
-        .get_or_insert(parse_quote!(where))
-        .predicates
-        .push(pred);
-}
-
-pub fn fmap_match<F>(input: &DeriveInput, bind_style: BindStyle, f: F) -> TokenStream
-where
-    F: FnMut(&BindingInfo) -> TokenStream,
-{
-    fmap2_match(input, bind_style, f, |_| None)
-}
-
-pub fn fmap2_match<F, G>(
-    input: &DeriveInput,
-    bind_style: BindStyle,
-    mut f: F,
-    mut g: G,
-) -> TokenStream
-where
-    F: FnMut(&BindingInfo) -> TokenStream,
-    G: FnMut(&BindingInfo) -> Option<TokenStream>,
-{
-    let mut s = synstructure::Structure::new(input);
-    s.variants_mut().iter_mut().for_each(|v| {
-        v.bind_with(|_| bind_style);
-    });
-    s.each_variant(|variant| {
-        let (mapped, mapped_fields) = value(variant, "mapped");
-        let fields_pairs = variant.bindings().iter().zip(mapped_fields.iter());
-        let mut computations = quote!();
-        computations.append_all(fields_pairs.map(|(field, mapped_field)| {
-            let expr = f(field);
-            quote! { let #mapped_field = #expr; }
-        }));
-        computations.append_all(
-            mapped_fields
-                .iter()
-                .map(|mapped_field| match g(mapped_field) {
-                    Some(expr) => quote! { let #mapped_field = #expr; },
-                    None => quote!(),
-                }),
-        );
-        computations.append_all(mapped);
-        Some(computations)
-    })
-}
-
-pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &Ident) -> Path {
-    let segment = PathSegment {
-        ident: input.ident.clone(),
-        arguments: PathArguments::AngleBracketed(AngleBracketedGenericArguments {
-            args: input
-                .generics
-                .params
-                .iter()
-                .map(|arg| match arg {
-                    &GenericParam::Lifetime(ref data) => {
-                        GenericArgument::Lifetime(data.lifetime.clone())
-                    },
-                    &GenericParam::Type(ref data) => {
-                        let ident = &data.ident;
-                        GenericArgument::Type(parse_quote!(<#ident as #trait_path>::#trait_output))
-                    },
-                    &GenericParam::Const(ref inner) => {
-                        let ident = &inner.ident;
-                        GenericArgument::Const(parse_quote!(#ident))
-                    },
-                })
-                .collect(),
-            colon2_token: Default::default(),
-            gt_token: Default::default(),
-            lt_token: Default::default(),
-        }),
-    };
-    segment.into()
-}
-
-pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Type
-where
-    F: FnMut(&Ident) -> Type,
-{
-    match *ty {
-        Type::Slice(ref inner) => Type::from(TypeSlice {
-            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
-            ..inner.clone()
-        }),
-        Type::Array(ref inner) => {
-            //ref ty, ref expr) => {
-            Type::from(TypeArray {
-                elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
-                ..inner.clone()
-            })
-        },
-        ref ty @ Type::Never(_) => ty.clone(),
-        Type::Tuple(ref inner) => Type::from(TypeTuple {
-            elems: inner
-                .elems
-                .iter()
-                .map(|ty| map_type_params(&ty, params, self_type, f))
-                .collect(),
-            ..inner.clone()
-        }),
-        Type::Path(TypePath {
-            qself: None,
-            ref path,
-        }) => {
-            if let Some(ident) = path_to_ident(path) {
-                if params.iter().any(|ref param| &param.ident == ident) {
-                    return f(ident);
-                }
-                if ident == "Self" {
-                    return Type::from(TypePath {
-                        qself: None,
-                        path: self_type.clone(),
-                    });
-                }
-            }
-            Type::from(TypePath {
-                qself: None,
-                path: map_type_params_in_path(path, params, self_type, f),
-            })
-        },
-        Type::Path(TypePath {
-            ref qself,
-            ref path,
-        }) => Type::from(TypePath {
-            qself: qself.as_ref().map(|qself| QSelf {
-                ty: Box::new(map_type_params(&qself.ty, params, self_type, f)),
-                position: qself.position,
-                ..qself.clone()
-            }),
-            path: map_type_params_in_path(path, params, self_type, f),
-        }),
-        Type::Paren(ref inner) => Type::from(TypeParen {
-            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
-            ..inner.clone()
-        }),
-        Type::Group(ref inner) => Type::from(TypeGroup {
-            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
-            ..inner.clone()
-        }),
-        ref ty => panic!("type {:?} cannot be mapped yet", ty),
-    }
-}
-
-fn map_type_params_in_path<F>(
-    path: &Path,
-    params: &[&TypeParam],
-    self_type: &Path,
-    f: &mut F,
-) -> Path
-where
-    F: FnMut(&Ident) -> Type,
-{
-    Path {
-        leading_colon: path.leading_colon,
-        segments: path
-            .segments
-            .iter()
-            .map(|segment| PathSegment {
-                ident: segment.ident.clone(),
-                arguments: match segment.arguments {
-                    PathArguments::AngleBracketed(ref data) => {
-                        PathArguments::AngleBracketed(AngleBracketedGenericArguments {
-                            args: data
-                                .args
-                                .iter()
-                                .map(|arg| match arg {
-                                    ty @ &GenericArgument::Lifetime(_) => ty.clone(),
-                                    &GenericArgument::Type(ref data) => GenericArgument::Type(
-                                        map_type_params(data, params, self_type, f),
-                                    ),
-                                    &GenericArgument::AssocType(ref data) => {
-                                        GenericArgument::AssocType(AssocType {
-                                            ty: map_type_params(&data.ty, params, self_type, f),
-                                            ..data.clone()
-                                        })
-                                    },
-                                    ref arg => panic!("arguments {:?} cannot be mapped yet", arg),
-                                })
-                                .collect(),
-                            ..data.clone()
-                        })
-                    },
-                    ref arg @ PathArguments::None => arg.clone(),
-                    ref parameters => panic!("parameters {:?} cannot be mapped yet", parameters),
-                },
-            })
-            .collect(),
-    }
-}
-
-fn path_to_ident(path: &Path) -> Option<&Ident> {
-    match *path {
-        Path {
-            leading_colon: None,
-            ref segments,
-        } if segments.len() == 1 => {
-            if segments[0].arguments.is_empty() {
-                Some(&segments[0].ident)
-            } else {
-                None
-            }
-        },
-        _ => None,
-    }
-}
-
-pub fn parse_field_attrs<A>(field: &Field) -> A
-where
-    A: FromField,
-{
-    match A::from_field(field) {
-        Ok(attrs) => attrs,
-        Err(e) => panic!("failed to parse field attributes: {}", e),
-    }
-}
-
-pub fn parse_input_attrs<A>(input: &DeriveInput) -> A
-where
-    A: FromDeriveInput,
-{
-    match A::from_derive_input(input) {
-        Ok(attrs) => attrs,
-        Err(e) => panic!("failed to parse input attributes: {}", e),
-    }
-}
-
-pub fn parse_variant_attrs_from_ast<A>(variant: &VariantAst) -> A
-where
-    A: FromVariant,
-{
-    let v = Variant {
-        ident: variant.ident.clone(),
-        attrs: variant.attrs.to_vec(),
-        fields: variant.fields.clone(),
-        discriminant: variant.discriminant.clone(),
-    };
-    parse_variant_attrs(&v)
-}
-
-pub fn parse_variant_attrs<A>(variant: &Variant) -> A
-where
-    A: FromVariant,
-{
-    match A::from_variant(variant) {
-        Ok(attrs) => attrs,
-        Err(e) => panic!("failed to parse variant attributes: {}", e),
-    }
-}
-
-pub fn ref_pattern<'a>(
-    variant: &'a VariantInfo,
-    prefix: &str,
-) -> (TokenStream, Vec<BindingInfo<'a>>) {
-    let mut v = variant.clone();
-    v.bind_with(|_| BindStyle::Ref);
-    v.bindings_mut().iter_mut().for_each(|b| {
-        b.binding = Ident::new(&format!("{}_{}", b.binding, prefix), Span::call_site())
-    });
-    (v.pat(), v.bindings().to_vec())
-}
-
-pub fn value<'a>(variant: &'a VariantInfo, prefix: &str) -> (TokenStream, Vec<BindingInfo<'a>>) {
-    let mut v = variant.clone();
-    v.bindings_mut().iter_mut().for_each(|b| {
-        b.binding = Ident::new(&format!("{}_{}", b.binding, prefix), Span::call_site())
-    });
-    v.bind_with(|_| BindStyle::Move);
-    (v.pat(), v.bindings().to_vec())
-}
-
-/// Transforms "FooBar" to "foo-bar".
-///
-/// If the first Camel segment is "Moz", "Webkit", or "Servo", the result string
-/// is prepended with "-".
-pub fn to_css_identifier(mut camel_case: &str) -> String {
-    camel_case = camel_case.trim_end_matches('_');
-    let mut first = true;
-    let mut result = String::with_capacity(camel_case.len());
-    while let Some(segment) = split_camel_segment(&mut camel_case) {
-        if first {
-            match segment {
-                "Moz" | "Webkit" | "Servo" => first = false,
-                _ => {},
-            }
-        }
-        if !first {
-            result.push('-');
-        }
-        first = false;
-        result.push_str(&segment.to_lowercase());
-    }
-    result
-}
-
-/// Transforms foo-bar to FOO_BAR.
-pub fn to_scream_case(css_case: &str) -> String {
-    css_case.to_uppercase().replace('-', "_")
-}
-
-/// Given "FooBar", returns "Foo" and sets `camel_case` to "Bar".
-fn split_camel_segment<'input>(camel_case: &mut &'input str) -> Option<&'input str> {
-    let index = match camel_case.chars().next() {
-        None => return None,
-        Some(ch) => ch.len_utf8(),
-    };
-    let end_position = camel_case[index..]
-        .find(char::is_uppercase)
-        .map_or(camel_case.len(), |pos| index + pos);
-    let result = &camel_case[..end_position];
-    *camel_case = &camel_case[end_position..];
-    Some(result)
-}

components/derive_common/lib.rs

@@ -1,13 +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/. */
-
-extern crate darling;
-extern crate proc_macro2;
-#[macro_use]
-extern crate quote;
-#[macro_use]
-extern crate syn;
-extern crate synstructure;
-
-pub mod cg;

components/devtools/Cargo.toml

@@ -1,17 +1,21 @@
 [package]
 name = "devtools"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "devtools"
 path = "lib.rs"
 
+[build-dependencies]
+chrono = { workspace = true }
+
 [dependencies]
-chrono = "0.4"
+base = { workspace = true }
+chrono = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
@@ -19,7 +23,6 @@ headers = { workspace = true }
 http = { workspace = true }
 ipc-channel = { workspace = true }
 log = { workspace = true }
-msg = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 servo_config = { path = "../config" }

components/devtools/actor.rs

@@ -5,7 +5,7 @@
 use std::any::Any;
 use std::cell::{Cell, RefCell};
 use std::collections::HashMap;
-use std::mem::replace;
+use std::mem;
 use std::net::TcpStream;
 use std::sync::{Arc, Mutex};
 
@@ -105,7 +105,7 @@ impl ActorRegistry {
 
     /// Get start stamp when registry was started
     pub fn start_stamp(&self) -> PreciseTime {
-        self.start_stamp.clone()
+        self.start_stamp
     }
 
     pub fn register_script_actor(&self, script_id: String, actor: String) {
@@ -194,12 +194,12 @@ impl ActorRegistry {
                 }
             },
         }
-        let new_actors = replace(&mut *self.new_actors.borrow_mut(), vec![]);
+        let new_actors = mem::take(&mut *self.new_actors.borrow_mut());
         for actor in new_actors.into_iter() {
             self.actors.insert(actor.name().to_owned(), actor);
         }
 
-        let old_actors = replace(&mut *self.old_actors.borrow_mut(), vec![]);
+        let old_actors = mem::take(&mut *self.old_actors.borrow_mut());
         for name in old_actors {
             self.drop_actor(name);
         }

components/devtools/actors/browsing_context.rs

@@ -2,142 +2,183 @@
  * 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/. */
 
-//! Liberally derived from the [Firefox JS implementation](http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/webbrowser.js).
+//! Liberally derived from the [Firefox JS implementation](https://searchfox.org/mozilla-central/source/devtools/server/actors/webbrowser.js).
 //! 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::cell::{Cell, RefCell};
 use std::collections::HashMap;
 use std::net::TcpStream;
+use std::time::{SystemTime, UNIX_EPOCH};
 
-use devtools_traits::DevtoolScriptControlMsg::{self, WantsLiveNotifications};
-use devtools_traits::{DevtoolsPageInfo, NavigationState};
-use ipc_channel::ipc::IpcSender;
-use msg::constellation_msg::{BrowsingContextId, PipelineId};
+use base::id::{BrowsingContextId, PipelineId};
+use devtools_traits::DevtoolScriptControlMsg::{self, GetCssDatabase, WantsLiveNotifications};
+use devtools_traits::{ConsoleLog, DevtoolsPageInfo, NavigationState, PageError};
+use ipc_channel::ipc::{self, IpcSender};
 use serde::Serialize;
 use serde_json::{Map, Value};
 
 use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
-use crate::actors::emulation::EmulationActor;
+use crate::actors::inspector::accessibility::AccessibilityActor;
+use crate::actors::inspector::css_properties::CssPropertiesActor;
 use crate::actors::inspector::InspectorActor;
-use crate::actors::performance::PerformanceActor;
-use crate::actors::profiler::ProfilerActor;
+use crate::actors::reflow::ReflowActor;
 use crate::actors::stylesheets::StyleSheetsActor;
 use crate::actors::tab::TabDescriptorActor;
 use crate::actors::thread::ThreadActor;
-use crate::actors::timeline::TimelineActor;
+use crate::actors::watcher::{SessionContext, SessionContextType, WatcherActor};
 use crate::protocol::JsonPacketStream;
-use crate::StreamId;
+use crate::{EmptyReplyMsg, StreamId};
 
 #[derive(Serialize)]
-struct BrowsingContextTraits {
-    isBrowsingContext: bool,
+struct FrameUpdateReply {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    frames: Vec<FrameUpdateMsg>,
 }
 
 #[derive(Serialize)]
-struct AttachedTraits {
-    reconfigure: bool,
+#[serde(rename_all = "camelCase")]
+struct FrameUpdateMsg {
+    id: u32,
+    is_top_level: bool,
+    url: String,
+    title: String,
+}
+
+#[derive(Serialize)]
+struct ResourceAvailableReply {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    resources: Vec<ResourceAvailableMsg>,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ResourceAvailableMsg {
+    #[serde(rename = "hasNativeConsoleAPI")]
+    has_native_console_api: Option<bool>,
+    name: String,
+    #[serde(rename = "newURI")]
+    new_uri: Option<String>,
+    resource_type: String,
+    time: u64,
+    title: Option<String>,
+    url: Option<String>,
+}
+
+#[derive(Serialize)]
+struct ConsoleMsg {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    resources: Vec<ConsoleMessageResource>,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ConsoleMessageResource {
+    message: ConsoleLog,
+    resource_type: String,
+}
+
+#[derive(Serialize)]
+struct PageErrorMsg {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    resources: Vec<PageErrorResource>,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct PageErrorResource {
+    page_error: PageError,
+    resource_type: String,
+}
+
+#[derive(Serialize)]
+struct TabNavigated {
+    from: String,
+    #[serde(rename = "type")]
+    type_: String,
+    url: String,
+    title: Option<String>,
+    #[serde(rename = "nativeConsoleAPI")]
+    native_console_api: bool,
+    state: String,
+    is_frame_switching: bool,
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct BrowsingContextTraits {
     frames: bool,
-    logInPage: bool,
-    canRewind: bool,
+    is_browsing_context: bool,
+    log_in_page: bool,
+    navigation: bool,
+    supports_top_level_target_flag: bool,
     watchpoints: bool,
 }
 
 #[derive(Serialize)]
-struct BrowsingContextAttachedReply {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-    threadActor: String,
-    cacheDisabled: bool,
-    javascriptEnabled: bool,
-    traits: AttachedTraits,
-}
-
-#[derive(Serialize)]
-struct BrowsingContextDetachedReply {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-}
-
-#[derive(Serialize)]
-struct ReconfigureReply {
-    from: String,
-}
-
-#[derive(Serialize)]
-struct ListFramesReply {
-    from: String,
-    frames: Vec<FrameMsg>,
-}
-
-#[derive(Serialize)]
-struct FrameMsg {
-    id: u32,
-    url: String,
-    title: String,
-    parentID: u32,
-}
-
-#[derive(Serialize)]
-struct ListWorkersReply {
-    from: String,
-    workers: Vec<WorkerMsg>,
-}
-
-#[derive(Serialize)]
-struct WorkerMsg {
-    id: u32,
-}
-
-#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct BrowsingContextActorMsg {
     actor: String,
     title: String,
     url: String,
-    outerWindowID: u32,
-    browsingContextId: u32,
-    consoleActor: String,
-    /*emulationActor: String,
-    inspectorActor: String,
-    timelineActor: String,
-    profilerActor: String,
-    performanceActor: String,
-    styleSheetsActor: String,*/
+    #[serde(rename = "outerWindowID")]
+    outer_window_id: u32,
+    #[serde(rename = "browsingContextID")]
+    browsing_context_id: u32,
+    is_top_level_target: bool,
     traits: BrowsingContextTraits,
+    // Implemented actors
+    accessibility_actor: String,
+    console_actor: String,
+    css_properties_actor: String,
+    inspector_actor: String,
+    reflow_actor: String,
+    style_sheets_actor: String,
+    thread_actor: String,
     // Part of the official protocol, but not yet implemented.
-    /*storageActor: String,
-    memoryActor: String,
-    framerateActor: String,
-    reflowActor: String,
-    cssPropertiesActor: String,
-    animationsActor: String,
-    webExtensionInspectedWindowActor: String,
-    accessibilityActor: String,
-    screenshotActor: String,
-    changesActor: String,
-    webSocketActor: String,
-    manifestActor: String,*/
+    // animations_actor: String,
+    // changes_actor: String,
+    // framerate_actor: String,
+    // manifest_actor: String,
+    // memory_actor: String,
+    // network_content_actor: String,
+    // objects_manager: String,
+    // performance_actor: String,
+    // resonsive_actor: String,
+    // storage_actor: String,
+    // tracer_actor: String,
+    // web_extension_inspected_window_actor: String,
+    // web_socket_actor: String,
 }
 
+/// 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.
 pub(crate) struct BrowsingContextActor {
     pub name: String,
     pub title: RefCell<String>,
     pub url: RefCell<String>,
+    pub active_pipeline: Cell<PipelineId>,
+    pub browsing_context_id: BrowsingContextId,
+    pub accessibility: String,
     pub console: String,
-    pub _emulation: String,
-    pub _inspector: String,
-    pub _timeline: String,
-    pub _profiler: String,
-    pub _performance: String,
-    pub _styleSheets: String,
+    pub css_properties: String,
+    pub inspector: String,
+    pub reflow: String,
+    pub style_sheets: String,
     pub thread: String,
     pub _tab: String,
-    pub streams: RefCell<HashMap<StreamId, TcpStream>>,
-    pub browsing_context_id: BrowsingContextId,
-    pub active_pipeline: Cell<PipelineId>,
     pub script_chan: IpcSender<DevtoolScriptControlMsg>,
+    pub streams: RefCell<HashMap<StreamId, TcpStream>>,
+    pub watcher: String,
 }
 
 impl Actor for BrowsingContextActor {
@@ -149,89 +190,17 @@ impl Actor for BrowsingContextActor {
         &self,
         _registry: &ActorRegistry,
         msg_type: &str,
-        msg: &Map<String, Value>,
+        _msg: &Map<String, Value>,
         stream: &mut TcpStream,
-        id: StreamId,
+        _id: StreamId,
     ) -> Result<ActorMessageStatus, ()> {
         Ok(match msg_type {
-            "reconfigure" => {
-                if let Some(options) = msg.get("options").and_then(|o| o.as_object()) {
-                    if let Some(val) = options.get("performReload") {
-                        if val.as_bool().unwrap_or(false) {
-                            let _ = self
-                                .script_chan
-                                .send(DevtoolScriptControlMsg::Reload(self.active_pipeline.get()));
-                        }
-                    }
-                }
-                let _ = stream.write_json_packet(&ReconfigureReply { from: self.name() });
-                ActorMessageStatus::Processed
-            },
-
-            // https://docs.firefox-dev.tools/backend/protocol.html#listing-browser-tabs
-            // (see "To attach to a _targetActor_")
-            "attach" => {
-                let msg = BrowsingContextAttachedReply {
-                    from: self.name(),
-                    type_: "tabAttached".to_owned(),
-                    threadActor: self.thread.clone(),
-                    cacheDisabled: false,
-                    javascriptEnabled: true,
-                    traits: AttachedTraits {
-                        reconfigure: false,
-                        frames: true,
-                        logInPage: false,
-                        canRewind: false,
-                        watchpoints: false,
-                    },
-                };
-
-                if stream.write_json_packet(&msg).is_err() {
-                    return Ok(ActorMessageStatus::Processed);
-                }
-                self.streams
-                    .borrow_mut()
-                    .insert(id, stream.try_clone().unwrap());
-                self.script_chan
-                    .send(WantsLiveNotifications(self.active_pipeline.get(), true))
-                    .unwrap();
-                ActorMessageStatus::Processed
-            },
-
-            "detach" => {
-                let msg = BrowsingContextDetachedReply {
-                    from: self.name(),
-                    type_: "detached".to_owned(),
-                };
-                let _ = stream.write_json_packet(&msg);
-                self.cleanup(id);
-                ActorMessageStatus::Processed
-            },
-
             "listFrames" => {
-                let msg = ListFramesReply {
-                    from: self.name(),
-                    frames: vec![FrameMsg {
-                        //FIXME: shouldn't ignore pipeline namespace field
-                        id: self.active_pipeline.get().index.0.get(),
-                        parentID: 0,
-                        url: self.url.borrow().clone(),
-                        title: self.title.borrow().clone(),
-                    }],
-                };
+                // TODO: Find out what needs to be listed here
+                let msg = EmptyReplyMsg { from: self.name() };
                 let _ = stream.write_json_packet(&msg);
                 ActorMessageStatus::Processed
             },
-
-            "listWorkers" => {
-                let msg = ListWorkersReply {
-                    from: self.name(),
-                    workers: vec![],
-                };
-                let _ = stream.write_json_packet(&msg);
-                ActorMessageStatus::Processed
-            },
-
             _ => ActorMessageStatus::Ignored,
         })
     }
@@ -255,61 +224,69 @@ impl BrowsingContextActor {
         script_sender: IpcSender<DevtoolScriptControlMsg>,
         actors: &mut ActorRegistry,
     ) -> BrowsingContextActor {
-        let emulation = EmulationActor::new(actors.new_name("emulation"));
-
         let name = actors.new_name("target");
+        let DevtoolsPageInfo { title, url } = page_info;
+
+        let accessibility = AccessibilityActor::new(actors.new_name("accessibility"));
+
+        let properties = (|| {
+            let (properties_sender, properties_receiver) = ipc::channel().ok()?;
+            script_sender.send(GetCssDatabase(properties_sender)).ok()?;
+            properties_receiver.recv().ok()
+        })()
+        .unwrap_or_default();
+        let css_properties = CssPropertiesActor::new(actors.new_name("css-properties"), properties);
 
         let inspector = InspectorActor {
             name: actors.new_name("inspector"),
             walker: RefCell::new(None),
-            pageStyle: RefCell::new(None),
+            page_style: RefCell::new(None),
             highlighter: RefCell::new(None),
             script_chan: script_sender.clone(),
             browsing_context: name.clone(),
         };
 
-        let timeline =
-            TimelineActor::new(actors.new_name("timeline"), pipeline, script_sender.clone());
+        let reflow = ReflowActor::new(actors.new_name("reflow"));
 
-        let profiler = ProfilerActor::new(actors.new_name("profiler"));
-        let performance = PerformanceActor::new(actors.new_name("performance"));
-
-        // the strange switch between styleSheets and stylesheets is due
-        // to an inconsistency in devtools. See Bug #1498893 in bugzilla
-        let styleSheets = StyleSheetsActor::new(actors.new_name("stylesheets"));
-        let thread = ThreadActor::new(actors.new_name("context"));
-
-        let DevtoolsPageInfo { title, url } = page_info;
+        let style_sheets = StyleSheetsActor::new(actors.new_name("stylesheets"));
 
         let tabdesc = TabDescriptorActor::new(actors, name.clone());
 
+        let thread = ThreadActor::new(actors.new_name("thread"));
+
+        let watcher = WatcherActor::new(
+            actors,
+            name.clone(),
+            SessionContext::new(SessionContextType::BrowserElement),
+        );
+
         let target = BrowsingContextActor {
-            name: name,
+            name,
             script_chan: script_sender,
-            title: RefCell::new(String::from(title)),
+            title: RefCell::new(title),
             url: RefCell::new(url.into_string()),
-            console: console,
-            _emulation: emulation.name(),
-            _inspector: inspector.name(),
-            _timeline: timeline.name(),
-            _profiler: profiler.name(),
-            _performance: performance.name(),
-            _styleSheets: styleSheets.name(),
+            active_pipeline: Cell::new(pipeline),
+            browsing_context_id: id,
+            accessibility: accessibility.name(),
+            console,
+            css_properties: css_properties.name(),
+            inspector: inspector.name(),
+            reflow: reflow.name(),
+            streams: RefCell::new(HashMap::new()),
+            style_sheets: style_sheets.name(),
             _tab: tabdesc.name(),
             thread: thread.name(),
-            streams: RefCell::new(HashMap::new()),
-            browsing_context_id: id,
-            active_pipeline: Cell::new(pipeline),
+            watcher: watcher.name(),
         };
 
-        actors.register(Box::new(emulation));
+        actors.register(Box::new(accessibility));
+        actors.register(Box::new(css_properties));
         actors.register(Box::new(inspector));
-        actors.register(Box::new(timeline));
-        actors.register(Box::new(profiler));
-        actors.register(Box::new(performance));
-        actors.register(Box::new(styleSheets));
-        actors.register(Box::new(thread));
+        actors.register(Box::new(reflow));
+        actors.register(Box::new(style_sheets));
         actors.register(Box::new(tabdesc));
+        actors.register(Box::new(thread));
+        actors.register(Box::new(watcher));
 
         target
     }
@@ -318,21 +295,27 @@ impl BrowsingContextActor {
         BrowsingContextActorMsg {
             actor: self.name(),
             traits: BrowsingContextTraits {
-                isBrowsingContext: true,
+                is_browsing_context: true,
+                frames: true,
+                log_in_page: false,
+                navigation: true,
+                supports_top_level_target_flag: true,
+                watchpoints: true,
             },
             title: self.title.borrow().clone(),
             url: self.url.borrow().clone(),
             //FIXME: shouldn't ignore pipeline namespace field
-            browsingContextId: self.browsing_context_id.index.0.get(),
+            browsing_context_id: self.browsing_context_id.index.0.get(),
             //FIXME: shouldn't ignore pipeline namespace field
-            outerWindowID: self.active_pipeline.get().index.0.get(),
-            consoleActor: self.console.clone(),
-            /*emulationActor: self.emulation.clone(),
-            inspectorActor: self.inspector.clone(),
-            timelineActor: self.timeline.clone(),
-            profilerActor: self.profiler.clone(),
-            performanceActor: self.performance.clone(),
-            styleSheetsActor: self.styleSheets.clone(),*/
+            outer_window_id: self.active_pipeline.get().index.0.get(),
+            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(),
         }
     }
 
@@ -346,20 +329,21 @@ impl BrowsingContextActor {
         if let Some(p) = pipeline {
             self.active_pipeline.set(p);
         }
-        *self.url.borrow_mut() = url.as_str().to_owned();
+        url.as_str().clone_into(&mut self.url.borrow_mut());
         if let Some(ref t) = title {
-            *self.title.borrow_mut() = t.clone();
+            self.title.borrow_mut().clone_from(t);
         }
 
         let msg = TabNavigated {
             from: self.name(),
             type_: "tabNavigated".to_owned(),
             url: url.as_str().to_owned(),
-            title: title,
-            nativeConsoleAPI: true,
+            title,
+            native_console_api: true,
             state: state.to_owned(),
-            isFrameSwitching: false,
+            is_frame_switching: false,
         };
+
         for stream in self.streams.borrow_mut().values_mut() {
             let _ = stream.write_json_packet(&msg);
         }
@@ -371,16 +355,70 @@ impl BrowsingContextActor {
         }
         *self.title.borrow_mut() = title;
     }
-}
 
-#[derive(Serialize)]
-struct TabNavigated {
-    from: String,
-    #[serde(rename = "type")]
-    type_: String,
-    url: String,
-    title: Option<String>,
-    nativeConsoleAPI: bool,
-    state: String,
-    isFrameSwitching: bool,
+    pub(crate) fn frame_update(&self, stream: &mut TcpStream) {
+        let _ = stream.write_json_packet(&FrameUpdateReply {
+            from: self.name(),
+            type_: "frameUpdate".into(),
+            frames: vec![FrameUpdateMsg {
+                id: self.browsing_context_id.index.0.get(),
+                is_top_level: true,
+                title: self.title.borrow().clone(),
+                url: self.url.borrow().clone(),
+            }],
+        });
+    }
+
+    pub(crate) fn document_event(&self, stream: &mut TcpStream) {
+        // TODO: This is a hacky way of sending the 3 messages
+        //       Figure out if there needs work to be done here, ensure the page is loaded
+        for &name in ["dom-loading", "dom-interactive", "dom-complete"].iter() {
+            let _ = stream.write_json_packet(&ResourceAvailableReply {
+                from: self.name(),
+                type_: "resource-available-form".into(),
+                resources: vec![ResourceAvailableMsg {
+                    has_native_console_api: Some(true),
+                    name: name.into(),
+                    new_uri: None,
+                    resource_type: "document-event".into(),
+                    time: SystemTime::now()
+                        .duration_since(UNIX_EPOCH)
+                        .unwrap_or_default()
+                        .as_millis() as u64,
+                    title: Some(self.title.borrow().clone()),
+                    url: Some(self.url.borrow().clone()),
+                }],
+            });
+        }
+    }
+
+    pub(crate) fn console_message(&self, message: ConsoleLog) {
+        let msg = ConsoleMsg {
+            from: self.name(),
+            type_: "resource-available-form".into(),
+            resources: vec![ConsoleMessageResource {
+                message,
+                resource_type: "console-message".into(),
+            }],
+        };
+
+        for stream in self.streams.borrow_mut().values_mut() {
+            let _ = stream.write_json_packet(&msg);
+        }
+    }
+
+    pub(crate) fn page_error(&self, page_error: PageError) {
+        let msg = PageErrorMsg {
+            from: self.name(),
+            type_: "resource-available-form".into(),
+            resources: vec![PageErrorResource {
+                page_error,
+                resource_type: "error-message".into(),
+            }],
+        };
+
+        for stream in self.streams.borrow_mut().values_mut() {
+            let _ = stream.write_json_packet(&msg);
+        }
+    }
 }