diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..fa6c67068c --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,75 @@ +name: CI + +on: + push: + branches: ["main"] + pull_request: + workflow_dispatch: + merge_group: + types: [checks_requested] + + +jobs: + linux-debug: + name: Linux (Debug) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + - name: Run Tests + run: cargo build --features servo + env: + RUST_BACKTRACE: 1 + + linux-release: + name: Linux (Release) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + - name: Run Tests + run: cargo build --release --features servo + env: + RUST_BACKTRACE: 1 + + macos-debug: + name: macOS (Debug) + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + - name: Run Tests + run: cargo build --features servo + env: + RUST_BACKTRACE: 1 + + windows-debug: + name: Windows (Debug) + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + - name: Run Tests + run: cargo build --features servo + env: + RUST_BACKTRACE: 1 + + build-result: + name: Result + runs-on: ubuntu-latest + if: ${{ always() }} + needs: + - linux-debug + - linux-release + steps: + - name: Success + if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} + run: exit 0 + - name: Failure + if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} + run: exit 1 + diff --git a/.github/workflows/mirror-to-release-branch.yml b/.github/workflows/mirror-to-release-branch.yml new file mode 100644 index 0000000000..c8593195da --- /dev/null +++ b/.github/workflows/mirror-to-release-branch.yml @@ -0,0 +1,26 @@ +name: 🪞 Mirror `main` +on: + push: + branches: + - main + +jobs: + mirror: + name: Mirror + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Get branch name + id: branch-name + run: | + first_commit=$(git log --pretty=\%H --grep='Servo initial downstream commit') + upstream_base="$first_commit~" + echo BRANCH_NAME=$(git log -n1 --pretty='%as' $upstream_base) >> $GITHUB_OUTPUT + - uses: google/mirror-branch-action@v1.0 + name: Mirror to ${{ steps.branch-name.outputs.BRANCH_NAME }} + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + source: main + dest: ${{ steps.branch-name.outputs.BRANCH_NAME }} diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 0000000000..adf329ffa6 --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,23 @@ +name: Sync upstream with mozilla-central + +on: + schedule: + - cron: '0 13 * * *' + workflow_dispatch: + +jobs: + sync: + name: Sync + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 1 + - uses: actions/cache@v3 + with: + path: _cache/upstream + key: upstream + - run: | + ./sync.sh _filtered + git fetch -f --progress ./_filtered main:upstream + git push -fu --progress origin upstream diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..fc3c2f9b3c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/_cache/ +/_filtered/ +/target/ +/style/properties/__pycache__/ +Cargo.lock diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000000..49a69985a1 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,38 @@ +[workspace] +resolver = "2" +members = [ + "stylo_atoms", + "stylo_dom", + "malloc_size_of", + "rustfmt.toml", + "selectors", + "servo_arc", + "style", + "style_derive", + "stylo_config", + "stylo_static_prefs", + "style_traits", + "to_shmem", + "to_shmem_derive", +] +default-members = ["style"] + +[workspace.package] +version = "0.11.0" + +[workspace.dependencies] +# in-repo dependencies (separately versioned) +servo_arc = { version = "0.4.3", path = "./servo_arc" } +selectors = { version = "0.35.0", path = "./selectors" } +to_shmem = { version = "0.3.0", path = "./to_shmem", features = ["servo"] } +to_shmem_derive = { version = "0.1.0", path = "./to_shmem_derive" } + +# in-repo dependencies (main version) +malloc_size_of = { version = "0.11.0", path = "./malloc_size_of", package = "stylo_malloc_size_of", features = ["servo"] } +static_prefs = { version = "0.11.0", path = "./stylo_static_prefs", package = "stylo_static_prefs" } +style_config = { version = "0.11.0", path = "./stylo_config", package = "stylo_config"} +stylo_atoms = { version = "0.11.0", path = "./stylo_atoms" } +dom = { version = "0.11.0", path = "./stylo_dom", package = "stylo_dom" } +style_traits = { version = "0.11.0", path = "./style_traits", features = ["servo"], package = "stylo_traits"} +style_derive = { version = "0.11.0", path = "./style_derive", package = "stylo_derive"} +stylo = { version = "0.11.0", path = "./style" } diff --git a/README.md b/README.md new file mode 100644 index 0000000000..527db6b2f4 --- /dev/null +++ b/README.md @@ -0,0 +1,107 @@ +Stylo +===== + +**High-Performance CSS Style Engine** + +[![Build Status](https://github.com/servo/stylo/actions/workflows/main.yml/badge.svg)](https://github.com/servo/stylo/actions) +[![Crates.io](https://img.shields.io/crates/v/stylo.svg)](https://crates.io/crates/stylo) +[![Docs](https://docs.rs/stylo/badge.svg)](https://docs.rs/stylo) +![Crates.io License](https://img.shields.io/crates/l/stylo) + +Stylo is a high-performance, browser-grade CSS style engine written in Rust that powers [Servo](https://servo.org) and [Firefox](https://firefox.com). This repo contains Servo’s downstream version of Stylo. The upstream version lives in mozilla-central with the rest of the Gecko/Firefox codebase. + +Coordination of Stylo development happens: + +- Here in Github Issues +- In the [#stylo](https://servo.zulipchat.com/#narrow/channel/417109-stylo) channel of the [Servo Zulip](https://servo.zulipchat.com/) +- In the [#layout](https://chat.mozilla.org/#/room/#layout:mozilla.org) room of the Mozilla Matrix instance (matrix.mozilla.org) + +## High-Level Documentation + +- This [Mozilla Hacks article](https://hacks.mozilla.org/2017/08/inside-a-super-fast-css-engine-quantum-css-aka-stylo) contains a high-level overview of the Stylo architecture. +- There is a [chapter](https://book.servo.org/architecture/style.html) in the Servo Book (although it is a little out of date). + +## Branches + +The branches are as follows: + +- [**upstream**](https://github.com/servo/style/tree/upstream) has upstream [mozilla-central](https://searchfox.org/mozilla-central/source/servo) filtered to the paths we care about ([style.paths](style.paths)), but is otherwise unmodified. +- [**main**](https://github.com/servo/style/tree/ci) adds our downstream patches, plus the scripts and workflows for syncing with mozilla-central on top of **upstream**. + +> [!WARNING] +> This repo syncs from upstream by creating a new branch and then rebasing our changes on top of it. This means that `git pull` will not work across syncs (you will need to use `git fetch`, `git reset` and `git rebase`). + +More information on the syncing process is available in [SYNCING.md](SYNCING.md) + +## Crates + +A guide to the crates contained within this repo + +### Stylo Crates + +These crates are largely implementation details of Stylo, although you may need to use some of them directly if you use Stylo. + +| Directory | Crate | Notes | +| --- | --- | --- | +| style | [![Crates.io](https://img.shields.io/crates/v/stylo.svg)](https://crates.io/crates/stylo) | The main Stylo crate containing the entire CSS engine | +| style_traits | [![Crates.io](https://img.shields.io/crates/v/stylo_traits.svg)](https://crates.io/crates/stylo_traits) | Types and traits which allow other code to interoperate with Stylo without depending on the main crate directly. | +| stylo_dom | [![Crates.io](https://img.shields.io/crates/v/stylo_dom.svg)](https://crates.io/crates/stylo_dom) | Similar to stylo_traits (but much smaller) | +| stylo_atoms | [![Crates.io](https://img.shields.io/crates/v/stylo_atoms.svg)](https://crates.io/crates/stylo_atoms) | [Atoms](https://docs.rs/string_cache/latest/string_cache/struct.Atom.html) for CSS and HTML event related strings | +| stylo_config | [![Crates.io](https://img.shields.io/crates/v/stylo_config.svg)](https://crates.io/crates/stylo_config) | Configuration for Stylo. Can be used to set runtime preferences (enabling/disabling properties, etc) | +| stylo_static_prefs | [![Crates.io](https://img.shields.io/crates/v/stylo_static_prefs.svg)](https://crates.io/crates/stylo_static_prefs) | Static configuration for Stylo. Config be overridden by patching in a replacement crate. | +| style_derive | [![Crates.io](https://img.shields.io/crates/v/stylo_derive.svg)](https://crates.io/crates/stylo_derive) | Internal derive macro for stylo crate | + +### Standalone Crates + +These crates form part of Stylo but are also be useful standalone. + +| Directory | Crate | Notes | +| --- | --- | --- | +| selectors | [![Crates.io](https://img.shields.io/crates/v/selectors.svg)](https://crates.io/crates/selectors) | CSS Selector matching | +| servo_arc | [![Crates.io](https://img.shields.io/crates/v/servo_arc.svg)](https://crates.io/crates/servo_arc) | A variant on `std::Arc` | + +You may also be interested in the `cssparser` crate which lives in the [servo/rust-cssparser](https://github.com/servo/rust-cssparser) repo. + +### Support Crates + +Low-level crates which could technically be used standalone but are unlikely to be generally useful in practice. + +| Directory | Crate | Notes | +| --- | --- | --- | +| malloc_size_of | [![Crates.io](https://img.shields.io/crates/v/stylo_malloc_size_of.svg)](https://crates.io/crates/stylo_malloc_size_of) | Heap size measurement for Stylo values | +| to_shmem | [![Crates.io](https://img.shields.io/crates/v/to_shmem.svg)](https://crates.io/crates/to_shmem) | Internal utility crate for sharing memory across processes. | +| to_shmem_derive | [![Crates.io](https://img.shields.io/crates/v/to_shmem_derive.svg)](https://crates.io/crates/to_shmem_derive) | Internal derive macro for to_shmem crate | + +## Building Servo Against a Local Copy of Stylo + +Assuming your local `servo` and `stylo` directories are siblings, you can build `servo` against `stylo` by adding the following to `servo/Cargo.toml`: + +```toml +[patch."https://github.com/servo/stylo"] +selectors = { path = "../stylo/selectors" } +servo_arc = { path = "../stylo/servo_arc" } +stylo_atoms = { path = "../stylo/stylo_atoms" } +stylo = { path = "../stylo/style" } +stylo_config = { path = "../stylo/stylo_config" } +stylo_dom = { path = "../stylo/stylo_dom" } +stylo_malloc_size_of = { path = "../stylo/malloc_size_of" } +stylo_traits = { path = "../stylo/style_traits" } +``` + +## Releases + +Releases are made every time this repository rebases its changes on top of the latest version of upstream Stylo. There are a lot of crates here. In order to publish them, they must be done in order. One order that works is: + +- selectors +- stylo_static_prefs +- stylo_config +- stylo_atoms +- stylo_malloc_size_of +- stylo_dom +- stylo_derive +- stylo_traits +- stylo + +## License + +Stylo is licensed under MPL 2.0 diff --git a/SYNCING.md b/SYNCING.md new file mode 100644 index 0000000000..72a0a53d1d --- /dev/null +++ b/SYNCING.md @@ -0,0 +1,63 @@ +# Syncing + +This file documents the process of syncing this repository with the upstream copy of Stylo in mozilla-central. + +## Syncing `upstream` with mozilla-central + +Start by generating a filtered copy of mozilla-central. This will cache the raw mozilla-central in `_cache/upstream`, storing the result in `_filtered`: + +```sh +$ ./sync.sh _filtered +``` + +If `_filtered` already exists, you will need to delete it and try again: + +```sh +$ rm -Rf _filtered +``` + +Now overwrite our `upstream` with those commits and push: + +```sh +$ git fetch -f --progress ./_filtered main:upstream +$ git push -fu --progress origin upstream +``` + +## Rebasing `main` onto `upstream` + +Start by fetching `upstream` into your local repo: + +```sh +$ git fetch -f origin upstream:upstream +``` + +In general, the filtering process is deterministic, yielding the same commit hashes each time, so we can rebase normally: + +```sh +$ git rebase upstream +``` + +But if the filtering config changes or Mozilla moves to GitHub, the commit hashes on `upstream` may change. In this case, we need to tell git where the old upstream ends and our own commits start (notice the `~`): + +```sh +$ git log --pretty=\%H --grep='Servo initial downstream commit' +e62d7f0090941496e392e1dc91df103a38e3f488 + +$ git rebase --onto upstream e62d7f0090941496e392e1dc91df103a38e3f488~ +Successfully rebased and updated refs/heads/main. +``` + +`start-rebase.sh` takes care of this automatically, but you should still use `git rebase` for subsequent steps like `--continue` and `--abort`: + +```sh +$ ./start-rebase.sh upstream +$ ./start-rebase.sh upstream -i # interactive +$ git rebase --continue # not ./start-rebase.sh --continue +$ git rebase --abort # not ./start-rebase.sh --abort +``` + +Or if we aren’t ready to rebase onto the tip of upstream: + +```sh +$ ./start-rebase.sh upstream~10 -i +``` diff --git a/commit-from-merge.sh b/commit-from-merge.sh new file mode 100755 index 0000000000..94aa606f02 --- /dev/null +++ b/commit-from-merge.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# Usage: commit-from-merge.sh [extra git-commit(1) arguments ...] +# Given a merge commit made by bors, runs git-commit(1) with your local changes +# while borrowing the author name/email from the right-hand parent of the merge, +# and the author date from the committer date of the merge. +set -eu + +lookup_repo=$1; shift +merge_commit=$1; shift +author_name_email=$(git -C "$lookup_repo" log -n1 --pretty='%aN <%aE>' "$merge_commit"\^2) +committer_date=$(git -C "$lookup_repo" log -n1 --pretty='%cd' "$merge_commit") + +set -- git commit --author="$author_name_email" --date="$committer_date" "$@" +echo "$@" +"$@" diff --git a/commit-from-squashed.sh b/commit-from-squashed.sh new file mode 100755 index 0000000000..004e0f7840 --- /dev/null +++ b/commit-from-squashed.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# Usage: commit-from-squashed.sh [extra git-commit(1) arguments ...] +# Given a squashed commit made by the GitHub merge queue, runs git-commit(1) with your local changes +# while borrowing our author name/email from that commit, our author date from its committer date, +# and our commit message from that commit. +set -eu + +squashed_commit=$1; shift +committer_date=$(git log -n1 --pretty='%cd' "$squashed_commit") + +# -c is equivalent to --author=$(...'%aN <%aE>') -m $(...'%B'), but allows editing +set -- git commit -c "$squashed_commit" --date="$committer_date" "$@" +echo "$@" +"$@" diff --git a/malloc_size_of/Cargo.toml b/malloc_size_of/Cargo.toml index 4859a962c0..66288a8204 100644 --- a/malloc_size_of/Cargo.toml +++ b/malloc_size_of/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "malloc_size_of" -version = "0.0.1" +name = "stylo_malloc_size_of" +version.workspace = true authors = ["The Servo Project Developers"] license = "MIT OR Apache-2.0" repository = "https://github.com/servo/stylo" @@ -18,10 +18,10 @@ servo = ["string_cache"] app_units = "0.7" cssparser = "0.36" euclid = "0.22" -selectors = { path = "../selectors" } -servo_arc = { path = "../servo_arc" } +selectors = { workspace = true } +servo_arc = { workspace = true } smallbitvec = "2.3.0" -smallvec = "1.0" -string_cache = { version = "0.8", optional = true } -thin-vec = { version = "0.2.1" } +smallvec = "1.13" +string_cache = { version = "0.9", optional = true } +thin-vec = { version = "0.2.13" } void = "1.0.2" diff --git a/selectors/Cargo.toml b/selectors/Cargo.toml index de502baffd..d566b36fe8 100644 --- a/selectors/Cargo.toml +++ b/selectors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "selectors" -version = "0.26.0" +version = "0.35.0" authors = ["The Servo Project Developers"] documentation = "https://docs.rs/selectors/" description = "CSS Selectors matching for Rust" @@ -27,10 +27,10 @@ rustc-hash = "2.1.1" log = "0.4" phf = "0.13" precomputed-hash = "0.1" -servo_arc = { version = "0.4", path = "../servo_arc" } +servo_arc = { workspace = true } smallvec = "1.0" -to_shmem = { version = "0.1", path = "../to_shmem", features = ["servo_arc"], optional = true } -to_shmem_derive = { version = "0.1", path = "../to_shmem_derive", optional = true } +to_shmem = { workspace = true, optional = true } +to_shmem_derive = { workspace = true, optional = true } new_debug_unreachable = "1" [build-dependencies] diff --git a/servo_arc/Cargo.toml b/servo_arc/Cargo.toml index 8b0976b75d..f5ae244a50 100644 --- a/servo_arc/Cargo.toml +++ b/servo_arc/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "servo_arc" -version = "0.4.0" +version = "0.4.3" authors = ["The Servo Project Developers"] license = "MIT OR Apache-2.0" repository = "https://github.com/servo/stylo" description = "A fork of std::sync::Arc with some extra functionality and without weak references" edition = "2021" +readme = "../README.md" [lib] name = "servo_arc" path = "lib.rs" [features] +default = ["track_alloc_size"] gecko_refcount_logging = [] servo = ["serde", "track_alloc_size"] track_alloc_size = [] diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000000..2c96e200aa --- /dev/null +++ b/shell.nix @@ -0,0 +1,6 @@ +with import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/46ae0210ce163b3cba6c7da08840c1d63de9c701.tar.gz"; +}) {}; +stdenv.mkDerivation rec { + name = "style-sync-shell"; +} diff --git a/start-rebase.sh b/start-rebase.sh new file mode 100755 index 0000000000..fe417f7f08 --- /dev/null +++ b/start-rebase.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# Usage: start-rebase.sh [extra git-rebase(1) arguments ...] +# Equivalent to git rebase --onto . +set -eu + +new_base=$1; shift +first_commit=$(git log --pretty=\%H --grep='Servo initial downstream commit') +old_base=$first_commit~ + +git rebase --onto "$new_base" "$old_base" "$@" diff --git a/style.paths b/style.paths new file mode 100644 index 0000000000..d1d2d02638 --- /dev/null +++ b/style.paths @@ -0,0 +1,8 @@ +# Filters and renames use git-filter-repo(1) --paths-from-file: +# https://htmlpreview.github.io/?https://github.com/newren/git-filter-repo/blob/docs/html/git-filter-repo.html#_filtering_based_on_many_paths + +servo/components/ +servo/rustfmt.toml + +regex:servo/components/(.+)==>\1 +servo/rustfmt.toml==>rustfmt.toml diff --git a/style/Cargo.toml b/style/Cargo.toml index 99aff22d11..04f5005b83 100644 --- a/style/Cargo.toml +++ b/style/Cargo.toml @@ -1,11 +1,12 @@ [package] -name = "style" -version = "0.0.1" +name = "stylo" +version.workspace = true authors = ["The Servo Project Developers"] license = "MPL-2.0" repository = "https://github.com/servo/stylo" edition = "2021" description = "The Stylo CSS engine" +readme = "../README.md" build = "build.rs" @@ -18,6 +19,7 @@ path = "lib.rs" doctest = false [features] +default = ["servo"] gecko = [ "bindgen", "malloc_size_of/gecko", @@ -31,15 +33,15 @@ gecko = [ "to_shmem/gecko", ] servo = [ - "arrayvec/use_union", "cssparser/serde", "encoding_rs", "malloc_size_of/servo", "web_atoms", + "mime", "serde", "servo_arc/servo", "stylo_atoms", - "servo_config", + "style_config", "string_cache", "style_traits/servo", "url", @@ -48,6 +50,7 @@ servo = [ ] gecko_debug = [] gecko_refcount_logging = [] +nsstring = [] [dependencies] app_units = "0.7.8" @@ -57,20 +60,20 @@ bitflags = "2" byteorder = "1.0" cssparser = "0.36" derive_more = { version = "2", features = ["add", "add_assign", "deref", "deref_mut", "from"] } -dom = { path = "../../../dom/base/rust" } +dom = { workspace = true } new_debug_unreachable = "1.0" encoding_rs = {version = "0.8", optional = true} euclid = "0.22" rustc-hash = "2.1.1" -icu_segmenter = { version = "2.0", default-features = false, features = ["auto", "compiled_data"] } +icu_segmenter = { version = ">= 1.5, <= 2.*", default-features = false, features = ["auto", "compiled_data"] } indexmap = {version = "2", features = ["std"]} itertools = "0.14" itoa = "1.0" log = "0.4" -malloc_size_of = { path = "../malloc_size_of" } -malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" } -web_atoms = { version = "0.1", optional = true } -nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true} +malloc_size_of = { workspace = true } +malloc_size_of_derive = "0.1" +web_atoms = { version = "0.2.0", optional = true } +mime = { version = "0.3.13", optional = true } num_cpus = {version = "1.1.0"} num-integer = "0.1" num-traits = "0.2" @@ -79,24 +82,23 @@ parking_lot = "0.12" precomputed-hash = "0.1.1" rayon = "1" rayon-core = "1" -selectors = { path = "../selectors" } +selectors = { workspace = true } serde = {version = "1.0", optional = true, features = ["derive"]} -servo_arc = { path = "../servo_arc" } -stylo_atoms = {path = "../atoms", optional = true} -servo_config = {path = "../config", optional = true} +servo_arc = { workspace = true} +stylo_atoms = { workspace = true, optional = true} smallbitvec = "2.3.0" smallvec = "1.0" static_assertions = "1.1" -static_prefs = { path = "../../../modules/libpref/init/static_prefs" } -string_cache = { version = "0.8", optional = true } -style_derive = {path = "../style_derive"} -style_traits = {path = "../style_traits"} -to_shmem = {path = "../to_shmem"} -to_shmem_derive = {path = "../to_shmem_derive"} -thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } +static_prefs = { workspace = true} +string_cache = { version = "0.9", optional = true } +style_config = { workspace = true, optional = true } +style_derive = { workspace = true } +style_traits = { workspace = true } +to_shmem = { workspace = true} +to_shmem_derive = { workspace = true } +thin-vec = "0.2.1" uluru = "3.0" void = "1.0.2" -gecko-profiler = { path = "../../../tools/profiler/rust-api" } url = { version = "2.5", optional = true, features = ["serde"] } [build-dependencies] diff --git a/style/build.rs b/style/build.rs index dfeb3e9d66..5e29fac4da 100644 --- a/style/build.rs +++ b/style/build.rs @@ -19,7 +19,7 @@ mod build_gecko { pub static PYTHON: LazyLock = LazyLock::new(|| { env::var("PYTHON3").ok().unwrap_or_else(|| { let candidates = if cfg!(windows) { - ["python3.exe"] + ["python.exe"] } else { ["python3"] }; @@ -56,6 +56,12 @@ fn generate_properties(engine: &str) { .join("build.py"); let status = Command::new(&*PYTHON) + // `cargo publish` isn't happy with the `__pycache__` files that are created + // when we run the property generator. + // + // TODO(mrobinson): Is this happening because of how we run this script? It + // would be better to ensure are just placed in the output directory. + .env("PYTHONDONTWRITEBYTECODE", "1") .arg(&script) .arg(engine) .arg("style-crate") diff --git a/style/custom_properties.rs b/style/custom_properties.rs index adfc35ce6c..25198a9fbd 100644 --- a/style/custom_properties.rs +++ b/style/custom_properties.rs @@ -28,8 +28,7 @@ use crate::stylesheets::UrlExtraData; use crate::stylist::Stylist; use crate::values::computed::{self, ToComputedValue}; use crate::values::specified::FontRelativeLength; -use crate::values::AtomIdent; -use crate::Atom; +use crate::{Atom, LocalName}; use cssparser::{ CowRcStr, Delimiter, Parser, ParserInput, SourcePosition, Token, TokenSerializationType, }; @@ -2161,9 +2160,12 @@ fn substitute_one_reference<'a>( .get(&reference.name, device, url_data) .map(Substitution::from_value) }, - SubstitutionFunctionKind::Attr => attr_provider - .get_attr(AtomIdent::cast(&reference.name)) - .and_then(|attr| { + SubstitutionFunctionKind::Attr => { + #[cfg(feature = "gecko")] + let local_name = LocalName::cast(&reference.name); + #[cfg(feature = "servo")] + let local_name = LocalName::from(reference.name.as_ref()); + attr_provider.get_attr(&local_name).and_then(|attr| { let AttributeType::Type(syntax) = &reference.attribute_syntax else { return Some(Substitution::new( Cow::Owned(quoted_css_string(&attr)), @@ -2182,7 +2184,8 @@ fn substitute_one_reference<'a>( .ok()?; let value = value.to_computed_value(computed_context); Some(Substitution::from_value(value.to_variable_value())) - }), + }) + }, }; if let Some(s) = substitution { diff --git a/style/global_style_data.rs b/style/global_style_data.rs index d240fd5829..c1ab0f7c6e 100644 --- a/style/global_style_data.rs +++ b/style/global_style_data.rs @@ -11,7 +11,7 @@ use crate::parallel::STYLE_THREAD_STACK_SIZE_KB; use crate::shared_lock::SharedRwLock; use crate::thread_state; use parking_lot::{Mutex, RwLock, RwLockReadGuard}; -#[cfg(unix)] +#[cfg(all(unix, not(target_arch = "wasm32")))] use std::os::unix::thread::{JoinHandleExt, RawPthread}; #[cfg(windows)] use std::os::windows::{io::AsRawHandle, prelude::RawHandle}; @@ -19,7 +19,7 @@ use std::{io, sync::LazyLock, thread}; use thin_vec::ThinVec; /// Platform-specific handle to a thread. -#[cfg(unix)] +#[cfg(all(unix, not(target_arch = "wasm32")))] pub type PlatformThreadHandle = RawPthread; /// Platform-specific handle to a thread. #[cfg(windows)] @@ -139,7 +139,7 @@ impl StyleThreadPool { LazyLock::force(&STYLE_THREAD_POOL); for join_handle in STYLE_THREAD_JOIN_HANDLES.lock().iter() { - #[cfg(unix)] + #[cfg(all(unix, not(target_arch = "wasm32")))] let handle = join_handle.as_pthread_t(); #[cfg(windows)] let handle = join_handle.as_raw_handle(); diff --git a/style/lib.rs b/style/lib.rs index 8510b01591..80e51f9f54 100644 --- a/style/lib.rs +++ b/style/lib.rs @@ -17,6 +17,8 @@ //! //! [recalc_style_at]: traversal/fn.recalc_style_at.html //! +//! A list of supported style properties can be found as [docs::supported_properties] +//! //! Major dependencies are the [cssparser][cssparser] and [selectors][selectors] //! crates. //! @@ -37,6 +39,7 @@ extern crate gecko_profiler; pub mod gecko_string_cache; #[macro_use] extern crate log; +#[macro_use] extern crate serde; pub use servo_arc; #[cfg(feature = "servo")] @@ -116,6 +119,16 @@ pub mod use_counters; #[allow(non_camel_case_types)] pub mod values; +#[cfg(all(doc, feature = "servo"))] +/// Documentation +pub mod docs { + /// The CSS properties supported by the style system. + /// Generated from the `properties.mako.rs` template by `build.rs` + pub mod supported_properties { + #![doc = include_str!(concat!(env!("OUT_DIR"), "/css-properties.html"))] + } +} + #[cfg(feature = "gecko")] pub use crate::gecko_string_cache as string_cache; #[cfg(feature = "gecko")] diff --git a/style/parallel.rs b/style/parallel.rs index d05524363b..40946a8cbe 100644 --- a/style/parallel.rs +++ b/style/parallel.rs @@ -34,8 +34,21 @@ pub const STYLE_THREAD_STACK_SIZE_KB: usize = 256; /// The minimum stack size for a thread in the styling pool, in kilobytes. /// Servo requires a bigger stack in debug builds. +/// We allow configuring the size, since running with ASAN requires an even larger +/// stack size. #[cfg(feature = "servo")] -pub const STYLE_THREAD_STACK_SIZE_KB: usize = 512; +pub const STYLE_THREAD_STACK_SIZE_KB: usize = const { + let default_stack_size = 512; + if let Some(user_def_size) = option_env!("SERVO_STYLE_THREAD_STACK_SIZE_KB") { + if let Ok(user_def_size) = usize::from_str_radix(user_def_size, 10) { + user_def_size + } else { + panic!("SERVO_STYLE_THREAD_STACK_SIZE_KB must be a valid integer") + } + } else { + default_stack_size + } +}; /// The stack margin. If we get this deep in the stack, we will skip recursive /// optimizations to ensure that there is sufficient room for non-recursive work. diff --git a/style/properties/build.py b/style/properties/build.py index 3d0aed3b21..cfb6cb92a4 100644 --- a/style/properties/build.py +++ b/style/properties/build.py @@ -8,6 +8,8 @@ import sys BASE = os.path.dirname(__file__.replace("\\", "/")) +sys.path.insert(0, os.path.join(BASE, "vendored_python", "mako-1.3.10-py3-none-any.whl")) +sys.path.insert(0, os.path.join(BASE, "vendored_python")) # For importing markupsafe sys.path.insert(0, BASE) # For importing `data.py` from mako import exceptions @@ -75,6 +77,7 @@ def main(): write(doc_servo, "css-properties.html", as_html) write(doc_servo, "css-properties.json", as_json) write(OUT_DIR, "css-properties.json", as_json) + write(OUT_DIR, "css-properties.html", as_html) elif output == "geckolib": if len(sys.argv) < 4: abort(usage) diff --git a/style/properties/data.py b/style/properties/data.py index 0a8717fb6a..acb4275e2a 100644 --- a/style/properties/data.py +++ b/style/properties/data.py @@ -847,11 +847,8 @@ def active_style_structs(self): return [s for s in self.style_structs if s.longhands] def add_prefixed_aliases(self, property): - # FIXME Servo's DOM architecture doesn't support vendor-prefixed properties. - # See servo/servo#14941. - if self.engine == "gecko": - for prefix, pref in property.extra_prefixes: - property.aliases.append(("-%s-%s" % (prefix, property.name), pref)) + for prefix, pref in property.extra_prefixes: + property.aliases.append(("-%s-%s" % (prefix, property.name), pref)) def declare_longhand(self, name, engines=None, **kwargs): engines = engines.split() diff --git a/style/properties/longhands/font.mako.rs b/style/properties/longhands/font.mako.rs index 0f3b64bade..375079d2a4 100644 --- a/style/properties/longhands/font.mako.rs +++ b/style/properties/longhands/font.mako.rs @@ -268,7 +268,8 @@ ${helpers.predefined_type( ${helpers.single_keyword( "font-optical-sizing", "auto none", - engines="gecko", + engines="servo gecko", + servo_pref="layout.variable_fonts.enabled", gecko_pref="layout.css.font-variations.enabled", has_effect_on_gecko_scrollbars=False, gecko_ffi_name="mFont.opticalSizing", diff --git a/style/properties/longhands/inherited_text.mako.rs b/style/properties/longhands/inherited_text.mako.rs index a3f932d008..03b86a7baa 100644 --- a/style/properties/longhands/inherited_text.mako.rs +++ b/style/properties/longhands/inherited_text.mako.rs @@ -176,6 +176,7 @@ ${helpers.predefined_type( ignored_when_colors_disabled=True, simple_vector_bindings=True, spec="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property", + servo_restyle_damage="repaint", affects="overflow", )} diff --git a/style/properties/longhands/inherited_ui.mako.rs b/style/properties/longhands/inherited_ui.mako.rs index 3eafad5092..0eb044fde6 100644 --- a/style/properties/longhands/inherited_ui.mako.rs +++ b/style/properties/longhands/inherited_ui.mako.rs @@ -55,9 +55,10 @@ ${helpers.predefined_type( "caret-color", "color::CaretColor", "generics::color::CaretColor::auto()", - engines="gecko", + engines="gecko servo", spec="https://drafts.csswg.org/css-ui/#caret-color", ignored_when_colors_disabled=True, + servo_restyle_damage="repaint", affects="paint", )} diff --git a/style/properties/longhands/position.mako.rs b/style/properties/longhands/position.mako.rs index 86bc14c241..78058066ff 100644 --- a/style/properties/longhands/position.mako.rs +++ b/style/properties/longhands/position.mako.rs @@ -261,11 +261,12 @@ ${helpers.predefined_type( "position-area", "PositionArea", "computed::PositionArea::none()", - engines="gecko", + engines="gecko servo", initial_specified_value="specified::PositionArea::none()", animation_type="discrete", rule_types_allowed=DEFAULT_RULES_AND_POSITION_TRY, gecko_pref="layout.css.anchor-positioning.enabled", + servo_pref="layout.unimplemented", spec="https://drafts.csswg.org/css-anchor-position-1/#typedef-position-area", affects="layout", )} diff --git a/style/properties/longhands/text.mako.rs b/style/properties/longhands/text.mako.rs index a7bc5f1054..5aa9f70b83 100644 --- a/style/properties/longhands/text.mako.rs +++ b/style/properties/longhands/text.mako.rs @@ -36,7 +36,7 @@ ${helpers.predefined_type( initial_specified_value="specified::TextDecorationLine::none()", animation_type="discrete", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-line", - servo_restyle_damage="rebuild_box", + servo_restyle_damage="recalculate_overflow", affects="overflow", )} @@ -47,6 +47,7 @@ ${helpers.single_keyword( gecko_enum_prefix="StyleTextDecorationStyle", animation_type="discrete", spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-style", + servo_restyle_damage="recalculate_overflow", affects="overflow", )} @@ -70,6 +71,7 @@ ${helpers.predefined_type( initial_specified_value="specified::Color::currentcolor()", ignored_when_colors_disabled=True, spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color", + servo_restyle_damage="recalculate_overflow", affects="paint", )} diff --git a/style/properties/properties.mako.rs b/style/properties/properties.mako.rs index 33bdec9294..44312c0b31 100644 --- a/style/properties/properties.mako.rs +++ b/style/properties/properties.mako.rs @@ -1412,9 +1412,31 @@ pub mod style_structs { use rustc_hash::FxHasher; use super::longhands; use std::hash::{Hash, Hasher}; + use crate::logical_geometry::PhysicalSide; use crate::values::specified::color::ColorSchemeFlags; use crate::derives::*; + <%def name="impl_physical_sides(ident, props)"> + /// Gets the value of the longhand of `${ident}` on the `s` side`. + pub fn get_${ident}(&self, s: PhysicalSide) -> &longhands::${data.longhands_by_name[props[0]].ident}::computed_value::T { + match s { + PhysicalSide::Top => &self.${data.longhands_by_name[props[0]].ident}, + PhysicalSide::Right => &self.${data.longhands_by_name[props[1]].ident}, + PhysicalSide::Bottom => &self.${data.longhands_by_name[props[2]].ident}, + PhysicalSide::Left => &self.${data.longhands_by_name[props[3]].ident}, + } + } + /// Sets the value of the longhand of `${ident}` on the `s` side to `v`. + pub fn set_${ident}(&mut self, s: PhysicalSide, v: longhands::${data.longhands_by_name[props[0]].ident}::computed_value::T) { + match s { + PhysicalSide::Top => self.set_${data.longhands_by_name[props[0]].ident}(v), + PhysicalSide::Right => self.set_${data.longhands_by_name[props[1]].ident}(v), + PhysicalSide::Bottom => self.set_${data.longhands_by_name[props[2]].ident}(v), + PhysicalSide::Left => self.set_${data.longhands_by_name[props[3]].ident}(v), + } + } + + % for style_struct in data.active_style_structs(): % if style_struct.name == "Font": #[derive(Clone, Debug, MallocSizeOf)] @@ -1522,16 +1544,7 @@ pub mod style_structs { } % endif % endfor - % if style_struct.name == "Border": - % for side in ["top", "right", "bottom", "left"]: - /// Whether the border-${side} property has nonzero width. - #[allow(non_snake_case)] - pub fn border_${side}_has_nonzero_width(&self) -> bool { - use crate::Zero; - !self.border_${side}_width.is_zero() - } - % endfor - % elif style_struct.name == "Font": + % if style_struct.name == "Font": /// Computes a font hash in order to be able to cache fonts /// effectively in GFX and layout. pub fn compute_font_hash(&mut self) { @@ -1559,13 +1572,6 @@ pub mod style_structs { pub fn color_scheme_bits(&self) -> ColorSchemeFlags { self.color_scheme.bits } - % elif style_struct.name == "Outline": - /// Whether the outline-width property is non-zero. - #[inline] - pub fn outline_has_nonzero_width(&self) -> bool { - use crate::Zero; - !self.outline_width.is_zero() - } % elif style_struct.name == "Box": /// Sets the display property, but without touching original_display, /// except when the adjustment comes from root or item display fixups. @@ -1579,6 +1585,10 @@ pub mod style_structs { self.original_display = dpy; } } + % elif style_struct.name == "Margin": + ${impl_physical_sides("margin", ["margin-top", "margin-right", "margin-bottom", "margin-left"])} + % elif style_struct.name == "Position": + ${impl_physical_sides("inset", ["top", "right", "bottom", "left"])} % endif } @@ -2043,7 +2053,7 @@ impl ComputedValues { pub fn computed_value_to_string(&self, property: PropertyDeclarationId) -> String { match property { PropertyDeclarationId::Longhand(id) => { - let context = resolved::Context { + let mut context = resolved::Context { style: self, for_property: id.into(), current_longhand: Some(id), @@ -2051,7 +2061,7 @@ impl ComputedValues { let mut s = String::new(); self.computed_or_resolved_value( id, - Some(&context), + Some(&mut context), &mut s ).unwrap(); s @@ -2200,24 +2210,6 @@ impl ComputedValuesInner { )) } - /// Get the logical border width - #[inline] - pub fn border_width_for_writing_mode(&self, writing_mode: WritingMode) -> LogicalMargin { - let border_style = self.get_border(); - LogicalMargin::from_physical(writing_mode, SideOffsets2D::new( - Au::from(border_style.border_top_width), - Au::from(border_style.border_right_width), - Au::from(border_style.border_bottom_width), - Au::from(border_style.border_left_width), - )) - } - - /// Gets the logical computed border widths for this style. - #[inline] - pub fn logical_border_width(&self) -> LogicalMargin { - self.border_width_for_writing_mode(self.writing_mode) - } - /// Gets the logical computed margin from this style. #[inline] pub fn logical_margin(&self) -> LogicalMargin<&computed::Margin> { @@ -2998,11 +2990,22 @@ const_assert!(std::mem::size_of::( % for effect_name in ["repaint", "recalculate_overflow", "rebuild_stacking_context", "rebuild_box"]: pub(crate) fn restyle_damage_${effect_name} (old: &ComputedValues, new: &ComputedValues) -> bool { % for style_struct in data.active_style_structs(): - % for longhand in style_struct.longhands: + <% longhands_affected = [effect_name in longhand.servo_restyle_damage.split() for longhand in style_struct.longhands if not longhand.logical] %> + % if any(longhands_affected): + let old_${style_struct.name_lower} = old.get_${style_struct.name_lower}(); + let new_${style_struct.name_lower} = new.get_${style_struct.name_lower}(); + if !std::ptr::eq(old_${style_struct.name_lower}, new_${style_struct.name_lower}) { + if + % for longhand in style_struct.longhands: % if effect_name in longhand.servo_restyle_damage.split() and not longhand.logical: - old.get_${style_struct.name_lower}().${longhand.ident} != new.get_${style_struct.name_lower}().${longhand.ident} || + old_${style_struct.name_lower}.${longhand.ident} != new_${style_struct.name_lower}.${longhand.ident} || % endif - % endfor + % endfor + false { + return true; + } + } + % endif % endfor false } diff --git a/style/properties/shorthands/font.mako.rs b/style/properties/shorthands/font.mako.rs index e971d397c0..8c32e2351d 100644 --- a/style/properties/shorthands/font.mako.rs +++ b/style/properties/shorthands/font.mako.rs @@ -16,9 +16,10 @@ font-size line-height font-family + font-optical-sizing + font-variation-settings ${'font-size-adjust' if engine == 'gecko' else ''} ${'font-kerning' if engine == 'gecko' else ''} - ${'font-optical-sizing' if engine == 'gecko' else ''} ${'font-variant-alternates' if engine == 'gecko' else ''} ${'font-variant-east-asian' if engine == 'gecko' else ''} ${'font-variant-emoji' if engine == 'gecko' else ''} @@ -27,14 +28,13 @@ ${'font-variant-position' if engine == 'gecko' else ''} ${'font-language-override' if engine == 'gecko' else ''} ${'font-feature-settings' if engine == 'gecko' else ''} - ${'font-variation-settings' if engine == 'gecko' else ''} " derive_value_info="False" spec="https://drafts.csswg.org/css-fonts-3/#propdef-font" > use crate::computed_values::font_variant_caps::T::SmallCaps; use crate::parser::Parse; - use crate::properties::longhands::{font_family, font_style, font_weight, font_stretch}; + use crate::properties::longhands::{font_family, font_style, font_weight, font_stretch, font_optical_sizing, font_variation_settings}; #[cfg(feature = "gecko")] use crate::properties::longhands::font_size; use crate::properties::longhands::font_variant_caps; @@ -49,8 +49,7 @@ variant_alternates variant_east_asian \ variant_emoji variant_ligatures \ variant_numeric variant_position \ - feature_settings variation_settings \ - optical_sizing".split() + feature_settings".split() %> % if engine == "gecko": % for prop in gecko_sub_properties: @@ -151,6 +150,8 @@ font_size: size, line_height: line_height.unwrap_or(LineHeight::normal()), font_family: family, + font_optical_sizing: font_optical_sizing::get_initial_specified_value(), + font_variation_settings: font_variation_settings::get_initial_specified_value(), % if engine == "gecko": % for name in gecko_sub_properties: font_${name}: font_${name}::get_initial_specified_value(), @@ -195,7 +196,7 @@ } % for name in gecko_sub_properties: - % if name != "optical_sizing" and name != "variation_settings" and name != "variant_emoji": + % if name != "variation_settings" and name != "variant_emoji": if self.font_${name} != &font_${name}::get_initial_specified_value() { return Ok(()); } diff --git a/style/properties/vendored_python/mako-1.3.10-py3-none-any.whl b/style/properties/vendored_python/mako-1.3.10-py3-none-any.whl new file mode 100644 index 0000000000..2f85cd7b57 Binary files /dev/null and b/style/properties/vendored_python/mako-1.3.10-py3-none-any.whl differ diff --git a/style/properties/vendored_python/markupsafe/LICENSE.txt b/style/properties/vendored_python/markupsafe/LICENSE.txt new file mode 100644 index 0000000000..e270514adb --- /dev/null +++ b/style/properties/vendored_python/markupsafe/LICENSE.txt @@ -0,0 +1,28 @@ +Copyright 2010 Pallets + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/style/properties/vendored_python/markupsafe/__init__.py b/style/properties/vendored_python/markupsafe/__init__.py new file mode 100644 index 0000000000..8bf187d55e --- /dev/null +++ b/style/properties/vendored_python/markupsafe/__init__.py @@ -0,0 +1,384 @@ +# Vendored from https://github.com/pallets/markupsafe/blob/1251593f6b0e3b45f2cc8aba662622bc22d6a5e2/src/markupsafe/__init__.py +# with patched section from https://github.com/pallets/markupsafe/blob/1251593f6b0e3b45f2cc8aba662622bc22d6a5e2/src/markupsafe/_native.py +from __future__ import annotations + +import collections.abc as cabc +import string +import typing as t + +# BEGIN PATCHED SECTION +def _escape_inner(s: str, /) -> str: + return ( + s.replace("&", "&") + .replace(">", ">") + .replace("<", "<") + .replace("'", "'") + .replace('"', """) + ) +# BEGIN PATCHED SECTION + + +class _HasHTML(t.Protocol): + def __html__(self, /) -> str: ... + + +class _TPEscape(t.Protocol): + def __call__(self, s: t.Any, /) -> Markup: ... + + +def escape(s: t.Any, /) -> Markup: + """Replace the characters ``&``, ``<``, ``>``, ``'``, and ``"`` in + the string with HTML-safe sequences. Use this if you need to display + text that might contain such characters in HTML. + + If the object has an ``__html__`` method, it is called and the + return value is assumed to already be safe for HTML. + + :param s: An object to be converted to a string and escaped. + :return: A :class:`Markup` string with the escaped text. + """ + # If the object is already a plain string, skip __html__ check and string + # conversion. This is the most common use case. + # Use type(s) instead of s.__class__ because a proxy object may be reporting + # the __class__ of the proxied value. + if type(s) is str: + return Markup(_escape_inner(s)) + + if hasattr(s, "__html__"): + return Markup(s.__html__()) + + return Markup(_escape_inner(str(s))) + + +def escape_silent(s: t.Any | None, /) -> Markup: + """Like :func:`escape` but treats ``None`` as the empty string. + Useful with optional values, as otherwise you get the string + ``'None'`` when the value is ``None``. + + >>> escape(None) + Markup('None') + >>> escape_silent(None) + Markup('') + """ + if s is None: + return Markup() + + return escape(s) + + +def soft_str(s: t.Any, /) -> str: + """Convert an object to a string if it isn't already. This preserves + a :class:`Markup` string rather than converting it back to a basic + string, so it will still be marked as safe and won't be escaped + again. + + >>> value = escape("") + >>> value + Markup('<User 1>') + >>> escape(str(value)) + Markup('&lt;User 1&gt;') + >>> escape(soft_str(value)) + Markup('<User 1>') + """ + if not isinstance(s, str): + return str(s) + + return s + + +class Markup(str): + """A string that is ready to be safely inserted into an HTML or XML + document, either because it was escaped or because it was marked + safe. + + Passing an object to the constructor converts it to text and wraps + it to mark it safe without escaping. To escape the text, use the + :meth:`escape` class method instead. + + >>> Markup("Hello, World!") + Markup('Hello, World!') + >>> Markup(42) + Markup('42') + >>> Markup.escape("Hello, World!") + Markup('Hello <em>World</em>!') + + This implements the ``__html__()`` interface that some frameworks + use. Passing an object that implements ``__html__()`` will wrap the + output of that method, marking it safe. + + >>> class Foo: + ... def __html__(self): + ... return 'foo' + ... + >>> Markup(Foo()) + Markup('foo') + + This is a subclass of :class:`str`. It has the same methods, but + escapes their arguments and returns a ``Markup`` instance. + + >>> Markup("%s") % ("foo & bar",) + Markup('foo & bar') + >>> Markup("Hello ") + "" + Markup('Hello <foo>') + """ + + __slots__ = () + + def __new__( + cls, object: t.Any = "", encoding: str | None = None, errors: str = "strict" + ) -> te.Self: + if hasattr(object, "__html__"): + object = object.__html__() + + if encoding is None: + return super().__new__(cls, object) + + return super().__new__(cls, object, encoding, errors) + + def __html__(self, /) -> te.Self: + return self + + def __add__(self, value: str | _HasHTML, /) -> te.Self: + if isinstance(value, str) or hasattr(value, "__html__"): + return self.__class__(super().__add__(self.escape(value))) + + return NotImplemented + + def __radd__(self, value: str | _HasHTML, /) -> te.Self: + if isinstance(value, str) or hasattr(value, "__html__"): + return self.escape(value).__add__(self) + + return NotImplemented + + def __mul__(self, value: t.SupportsIndex, /) -> te.Self: + return self.__class__(super().__mul__(value)) + + def __rmul__(self, value: t.SupportsIndex, /) -> te.Self: + return self.__class__(super().__mul__(value)) + + def __mod__(self, value: t.Any, /) -> te.Self: + if isinstance(value, tuple): + # a tuple of arguments, each wrapped + value = tuple(_MarkupEscapeHelper(x, self.escape) for x in value) + elif hasattr(type(value), "__getitem__") and not isinstance(value, str): + # a mapping of arguments, wrapped + value = _MarkupEscapeHelper(value, self.escape) + else: + # a single argument, wrapped with the helper and a tuple + value = (_MarkupEscapeHelper(value, self.escape),) + + return self.__class__(super().__mod__(value)) + + def __repr__(self, /) -> str: + return f"{self.__class__.__name__}({super().__repr__()})" + + def join(self, iterable: cabc.Iterable[str | _HasHTML], /) -> te.Self: + return self.__class__(super().join(map(self.escape, iterable))) + + def split( # type: ignore[override] + self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1 + ) -> list[te.Self]: + return [self.__class__(v) for v in super().split(sep, maxsplit)] + + def rsplit( # type: ignore[override] + self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1 + ) -> list[te.Self]: + return [self.__class__(v) for v in super().rsplit(sep, maxsplit)] + + def splitlines( # type: ignore[override] + self, /, keepends: bool = False + ) -> list[te.Self]: + return [self.__class__(v) for v in super().splitlines(keepends)] + + def unescape(self, /) -> str: + """Convert escaped markup back into a text string. This replaces + HTML entities with the characters they represent. + + >>> Markup("Main » About").unescape() + 'Main » About' + """ + from html import unescape + + return unescape(str(self)) + + def striptags(self, /) -> str: + """:meth:`unescape` the markup, remove tags, and normalize + whitespace to single spaces. + + >>> Markup("Main »\tAbout").striptags() + 'Main » About' + """ + value = str(self) + + # Look for comments then tags separately. Otherwise, a comment that + # contains a tag would end early, leaving some of the comment behind. + + # keep finding comment start marks + while (start := value.find("", start)) == -1: + break + + value = f"{value[:start]}{value[end + 3 :]}" + + # remove tags using the same method + while (start := value.find("<")) != -1: + if (end := value.find(">", start)) == -1: + break + + value = f"{value[:start]}{value[end + 1 :]}" + + # collapse spaces + value = " ".join(value.split()) + return self.__class__(value).unescape() + + @classmethod + def escape(cls, s: t.Any, /) -> te.Self: + """Escape a string. Calls :func:`escape` and ensures that for + subclasses the correct type is returned. + """ + rv = escape(s) + + if rv.__class__ is not cls: + return cls(rv) + + return rv # type: ignore[return-value] + + def __getitem__(self, key: t.SupportsIndex | slice, /) -> te.Self: + return self.__class__(super().__getitem__(key)) + + def capitalize(self, /) -> te.Self: + return self.__class__(super().capitalize()) + + def title(self, /) -> te.Self: + return self.__class__(super().title()) + + def lower(self, /) -> te.Self: + return self.__class__(super().lower()) + + def upper(self, /) -> te.Self: + return self.__class__(super().upper()) + + def replace(self, old: str, new: str, count: t.SupportsIndex = -1, /) -> te.Self: + return self.__class__(super().replace(old, self.escape(new), count)) + + def ljust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self: + return self.__class__(super().ljust(width, self.escape(fillchar))) + + def rjust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self: + return self.__class__(super().rjust(width, self.escape(fillchar))) + + def lstrip(self, chars: str | None = None, /) -> te.Self: + return self.__class__(super().lstrip(chars)) + + def rstrip(self, chars: str | None = None, /) -> te.Self: + return self.__class__(super().rstrip(chars)) + + def center(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self: + return self.__class__(super().center(width, self.escape(fillchar))) + + def strip(self, chars: str | None = None, /) -> te.Self: + return self.__class__(super().strip(chars)) + + def translate( + self, + table: cabc.Mapping[int, str | int | None], # type: ignore[override] + /, + ) -> str: + return self.__class__(super().translate(table)) + + def expandtabs(self, /, tabsize: t.SupportsIndex = 8) -> te.Self: + return self.__class__(super().expandtabs(tabsize)) + + def swapcase(self, /) -> te.Self: + return self.__class__(super().swapcase()) + + def zfill(self, width: t.SupportsIndex, /) -> te.Self: + return self.__class__(super().zfill(width)) + + def casefold(self, /) -> te.Self: + return self.__class__(super().casefold()) + + def removeprefix(self, prefix: str, /) -> te.Self: + return self.__class__(super().removeprefix(prefix)) + + def removesuffix(self, suffix: str) -> te.Self: + return self.__class__(super().removesuffix(suffix)) + + def partition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]: + left, sep, right = super().partition(sep) + cls = self.__class__ + return cls(left), cls(sep), cls(right) + + def rpartition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]: + left, sep, right = super().rpartition(sep) + cls = self.__class__ + return cls(left), cls(sep), cls(right) + + def format(self, *args: t.Any, **kwargs: t.Any) -> te.Self: + formatter = EscapeFormatter(self.escape) + return self.__class__(formatter.vformat(self, args, kwargs)) + + def format_map( + self, + mapping: cabc.Mapping[str, t.Any], # type: ignore[override] + /, + ) -> te.Self: + formatter = EscapeFormatter(self.escape) + return self.__class__(formatter.vformat(self, (), mapping)) + + def __html_format__(self, format_spec: str, /) -> te.Self: + if format_spec: + raise ValueError("Unsupported format specification for Markup.") + + return self + + +class EscapeFormatter(string.Formatter): + __slots__ = ("escape",) + + def __init__(self, escape: _TPEscape) -> None: + self.escape: _TPEscape = escape + super().__init__() + + def format_field(self, value: t.Any, format_spec: str) -> str: + if hasattr(value, "__html_format__"): + rv = value.__html_format__(format_spec) + elif hasattr(value, "__html__"): + if format_spec: + raise ValueError( + f"Format specifier {format_spec} given, but {type(value)} does not" + " define __html_format__. A class that defines __html__ must define" + " __html_format__ to work with format specifiers." + ) + rv = value.__html__() + else: + # We need to make sure the format spec is str here as + # otherwise the wrong callback methods are invoked. + rv = super().format_field(value, str(format_spec)) + return str(self.escape(rv)) + + +class _MarkupEscapeHelper: + """Helper for :meth:`Markup.__mod__`.""" + + __slots__ = ("obj", "escape") + + def __init__(self, obj: t.Any, escape: _TPEscape) -> None: + self.obj: t.Any = obj + self.escape: _TPEscape = escape + + def __getitem__(self, key: t.Any, /) -> te.Self: + return self.__class__(self.obj[key], self.escape) + + def __str__(self, /) -> str: + return str(self.escape(self.obj)) + + def __repr__(self, /) -> str: + return str(self.escape(repr(self.obj))) + + def __int__(self, /) -> int: + return int(self.obj) + + def __float__(self, /) -> float: + return float(self.obj) diff --git a/style/servo/media_queries.rs b/style/servo/media_queries.rs index f777e4329d..da9fa7c6ff 100644 --- a/style/servo/media_queries.rs +++ b/style/servo/media_queries.rs @@ -21,7 +21,8 @@ use crate::values::computed::{ }; use crate::values::specified::color::{ColorSchemeFlags, ForcedColors}; use crate::values::specified::font::{ - QueryFontMetricsFlags, FONT_MEDIUM_LINE_HEIGHT_PX, FONT_MEDIUM_PX, + QueryFontMetricsFlags, FONT_MEDIUM_CAP_PX, FONT_MEDIUM_CH_PX, FONT_MEDIUM_EX_PX, + FONT_MEDIUM_IC_PX, FONT_MEDIUM_LINE_HEIGHT_PX, FONT_MEDIUM_PX, }; use crate::values::specified::ViewportVariant; use crate::values::KeyframesName; @@ -29,8 +30,10 @@ use app_units::{Au, AU_PER_PX}; use euclid::default::Size2D as UntypedSize2D; use euclid::{Scale, SideOffsets2D, Size2D}; use mime::Mime; +use parking_lot::RwLock; use servo_arc::Arc; use std::fmt::Debug; +use std::mem; use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use style_traits::{CSSPixel, DevicePixel}; @@ -53,6 +56,12 @@ pub trait FontMetricsProvider: Debug + Sync { /// is displayed in. /// /// This is the struct against which media queries are evaluated. +/// and contains all the viewport rule state. +/// +/// This structure also contains atomics used for computing root font-relative +/// units. These atomics use relaxed ordering, since when computing the style +/// of the root element, there can't be any other style being computed at the +/// same time (given we need the style of the parent to compute everything else). #[derive(Debug, MallocSizeOf)] pub struct Device { /// The current media type used by de device. @@ -65,19 +74,28 @@ pub struct Device { #[ignore_malloc_size_of = "Pure stack type"] quirks_mode: QuirksMode, - /// The font size of the root element - /// This is set when computing the style of the root - /// element, and used for rem units in other elements - /// - /// When computing the style of the root element, there can't be any - /// other style being computed at the same time, given we need the style of - /// the parent to compute everything else. So it is correct to just use - /// a relaxed atomic here. + /// Current computed style of the root element, used for calculations of + /// root font-relative units. + #[ignore_malloc_size_of = "Arc"] + root_style: RwLock>, + /// Font size of the root element, used for rem units in other elements. #[ignore_malloc_size_of = "Pure stack type"] root_font_size: AtomicU32, /// Line height of the root element, used for rlh units in other elements. #[ignore_malloc_size_of = "Pure stack type"] root_line_height: AtomicU32, + /// X-height of the root element, used for rex units in other elements. + #[ignore_malloc_size_of = "Pure stack type"] + root_font_metrics_ex: AtomicU32, + /// Cap-height of the root element, used for rcap units in other elements. + #[ignore_malloc_size_of = "Pure stack type"] + root_font_metrics_cap: AtomicU32, + /// Advance measure (ch) of the root element, used for rch units in other elements. + #[ignore_malloc_size_of = "Pure stack type"] + root_font_metrics_ch: AtomicU32, + /// Ideographic advance measure of the root element, used for ric units in other elements. + #[ignore_malloc_size_of = "Pure stack type"] + root_font_metrics_ic: AtomicU32, /// Whether any styles computed in the document relied on the root font-size /// by using rem units. #[ignore_malloc_size_of = "Pure stack type"] @@ -86,6 +104,11 @@ pub struct Device { /// by using rlh units. #[ignore_malloc_size_of = "Pure stack type"] used_root_line_height: AtomicBool, + /// Whether any styles computed in the document relied on the root font metrics + /// by using rcap, rch, rex, or ric units. This is a lock instead of an atomic + /// in order to prevent concurrent writes to the root font metric values. + #[ignore_malloc_size_of = "Pure stack type"] + used_root_font_metrics: RwLock, /// Whether any styles computed in the document relied on font metrics. used_font_metrics: AtomicBool, /// Whether any styles computed in the document relied on the viewport size. @@ -116,15 +139,24 @@ impl Device { default_computed_values: Arc, prefers_color_scheme: PrefersColorScheme, ) -> Device { + let default_values = + ComputedValues::initial_values_with_font_override(Font::initial_values()); + let root_style = RwLock::new(Arc::clone(&default_values)); Device { media_type, viewport_size, device_pixel_ratio, quirks_mode, + root_style, root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()), root_line_height: AtomicU32::new(FONT_MEDIUM_LINE_HEIGHT_PX.to_bits()), + root_font_metrics_ex: AtomicU32::new(FONT_MEDIUM_EX_PX.to_bits()), + root_font_metrics_cap: AtomicU32::new(FONT_MEDIUM_CAP_PX.to_bits()), + root_font_metrics_ch: AtomicU32::new(FONT_MEDIUM_CH_PX.to_bits()), + root_font_metrics_ic: AtomicU32::new(FONT_MEDIUM_IC_PX.to_bits()), used_root_font_size: AtomicBool::new(false), used_root_line_height: AtomicBool::new(false), + used_root_font_metrics: RwLock::new(false), used_font_metrics: AtomicBool::new(false), used_viewport_units: AtomicBool::new(false), prefers_color_scheme, @@ -145,6 +177,12 @@ impl Device { &self.default_computed_values } + /// Store a pointer to the root element's computed style, for use in + /// calculation of root font-relative metrics. + pub fn set_root_style(&self, style: &Arc) { + *self.root_style.write() = style.clone(); + } + /// Get the font size of the root element (for rem) pub fn root_font_size(&self) -> CSSPixelLength { self.used_root_font_size.store(true, Ordering::Relaxed); @@ -170,6 +208,66 @@ impl Device { .store(size.to_bits(), Ordering::Relaxed); } + /// Get the x-height of the root element (for rex) + pub fn root_font_metrics_ex(&self) -> Length { + self.ensure_root_font_metrics_updated(); + Length::new(f32::from_bits( + self.root_font_metrics_ex.load(Ordering::Relaxed), + )) + } + + /// Set the x-height of the root element (for rex), in zoom-independent CSS pixels. + pub fn set_root_font_metrics_ex(&self, size: f32) -> bool { + let size = size.to_bits(); + let previous = self.root_font_metrics_ex.swap(size, Ordering::Relaxed); + previous != size + } + + /// Get the cap-height of the root element (for rcap) + pub fn root_font_metrics_cap(&self) -> Length { + self.ensure_root_font_metrics_updated(); + Length::new(f32::from_bits( + self.root_font_metrics_cap.load(Ordering::Relaxed), + )) + } + + /// Set the cap-height of the root element (for rcap), in zoom-independent CSS pixels. + pub fn set_root_font_metrics_cap(&self, size: f32) -> bool { + let size = size.to_bits(); + let previous = self.root_font_metrics_cap.swap(size, Ordering::Relaxed); + previous != size + } + + /// Get the advance measure of the root element (for rch) + pub fn root_font_metrics_ch(&self) -> Length { + self.ensure_root_font_metrics_updated(); + Length::new(f32::from_bits( + self.root_font_metrics_ch.load(Ordering::Relaxed), + )) + } + + /// Set the advance measure of the root element (for rch), in zoom-independent CSS pixels. + pub fn set_root_font_metrics_ch(&self, size: f32) -> bool { + let size = size.to_bits(); + let previous = self.root_font_metrics_ch.swap(size, Ordering::Relaxed); + previous != size + } + + /// Get the ideographic advance measure of the root element (for ric) + pub fn root_font_metrics_ic(&self) -> Length { + self.ensure_root_font_metrics_updated(); + Length::new(f32::from_bits( + self.root_font_metrics_ic.load(Ordering::Relaxed), + )) + } + + /// Set the ideographic advance measure of the root element (for ric), in zoom-independent CSS pixels. + pub fn set_root_font_metrics_ic(&self, size: f32) -> bool { + let size = size.to_bits(); + let previous = self.root_font_metrics_ic.swap(size, Ordering::Relaxed); + previous != size + } + /// Returns the computed line-height for the font in a given computed values instance. /// /// If you pass down an element, then the used line-height is returned. @@ -221,11 +319,30 @@ impl Device { self.used_root_line_height.load(Ordering::Relaxed) } + /// Returns whether we ever looked up the root font metrics of the device. + pub fn used_root_font_metrics(&self) -> bool { + *self.used_root_font_metrics.read() + } + /// Returns whether font metrics have been queried. pub fn used_font_metrics(&self) -> bool { self.used_font_metrics.load(Ordering::Relaxed) } + /// Get the viewport size on this [`Device`]. + pub fn viewport_size(&self) -> Size2D { + self.viewport_size + } + + /// Set the viewport size on this [`Device`]. + /// + /// Note that this does not update any associated `Stylist`. For this you must call + /// `Stylist::media_features_change_changed_style` and + /// `Stylist::force_stylesheet_origins_dirty`. + pub fn set_viewport_size(&mut self, viewport_size: Size2D) { + self.viewport_size = viewport_size; + } + /// Returns the viewport size of the current device in app units, needed, /// among other things, to resolve viewport units. #[inline] @@ -267,6 +384,18 @@ impl Device { self.device_pixel_ratio } + /// Set a new device pixel ratio on this [`Device`]. + /// + /// Note that this does not update any associated `Stylist`. For this you must call + /// `Stylist::media_features_change_changed_style` and + /// `Stylist::force_stylesheet_origins_dirty`. + pub fn set_device_pixel_ratio( + &mut self, + device_pixel_ratio: Scale, + ) { + self.device_pixel_ratio = device_pixel_ratio; + } + /// Gets the size of the scrollbar in CSS pixels. pub fn scrollbar_inline_size(&self) -> CSSPixelLength { // TODO: implement this. @@ -280,12 +409,64 @@ impl Device { font: &Font, base_size: CSSPixelLength, flags: QueryFontMetricsFlags, + track_usage: bool, ) -> FontMetrics { - self.used_font_metrics.store(true, Ordering::Relaxed); + if track_usage { + self.used_font_metrics.store(true, Ordering::Relaxed); + } self.font_metrics_provider .query_font_metrics(vertical, font, base_size, flags) } + fn ensure_root_font_metrics_updated(&self) { + let mut guard = self.used_root_font_metrics.write(); + let previously_computed = mem::replace(&mut *guard, true); + if !previously_computed { + self.update_root_font_metrics(); + } + } + + /// Compute the root element's font metrics, and returns a bool indicating whether + /// the font metrics have changed since the previous restyle. + pub fn update_root_font_metrics(&self) -> bool { + let root_style = self.root_style.read(); + let root_effective_zoom = (*root_style).effective_zoom; + let root_font_size = (*root_style).get_font().clone_font_size().computed_size(); + + let root_font_metrics = self.query_font_metrics( + (*root_style).writing_mode.is_upright(), + &(*root_style).get_font(), + root_font_size, + QueryFontMetricsFlags::USE_USER_FONT_SET + | QueryFontMetricsFlags::NEEDS_CH + | QueryFontMetricsFlags::NEEDS_IC, + /* track_usage = */ false, + ); + + let mut root_font_metrics_changed = false; + root_font_metrics_changed |= self.set_root_font_metrics_ex( + root_effective_zoom.unzoom(root_font_metrics.x_height_or_default(root_font_size).px()), + ); + root_font_metrics_changed |= self.set_root_font_metrics_ch( + root_effective_zoom.unzoom( + root_font_metrics + .zero_advance_measure_or_default( + root_font_size, + (*root_style).writing_mode.is_upright(), + ) + .px(), + ), + ); + root_font_metrics_changed |= self.set_root_font_metrics_cap( + root_effective_zoom.unzoom(root_font_metrics.cap_height_or_default().px()), + ); + root_font_metrics_changed |= self.set_root_font_metrics_ic( + root_effective_zoom.unzoom(root_font_metrics.ic_width_or_default(root_font_size).px()), + ); + + root_font_metrics_changed + } + /// Return the media type of the current device. pub fn media_type(&self) -> MediaType { self.media_type.clone() @@ -306,6 +487,15 @@ impl Device { AbsoluteColor::BLACK } + /// Set the [`PrefersColorScheme`] value on this [`Device`]. + /// + /// Note that this does not update any associated `Stylist`. For this you must call + /// `Stylist::media_features_change_changed_style` and + /// `Stylist::force_stylesheet_origins_dirty`. + pub fn set_color_scheme(&mut self, new_color_scheme: PrefersColorScheme) { + self.prefers_color_scheme = new_color_scheme; + } + /// Returns the color scheme of this [`Device`]. pub fn color_scheme(&self) -> PrefersColorScheme { self.prefers_color_scheme diff --git a/style/servo/restyle_damage.rs b/style/servo/restyle_damage.rs index c24cfe777b..67790699ff 100644 --- a/style/servo/restyle_damage.rs +++ b/style/servo/restyle_damage.rs @@ -59,7 +59,12 @@ impl ServoRestyleDamage { old: &ComputedValues, new: &ComputedValues, ) -> StyleDifference { - let mut damage = compute_damage(old, new); + let mut damage = if std::ptr::eq(old, new) { + ServoRestyleDamage::empty() + } else { + compute_damage(old, new) + }; + if damage.is_empty() { return StyleDifference { damage, diff --git a/style/servo/selector_parser.rs b/style/servo/selector_parser.rs index 743f71a444..a0e0edddc4 100644 --- a/style/servo/selector_parser.rs +++ b/style/servo/selector_parser.rs @@ -69,6 +69,7 @@ pub enum PseudoElement { // Private, Servo-specific implemented pseudos. Only matchable in UA sheet. ServoTextControlInnerContainer, ServoTextControlInnerEditor, + ServoCheckmark, // Other Servo-specific pseudos. ServoAnonymousBox, @@ -98,6 +99,7 @@ impl ToCss for PseudoElement { Marker => "::marker", ColorSwatch => "::color-swatch", Placeholder => "::placeholder", + ServoCheckmark => "::-servo-checkmark", ServoTextControlInnerContainer => "::-servo-text-control-inner-container", ServoTextControlInnerEditor => "::-servo-text-control-inner-editor", ServoAnonymousBox => "::-servo-anonymous-box", @@ -248,6 +250,7 @@ impl PseudoElement { | PseudoElement::DetailsSummary | PseudoElement::Marker | PseudoElement::Placeholder + | PseudoElement::ServoCheckmark | PseudoElement::ServoTextControlInnerContainer | PseudoElement::ServoTextControlInnerEditor => PseudoElementCascadeType::Lazy, PseudoElement::DetailsContent @@ -632,6 +635,12 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> { "backdrop" => Backdrop, "selection" => Selection, "marker" => Marker, + "-servo-checkmark" => { + if !self.in_user_agent_stylesheet() { + return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))) + } + ServoCheckmark + }, "-servo-details-summary" => { if !self.in_user_agent_stylesheet() { return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone()))) diff --git a/style/stylesheets/stylesheet.rs b/style/stylesheets/stylesheet.rs index 93db4f2cc8..2aca6f428f 100644 --- a/style/stylesheets/stylesheet.rs +++ b/style/stylesheets/stylesheet.rs @@ -553,11 +553,11 @@ impl Clone for Stylesheet { // Make a deep clone of the media, using the new lock. let media = self.media.read_with(&guard).clone(); let media = Arc::new(lock.wrap(media)); - let contents = lock.wrap(Arc::new( + let contents = lock.wrap( self.contents .read_with(&guard) - .deep_clone_with_lock(&lock, &guard), - )); + .deep_clone(&lock, None, &guard), + ); Stylesheet { contents, diff --git a/style/stylist.rs b/style/stylist.rs index a72281bcb8..175f39c9d8 100644 --- a/style/stylist.rs +++ b/style/stylist.rs @@ -23,9 +23,11 @@ use crate::invalidation::media_queries::{ }; use crate::invalidation::stylesheets::RuleChangeKind; use crate::media_queries::Device; +#[cfg(feature = "gecko")] +use crate::properties::StyleBuilder; use crate::properties::{ self, AnimationDeclarations, CascadeMode, ComputedValues, FirstLineReparenting, - PropertyDeclarationBlock, StyleBuilder, + PropertyDeclarationBlock, }; use crate::properties_and_values::registry::{ PropertyRegistration, PropertyRegistrationData, ScriptRegistry as CustomPropertyScriptRegistry, @@ -59,6 +61,7 @@ use crate::stylesheets::{ PerOriginIter, StylesheetContents, StylesheetInDocument, }; use crate::stylesheets::{CustomMediaEvaluator, CustomMediaMap}; +#[cfg(feature = "gecko")] use crate::values::specified::position::PositionTryFallbacksItem; use crate::values::specified::position::PositionTryFallbacksTryTactic; use crate::values::{computed, AtomIdent}; @@ -1301,6 +1304,7 @@ impl Stylist { } /// Computes a fallback style lazily given the current and parent styles, and name. + #[cfg(feature = "gecko")] pub fn resolve_position_try( &self, style: &ComputedValues, diff --git a/style/values/computed/length.rs b/style/values/computed/length.rs index 4eb5369a3d..1d4f5a6c29 100644 --- a/style/values/computed/length.rs +++ b/style/values/computed/length.rs @@ -579,9 +579,10 @@ impl TryTacticAdjustment for MaxSize { | Self::MaxContent | Self::MinContent | Self::FitContent - | Self::MozAvailable | Self::WebkitFillAvailable | Self::Stretch => {}, + #[cfg(feature = "gecko")] + Self::MozAvailable => {}, } } } @@ -603,9 +604,10 @@ impl TryTacticAdjustment for Size { | Self::MaxContent | Self::MinContent | Self::FitContent - | Self::MozAvailable | Self::WebkitFillAvailable | Self::Stretch => {}, + #[cfg(feature = "gecko")] + Self::MozAvailable => {}, } } } diff --git a/style/values/computed/position.rs b/style/values/computed/position.rs index 167e9cf29a..042edfdb1c 100644 --- a/style/values/computed/position.rs +++ b/style/values/computed/position.rs @@ -7,6 +7,7 @@ //! //! [position]: https://drafts.csswg.org/css-backgrounds-3/#position +use crate::logical_geometry::PhysicalSide; use crate::values::computed::{ Context, Integer, LengthPercentage, NonNegativeNumber, Percentage, ToComputedValue, }; @@ -63,7 +64,6 @@ pub type AnchorFunction = GenericAnchorFunction; #[cfg(feature = "gecko")] use crate::{ gecko_bindings::structs::AnchorPosOffsetResolutionParams, - logical_geometry::PhysicalSide, values::{computed::Length, DashedIdent}, }; diff --git a/style/values/specified/text.rs b/style/values/specified/text.rs index a4e3959552..caebf27ef1 100644 --- a/style/values/specified/text.rs +++ b/style/values/specified/text.rs @@ -425,10 +425,15 @@ bitflags! { /// Capitalize each word. const CAPITALIZE = 1 << 2; /// Automatic italicization of math variables. + #[cfg(feature = "gecko")] const MATH_AUTO = 1 << 3; /// All the case transforms, which are exclusive with each other. + #[cfg(feature = "gecko")] const CASE_TRANSFORMS = Self::UPPERCASE.0 | Self::LOWERCASE.0 | Self::CAPITALIZE.0 | Self::MATH_AUTO.0; + /// All the case transforms, which are exclusive with each other. + #[cfg(feature = "servo")] + const CASE_TRANSFORMS = Self::UPPERCASE.0 | Self::LOWERCASE.0 | Self::CAPITALIZE.0; /// full-width const FULL_WIDTH = 1 << 4; @@ -463,6 +468,7 @@ impl TextTransform { Self::UPPERCASE => TextTransformCase::Uppercase, Self::LOWERCASE => TextTransformCase::Lowercase, Self::CAPITALIZE => TextTransformCase::Capitalize, + #[cfg(feature = "gecko")] Self::MATH_AUTO => TextTransformCase::MathAuto, _ => unreachable!("Case bits are exclusive with each other"), } diff --git a/style_derive/Cargo.toml b/style_derive/Cargo.toml index 8d8a85f62d..b1c84ad073 100644 --- a/style_derive/Cargo.toml +++ b/style_derive/Cargo.toml @@ -1,11 +1,12 @@ [package] -name = "style_derive" -version = "0.0.1" +name = "stylo_derive" +version.workspace = true authors = ["The Servo Project Developers"] license = "MPL-2.0" repository = "https://github.com/servo/stylo" edition = "2021" description = "Derive crate for Stylo CSS engine" +readme = "../README.md" [lib] path = "lib.rs" diff --git a/style_traits/Cargo.toml b/style_traits/Cargo.toml index 9ba394fe91..323d6f0b85 100644 --- a/style_traits/Cargo.toml +++ b/style_traits/Cargo.toml @@ -1,33 +1,34 @@ [package] -name = "style_traits" -version = "0.0.1" +name = "stylo_traits" +version.workspace = true authors = ["The Servo Project Developers"] license = "MPL-2.0" repository = "https://github.com/servo/stylo" edition = "2021" description = "Types used by the Stylo CSS engine" +readme = "../README.md" [lib] name = "style_traits" path = "lib.rs" [features] +default = ["servo"] servo = ["stylo_atoms", "cssparser/serde", "url", "euclid/serde"] -gecko = ["nsstring"] +gecko = [] [dependencies] app_units = "0.7" bitflags = "2" cssparser = "0.36" euclid = "0.22" -malloc_size_of = { path = "../malloc_size_of" } -malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" } -nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true} -selectors = { path = "../selectors" } +malloc_size_of = { workspace = true} +malloc_size_of_derive = "0.1" +selectors = { workspace = true} serde = "1.0" -servo_arc = { path = "../servo_arc" } -stylo_atoms = { path = "../atoms", optional = true } +servo_arc = { workspace = true} +stylo_atoms = { workspace = true, optional = true } thin-vec = "0.2" -to_shmem = { path = "../to_shmem" } -to_shmem_derive = { path = "../to_shmem_derive" } +to_shmem = { workspace = true} +to_shmem_derive = { workspace = true} url = { version = "2.5", optional = true } diff --git a/stylo_atoms/Cargo.toml b/stylo_atoms/Cargo.toml new file mode 100644 index 0000000000..e39f28f9b1 --- /dev/null +++ b/stylo_atoms/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "stylo_atoms" +version.workspace = true +authors = ["The Servo Project Developers"] +documentation = "https://docs.rs/stylo_atoms/" +description = "Interned string type for the Servo and Stylo projects" +repository = "https://github.com/servo/stylo" +license = "MPL-2.0" +edition = "2018" +build = "build.rs" +readme = "../README.md" + +[lib] +path = "lib.rs" + +[dependencies] +string_cache = "0.9" + +[build-dependencies] +string_cache_codegen = "0.6.1" diff --git a/stylo_atoms/build.rs b/stylo_atoms/build.rs new file mode 100644 index 0000000000..b5f6775724 --- /dev/null +++ b/stylo_atoms/build.rs @@ -0,0 +1,31 @@ +/* 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!("./predefined_counter_styles.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(); +} diff --git a/stylo_atoms/lib.rs b/stylo_atoms/lib.rs new file mode 100644 index 0000000000..03560a40c0 --- /dev/null +++ b/stylo_atoms/lib.rs @@ -0,0 +1,5 @@ +/* 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")); diff --git a/stylo_atoms/predefined_counter_styles.rs b/stylo_atoms/predefined_counter_styles.rs new file mode 100644 index 0000000000..f376981e32 --- /dev/null +++ b/stylo_atoms/predefined_counter_styles.rs @@ -0,0 +1,66 @@ +/* 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/. */ + + // THIS FILE IS DUPLICATED FROM style/counter_style/predefined.rs. + // TO UPDATE IT: + // - Run `python style/counter_style/updated_predefined.py` + // - Re-copy style/counter_style/predefined.rs to this location + +predefined! { + "decimal", + "decimal-leading-zero", + "arabic-indic", + "armenian", + "upper-armenian", + "lower-armenian", + "bengali", + "cambodian", + "khmer", + "cjk-decimal", + "devanagari", + "georgian", + "gujarati", + "gurmukhi", + "hebrew", + "kannada", + "lao", + "malayalam", + "mongolian", + "myanmar", + "oriya", + "persian", + "lower-roman", + "upper-roman", + "tamil", + "telugu", + "thai", + "tibetan", + "lower-alpha", + "lower-latin", + "upper-alpha", + "upper-latin", + "cjk-earthly-branch", + "cjk-heavenly-stem", + "lower-greek", + "hiragana", + "hiragana-iroha", + "katakana", + "katakana-iroha", + "disc", + "circle", + "square", + "disclosure-open", + "disclosure-closed", + "japanese-informal", + "japanese-formal", + "korean-hangul-formal", + "korean-hanja-informal", + "korean-hanja-formal", + "simp-chinese-informal", + "simp-chinese-formal", + "trad-chinese-informal", + "trad-chinese-formal", + "cjk-ideographic", + "ethiopic-numeric", +} diff --git a/stylo_atoms/static_atoms.txt b/stylo_atoms/static_atoms.txt new file mode 100644 index 0000000000..f9b3eecb11 --- /dev/null +++ b/stylo_atoms/static_atoms.txt @@ -0,0 +1,186 @@ +-moz-content-preferred-color-scheme +-moz-device-pixel-ratio +-moz-fixed-pos-containing-block +-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-button-spacing +-moz-gtk-csd-titlebar-radius +-moz-gtk-csd-tooltip-radius +-moz-gtk-menu-radius +-moz-mac-titlebar-height +-moz-overlay-scrollbar-fade-duration +DOMContentLoaded +abort +activate +addtrack +animationcancel +animationend +animationiteration +animationstart +aspect-ratio +beforetoggle +beforeunload +block-size +button +canplay +canplaythrough +center +change +characteristicvaluechanged +checkbox +cancel +click +close +closing +color +command +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 +hairline +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 +prefers-color-scheme +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 +show +signalingstatechange +slotchange +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 diff --git a/stylo_config/Cargo.toml b/stylo_config/Cargo.toml new file mode 100644 index 0000000000..0aeaf42d71 --- /dev/null +++ b/stylo_config/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "stylo_config" +version.workspace = true +authors = ["The Servo Project Developers"] +documentation = "https://docs.rs/stylo_config/" +description = "Runtime configuration for Stylo" +repository = "https://github.com/servo/stylo" +keywords = ["css", "style"] +license = "MPL-2.0" +edition = "2021" +readme = "../README.md" + +[lib] +name = "stylo_config" +path = "lib.rs" diff --git a/stylo_config/lib.rs b/stylo_config/lib.rs new file mode 100644 index 0000000000..ba504f625d --- /dev/null +++ b/stylo_config/lib.rs @@ -0,0 +1,91 @@ +/* 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 std::sync::{LazyLock, RwLock}; + +static PREFS: LazyLock = LazyLock::new(Preferences::default); + +#[derive(Debug, Default)] +pub struct Preferences { + bool_prefs: RwLock>, + i32_prefs: RwLock>, +} + +impl Preferences { + pub fn get_bool(&self, key: &str) -> bool { + let prefs = self.bool_prefs.read().expect("RwLock is poisoned"); + *prefs.get(key).unwrap_or(&false) + } + + pub fn get_i32(&self, key: &str) -> i32 { + let prefs = self.i32_prefs.read().expect("RwLock is poisoned"); + *prefs.get(key).unwrap_or(&0) + } + + pub fn set_bool(&self, key: &str, value: bool) { + let mut prefs = self.bool_prefs.write().expect("RwLock is poisoned"); + + // Avoid cloning the key if it exists. + if let Some(pref) = prefs.get_mut(key) { + *pref = value; + } else { + prefs.insert(key.to_owned(), value); + } + } + + pub fn set_i32(&self, key: &str, value: i32) { + let mut prefs = self.i32_prefs.write().expect("RwLock is poisoned"); + + // Avoid cloning the key if it exists. + if let Some(pref) = prefs.get_mut(key) { + *pref = value; + } else { + prefs.insert(key.to_owned(), value); + } + } +} + +pub fn get_bool(key: &str) -> bool { + PREFS.get_bool(key) +} + +pub fn get_i32(key: &str) -> i32 { + PREFS.get_i32(key) +} + +pub fn set_bool(key: &str, value: bool) { + PREFS.set_bool(key, value) +} + +pub fn set_i32(key: &str, value: i32) { + PREFS.set_i32(key, value) +} + +#[test] +fn test() { + let prefs = Preferences::default(); + + // Prefs have default values when unset. + assert_eq!(prefs.get_bool("foo"), false); + assert_eq!(prefs.get_i32("bar"), 0); + + // Prefs can be set and retrieved. + prefs.set_bool("foo", true); + prefs.set_i32("bar", 1); + assert_eq!(prefs.get_bool("foo"), true); + assert_eq!(prefs.get_i32("bar"), 1); + prefs.set_bool("foo", false); + prefs.set_i32("bar", 2); + assert_eq!(prefs.get_bool("foo"), false); + assert_eq!(prefs.get_i32("bar"), 2); + + // Each value type currently has an independent namespace. + prefs.set_i32("foo", 3); + prefs.set_bool("bar", true); + assert_eq!(prefs.get_i32("foo"), 3); + assert_eq!(prefs.get_bool("foo"), false); + assert_eq!(prefs.get_bool("bar"), true); + assert_eq!(prefs.get_i32("bar"), 2); +} diff --git a/stylo_dom/Cargo.toml b/stylo_dom/Cargo.toml new file mode 100644 index 0000000000..5d25f57c50 --- /dev/null +++ b/stylo_dom/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "stylo_dom" +version.workspace = true +authors = ["The Servo Project Developers"] +documentation = "https://docs.rs/stylo_dom/" +description = "DOM state types for Stylo" +repository = "https://github.com/servo/stylo" +keywords = ["css", "style"] +license = "MPL-2.0" +edition = "2021" +readme = "../README.md" + +[lib] +path = "lib.rs" + +[dependencies] +bitflags = "2" +malloc_size_of = { workspace = true } diff --git a/stylo_dom/lib.rs b/stylo_dom/lib.rs new file mode 100644 index 0000000000..98a0330cf4 --- /dev/null +++ b/stylo_dom/lib.rs @@ -0,0 +1,181 @@ +/* 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 bitflags::bitflags; +use malloc_size_of::malloc_size_of_is_0; + +pub const HEADING_LEVEL_OFFSET: usize = 52; + +// DOM types to be shared between Rust and C++. +bitflags! { + /// Event-based element states. + #[repr(C)] + #[derive(Clone, Copy, Debug, Eq, PartialEq)] + pub struct ElementState: u64 { + /// The mouse is down on this element. + /// + /// FIXME(#7333): set/unset this when appropriate + const ACTIVE = 1 << 0; + /// This element has focus. + /// + const FOCUS = 1 << 1; + /// The mouse is hovering over this element. + /// + const HOVER = 1 << 2; + /// Content is enabled (and can be disabled). + /// + const ENABLED = 1 << 3; + /// Content is disabled. + /// + const DISABLED = 1 << 4; + /// Content is checked. + /// + const CHECKED = 1 << 5; + /// + const INDETERMINATE = 1 << 6; + /// + const PLACEHOLDER_SHOWN = 1 << 7; + /// + const URLTARGET = 1 << 8; + /// + const FULLSCREEN = 1 << 9; + /// + const VALID = 1 << 10; + /// + const INVALID = 1 << 11; + /// + const USER_VALID = 1 << 12; + /// + const USER_INVALID = 1 << 13; + /// All the validity bits at once. + const VALIDITY_STATES = Self::VALID.bits() | Self::INVALID.bits() | Self::USER_VALID.bits() | Self::USER_INVALID.bits(); + /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-broken + const BROKEN = 1 << 14; + /// + const REQUIRED = 1 << 15; + /// + /// We use an underscore to workaround a silly windows.h define. + const OPTIONAL_ = 1 << 16; + /// + const DEFINED = 1 << 17; + /// + const VISITED = 1 << 18; + /// + const UNVISITED = 1 << 19; + /// + const VISITED_OR_UNVISITED = Self::VISITED.bits() | Self::UNVISITED.bits(); + /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-drag-over + const DRAGOVER = 1 << 20; + /// + const INRANGE = 1 << 21; + /// + const OUTOFRANGE = 1 << 22; + /// + const READONLY = 1 << 23; + /// + const READWRITE = 1 << 24; + /// + const DEFAULT = 1 << 25; + /// Non-standard & undocumented. + const OPTIMUM = 1 << 26; + /// Non-standard & undocumented. + const SUB_OPTIMUM = 1 << 27; + /// Non-standard & undocumented. + const SUB_SUB_OPTIMUM = 1 << 28; + /// All the above bits in one place. + const METER_OPTIMUM_STATES = Self::OPTIMUM.bits() | Self::SUB_OPTIMUM.bits() | Self::SUB_SUB_OPTIMUM.bits(); + /// Non-standard & undocumented. + const INCREMENT_SCRIPT_LEVEL = 1 << 29; + /// + const FOCUSRING = 1 << 30; + /// + const FOCUS_WITHIN = 1u64 << 31; + /// :dir matching; the states are used for dynamic change detection. + /// State that elements that match :dir(ltr) are in. + const LTR = 1u64 << 32; + /// State that elements that match :dir(rtl) are in. + const RTL = 1u64 << 33; + /// State that HTML elements that have a "dir" attr are in. + const HAS_DIR_ATTR = 1u64 << 34; + /// State that HTML elements with dir="ltr" (or something + /// case-insensitively equal to "ltr") are in. + const HAS_DIR_ATTR_LTR = 1u64 << 35; + /// State that HTML elements with dir="rtl" (or something + /// case-insensitively equal to "rtl") are in. + const HAS_DIR_ATTR_RTL = 1u64 << 36; + /// State that HTML elements without a valid-valued "dir" attr or + /// any HTML elements (including ) with dir="auto" (or something + /// case-insensitively equal to "auto") are in. + const HAS_DIR_ATTR_LIKE_AUTO = 1u64 << 37; + /// Non-standard & undocumented. + const AUTOFILL = 1u64 << 38; + /// Non-standard & undocumented. + const AUTOFILL_PREVIEW = 1u64 << 39; + /// State for modal elements: + /// + const MODAL = 1u64 << 40; + /// + const INERT = 1u64 << 41; + /// State for the topmost modal element in top layer + const TOPMOST_MODAL = 1u64 << 42; + /// Initially used for the devtools highlighter, but now somehow only + /// used for the devtools accessibility inspector. + const DEVTOOLS_HIGHLIGHTED = 1u64 << 43; + /// Used for the devtools style editor. Probably should go away. + const STYLEEDITOR_TRANSITIONING = 1u64 << 44; + /// For :-moz-value-empty (to show widgets like the reveal password + /// button or the clear button). + const VALUE_EMPTY = 1u64 << 45; + /// For :-moz-revealed. + const REVEALED = 1u64 << 46; + /// https://html.spec.whatwg.org/#selector-popover-open + /// Match element's popover visibility state of showing + const POPOVER_OPEN = 1u64 << 47; + /// https://drafts.csswg.org/css-scoping-1/#the-has-slotted-pseudo + /// Match whether a slot element has assigned nodes + const HAS_SLOTTED = 1u64 << 48; + /// https://drafts.csswg.org/selectors-4/#open-state + /// Match whether an openable element is currently open + const OPEN = 1u64 << 49; + /// For :active-view-transition. + /// + const ACTIVE_VIEW_TRANSITION = 1u64 << 50; + /// For :-moz-suppress-for-print-selection. + const SUPPRESS_FOR_PRINT_SELECTION = 1u64 << 51; + /// https://drafts.csswg.org/selectors-5/#headings + /// These 4 bits are used to pack the elements heading level into the element state + /// Heading levels can be from 1-9 so 4 bits allows us to express the full range. + const HEADING_LEVEL_BITS = 0b1111u64 << HEADING_LEVEL_OFFSET; + + /// Some convenience unions. + const DIR_STATES = Self::LTR.bits() | Self::RTL.bits(); + + const DIR_ATTR_STATES = Self::HAS_DIR_ATTR.bits() | + Self::HAS_DIR_ATTR_LTR.bits() | + Self::HAS_DIR_ATTR_RTL.bits() | + Self::HAS_DIR_ATTR_LIKE_AUTO.bits(); + + const DISABLED_STATES = Self::DISABLED.bits() | Self::ENABLED.bits(); + + const REQUIRED_STATES = Self::REQUIRED.bits() | Self::OPTIONAL_.bits(); + } +} + +bitflags! { + /// Event-based document states. + #[repr(C)] + #[derive(Clone, Copy, Debug, Eq, PartialEq)] + pub struct DocumentState: u64 { + /// Window activation status + const WINDOW_INACTIVE = 1 << 0; + /// RTL locale: specific to the XUL localedir attribute + const RTL_LOCALE = 1 << 1; + /// LTR locale: specific to the XUL localedir attribute + const LTR_LOCALE = 1 << 2; + + const ALL_LOCALEDIR_BITS = Self::LTR_LOCALE.bits() | Self::RTL_LOCALE.bits(); + } +} + +malloc_size_of_is_0!(ElementState, DocumentState); diff --git a/stylo_static_prefs/Cargo.toml b/stylo_static_prefs/Cargo.toml new file mode 100644 index 0000000000..28c0a54c40 --- /dev/null +++ b/stylo_static_prefs/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "stylo_static_prefs" +version.workspace = true +authors = ["The Servo Project Developers"] +documentation = "https://docs.rs/stylo_static_prefs/" +description = "Static configuration for Stylo" +repository = "https://github.com/servo/stylo" +keywords = ["css", "style"] +license = "MPL-2.0" +edition = "2021" +readme = "../README.md" diff --git a/stylo_static_prefs/src/lib.rs b/stylo_static_prefs/src/lib.rs new file mode 100644 index 0000000000..db19953400 --- /dev/null +++ b/stylo_static_prefs/src/lib.rs @@ -0,0 +1,54 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +//! A list of static preferences exposed to the style crate. These should +//! be kept sync with the preferences used by the style. +#[macro_export] +macro_rules! pref { + ("layout.css.stylo-local-work-queue.in-main-thread") => { + 32 + }; + ("layout.css.stylo-work-unit-size") => { + 16 + }; + ("layout.css.stylo-local-work-queue.in-worker") => { + 0 + }; + ("layout.css.system-ui.enabled") => { + true + }; + ("layout.css.fit-content-function.enabled") => { + true + }; + ("layout.css.outline-offset.snapping") => { + 1 + }; + ("layout.css.relative-color-syntax.enabled") => { + true + }; + ("layout.css.stretch-size-keyword.enabled") => { + true + }; + ("layout.css.marker.restricted") => { + true + }; + ("layout.css.webkit-fill-available.enabled") => { + true + }; + ("layout.css.webkit-fill-available.all-size-properties.enabled") => { + true + }; + ("layout.css.font-variations.enabled") => { + true + }; + ("layout.css.gradient-color-interpolation-method.enabled") => { + true + }; + ("layout.css.contrast-color.enabled") => { + true + }; + ($string:literal) => { + false + }; +} diff --git a/sync.sh b/sync.sh new file mode 100755 index 0000000000..68c8689c9c --- /dev/null +++ b/sync.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Usage: sync.sh +set -eu + +root=$(pwd) +mkdir -p "$1" +cd -- "$1" +filtered=$(pwd) +mkdir -p "$root/_cache" +cd "$root/_cache" +export PATH="$PWD:$PATH" + +step() { + if [ "${TERM-}" != '' ]; then + tput setaf 12 + fi + >&2 printf '* %s\n' "$*" + if [ "${TERM-}" != '' ]; then + tput sgr0 + fi +} + +step Downloading git-filter-repo if needed +if ! git filter-repo --version 2> /dev/null; then + curl -O https://raw.githubusercontent.com/newren/git-filter-repo/v2.38.0/git-filter-repo + chmod +x git-filter-repo + + git filter-repo --version +fi + +step Cloning upstream if needed +if ! [ -e upstream ]; then + git clone --bare --single-branch --branch main --progress https://github.com/mozilla-firefox/firefox.git upstream +fi + +step Updating upstream +branch=$(git -C upstream rev-parse --abbrev-ref HEAD) +git -C upstream fetch origin $branch:$branch + +step Filtering upstream +# Cloning and filtering is much faster than git filter-repo --source --target. +git clone --bare upstream -- "$filtered" +git -C "$filtered" filter-repo --force --paths-from-file "$root/style.paths" diff --git a/to_shmem/Cargo.toml b/to_shmem/Cargo.toml index 60bcd524f6..81f7fed5d5 100644 --- a/to_shmem/Cargo.toml +++ b/to_shmem/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "to_shmem" -version = "0.1.0" +version = "0.3.0" authors = ["The Servo Project Developers"] license = "MPL-2.0" repository = "https://github.com/servo/stylo" @@ -24,8 +24,8 @@ thin-vec = ["dep:thin-vec"] [dependencies] cssparser = { version = "0.36", optional = true } -servo_arc = { version = "0.4.0", path = "../servo_arc", optional = true } +servo_arc = { workspace = true, optional = true } smallbitvec = { version = "2.3.0", optional = true } smallvec = { version = "1.13", optional = true } -string_cache = { version = "0.8", optional = true } +string_cache = { version = "0.9", optional = true } thin-vec = { version = "0.2.1", optional = true }