Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use new stylo crate renames (#35898)

Browse source 
Signed-off-by: Nico Burns <nico@nicoburns.com>
This commit is contained in:
Nico Burns 2025-03-12 13:02:12 +13:00 • committed by GitHub
parent e4757534fe
commit f527217bdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
105 changed files with 178 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

110
Cargo.lock generated
View file

@ -1734,15 +1734,6 @@ dependencies = [
"litrs",
]
[[package]]
name = "dom"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
dependencies = [
"bitflags 2.9.0",
"malloc_size_of",
]
[[package]]
name = "dom_struct"
version = "0.0.1"
@ -2197,12 +2188,12 @@ dependencies = [
"serde",
"servo_allocator",
"servo_arc",
"servo_atoms",
"servo_config",
"servo_malloc_size_of",
"servo_url",
"smallvec",
"style",
"stylo_atoms",
"tracing",
"truetype",
"unicode-properties",
@ -4182,7 +4173,6 @@ dependencies = [
"serde",
"serde_json",
"servo_arc",
"servo_atoms",
"servo_config",
"servo_geometry",
"servo_malloc_size_of",
@ -4190,6 +4180,7 @@ dependencies = [
"smallvec",
"style",
"style_traits",
"stylo_atoms",
"tracing",
"unicode-bidi",
"unicode-script",
@ -4269,12 +4260,12 @@ dependencies = [
"script_traits",
"servo_allocator",
"servo_arc",
"servo_atoms",
"servo_config",
"servo_malloc_size_of",
"servo_url",
"style",
"style_traits",
"stylo_atoms",
"time",
"tracing",
"url",
@ -4306,12 +4297,12 @@ dependencies = [
"script_traits",
"servo_allocator",
"servo_arc",
"servo_atoms",
"servo_config",
"servo_malloc_size_of",
"servo_url",
"style",
"style_traits",
"stylo_atoms",
"tracing",
"url",
"webrender_api",
@ -4566,7 +4557,7 @@ dependencies = [
[[package]]
name = "malloc_size_of"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"app_units",
"cssparser",
@ -6386,7 +6377,6 @@ dependencies = [
"data-url",
"deny_public_fields",
"devtools_traits",
"dom",
"dom_struct",
"domobject_derive",
"embedder_traits",
@ -6438,7 +6428,6 @@ dependencies = [
"servo-media",
"servo_allocator",
"servo_arc",
"servo_atoms",
"servo_config",
"servo_geometry",
"servo_malloc_size_of",
@ -6447,6 +6436,8 @@ dependencies = [
"smallvec",
"style",
"style_traits",
"stylo_atoms",
"stylo_dom",
"swapper",
"tempfile",
"tendril",
@ -6483,10 +6474,10 @@ dependencies = [
"phf_shared",
"regex",
"serde_json",
"servo_atoms",
"servo_config",
"servo_malloc_size_of",
"style",
"stylo_atoms",
]
[[package]]
@ -6558,10 +6549,10 @@ dependencies = [
"pixels",
"profile_traits",
"serde",
"servo_atoms",
"servo_malloc_size_of",
"servo_url",
"style_traits",
"stylo_atoms",
"uuid",
"webdriver",
"webgpu",
@ -6586,7 +6577,7 @@ dependencies = [
[[package]]
name = "selectors"
version = "0.26.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"bitflags 2.9.0",
"cssparser",
@ -6871,21 +6862,12 @@ dependencies = [
[[package]]
name = "servo_arc"
version = "0.4.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"serde",
"stable_deref_trait",
]
[[package]]
name = "servo_atoms"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
dependencies = [
"string_cache",
"string_cache_codegen",
]
[[package]]
name = "servo_config"
version = "0.0.1"
@ -6894,7 +6876,7 @@ dependencies = [
"serde_json",
"servo_config_macro",
"servo_url",
"style_config",
"stylo_config",
]
[[package]]
@ -6926,7 +6908,6 @@ dependencies = [
"app_units",
"content-security-policy",
"crossbeam-channel",
"dom",
"euclid",
"http 1.3.0",
"indexmap",
@ -6939,6 +6920,7 @@ dependencies = [
"smallvec",
"string_cache",
"style",
"stylo_dom",
"thin-vec",
"tokio",
"url",
@ -7234,11 +7216,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "static_prefs"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
[[package]]
name = "strck"
version = "0.1.2"
@ -7317,7 +7294,7 @@ dependencies = [
[[package]]
name = "style"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"app_units",
"arrayvec",
@ -7326,7 +7303,6 @@ dependencies = [
"byteorder",
"cssparser",
"derive_more",
"dom",
"encoding_rs",
"euclid",
"fxhash",
@ -7353,15 +7329,16 @@ dependencies = [
"selectors",
"serde",
"servo_arc",
"servo_atoms",
"smallbitvec",
"smallvec",
"static_assertions",
"static_prefs",
"string_cache",
"style_config",
"style_derive",
"style_traits",
"stylo_atoms",
"stylo_config",
"stylo_dom",
"stylo_static_prefs",
"thin-vec",
"to_shmem",
"to_shmem_derive",
@ -7372,18 +7349,10 @@ dependencies = [
"walkdir",
]
[[package]]
name = "style_config"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
dependencies = [
"lazy_static",
]
[[package]]
name = "style_derive"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"darling",
"proc-macro2",
@ -7404,16 +7373,16 @@ dependencies = [
"selectors",
"serde_json",
"servo_arc",
"servo_atoms",
"style",
"style_traits",
"stylo_atoms",
"url",
]
[[package]]
name = "style_traits"
version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"app_units",
"bitflags 2.9.0",
@ -7425,13 +7394,44 @@ dependencies = [
"selectors",
"serde",
"servo_arc",
"servo_atoms",
"stylo_atoms",
"thin-vec",
"to_shmem",
"to_shmem_derive",
"url",
]
[[package]]
name = "stylo_atoms"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"string_cache",
"string_cache_codegen",
]
[[package]]
name = "stylo_config"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"lazy_static",
]
[[package]]
name = "stylo_dom"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"bitflags 2.9.0",
"malloc_size_of",
]
[[package]]
name = "stylo_static_prefs"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
[[package]]
name = "subtle"
version = "2.6.1"
@ -7797,7 +7797,7 @@ dependencies = [
[[package]]
name = "to_shmem"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"cssparser",
"servo_arc",
@ -7810,7 +7810,7 @@ dependencies = [
[[package]]
name = "to_shmem_derive"
version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#4add86f53a05ee27c13db998465e83e1ed733871"
source = "git+https://github.com/servo/stylo?branch=2025-03-01#940d249bcda147836d8b304c8e569a38107b4b4d"
dependencies = [
"darling",
"proc-macro2",

13
Cargo.toml
View file

@ -125,15 +125,15 @@ servo-media = { git = "https://github.com/servo/media" }
servo-media-dummy = { git = "https://github.com/servo/media" }
servo-media-gstreamer = { git = "https://github.com/servo/media" }
servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] }
servo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-01" }
stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-03-01" }
smallbitvec = "2.6.0"
smallvec = "1.14"
static_assertions = "1.1"
string_cache = "0.8"
string_cache_codegen = "0.5"
style = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] }
style_config = { git = "https://github.com/servo/stylo", branch = "2025-03-01" }
style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2025-03-01" }
stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-03-01" }
stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-03-01" }
style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] }
style_traits = { git = "https://github.com/servo/stylo", branch = "2025-03-01", features = ["servo"] }
surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] }
@ -214,15 +214,14 @@ codegen-units = 1
# [patch."https://github.com/servo/stylo"]
# selectors = { path = "../stylo/selectors" }
# servo_arc = { path = "../stylo/servo_arc" }
# servo_atoms = { path = "../stylo/atoms" }
# stylo_atoms = { path = "../stylo/atoms" }
# static_prefs = { path = "../stylo/style_static_prefs" }
# style = { path = "../stylo/style" }
# style_config = { path = "../stylo/style_config" }
# stylo_config = { path = "../stylo/stylo_config" }
# style_derive = { path = "../stylo/style_derive" }
# style_dom = { path = "../stylo/dom", package = "dom" }
# stylo_dom = { path = "../stylo/dom", package = "dom" }
# style_malloc_size_of = { path = "../stylo/malloc_size_of", package = "malloc_size_of" }
# style_traits = { path = "../stylo/style_traits" }
# to_shmem = { path = "../stylo/to_shmem" }
#
# Or for WebRender:
#

2
components/config/Cargo.toml
View file

@ -16,4 +16,4 @@ serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
servo_config_macro = { path = "macro" }
servo_url = { path = "../url" }
style_config = { workspace = true }
stylo_config = { workspace = true }

18
components/config/prefs.rs
View file

@ -21,21 +21,21 @@ pub fn set(preferences: Preferences) {
// Map between Stylo preference names and Servo preference names as the This should be
// kept in sync with components/script/dom/bindings/codegen/run.py which generates the
// DOM CSS style accessors.
style_config::set_bool("layout.unimplemented", preferences.layout_unimplemented);
style_config::set_i32("layout.threads", preferences.layout_threads as i32);
style_config::set_bool("layout.legacy_layout", preferences.layout_legacy_layout);
style_config::set_bool("layout.flexbox.enabled", preferences.layout_flexbox_enabled);
style_config::set_bool("layout.columns.enabled", preferences.layout_columns_enabled);
style_config::set_bool("layout.grid.enabled", preferences.layout_grid_enabled);
style_config::set_bool(
stylo_config::set_bool("layout.unimplemented", preferences.layout_unimplemented);
stylo_config::set_i32("layout.threads", preferences.layout_threads as i32);
stylo_config::set_bool("layout.legacy_layout", preferences.layout_legacy_layout);
stylo_config::set_bool("layout.flexbox.enabled", preferences.layout_flexbox_enabled);
stylo_config::set_bool("layout.columns.enabled", preferences.layout_columns_enabled);
stylo_config::set_bool("layout.grid.enabled", preferences.layout_grid_enabled);
stylo_config::set_bool(
"layout.css.transition-behavior.enabled",
preferences.layout_css_transition_behavior_enabled,
);
style_config::set_bool(
stylo_config::set_bool(
"layout.writing-mode.enabled",
preferences.layout_writing_mode_enabled,
);
style_config::set_bool(
stylo_config::set_bool(
"layout.container-queries.enabled",
preferences.layout_container_queries_enabled,
);

2
components/fonts/Cargo.toml
View file

@ -40,7 +40,7 @@ parking_lot = { workspace = true }
range = { path = "../range" }
serde = { workspace = true }
servo_arc = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_url = { path = "../url" }
smallvec = { workspace = true, features = ["union"] }

2
components/fonts/tests/font_context.rs
View file

@ -25,7 +25,6 @@ mod font_context {
use net_traits::ResourceThreads;
use parking_lot::Mutex;
use servo_arc::Arc as ServoArc;
use servo_atoms::Atom;
use style::ArcSlice;
use style::properties::longhands::font_variant_caps::computed_value::T as FontVariantCaps;
use style::properties::style_structs::Font as FontStyleStruct;
@ -35,6 +34,7 @@ mod font_context {
};
use style::values::computed::{FontLanguageOverride, XLang};
use style::values::generics::font::LineHeight;
use stylo_atoms::Atom;
use webrender_api::{FontInstanceKey, FontKey, IdNamespace};
use webrender_traits::CrossProcessCompositorApi;

2
components/layout/Cargo.toml
View file

@ -42,7 +42,7 @@ script_traits = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
servo_arc = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" }
servo_url = { path = "../url" }

2
components/layout/context.rs
View file

@ -18,9 +18,9 @@ use net_traits::image_cache::{
use parking_lot::RwLock;
use script_layout_interface::{PendingImage, PendingImageState};
use script_traits::Painter;
use servo_atoms::Atom;
use servo_url::{ImmutableOrigin, ServoUrl};
use style::context::{RegisteredSpeculativePainter, SharedStyleContext};
use stylo_atoms::Atom;
use crate::display_list::items::{OpaqueNode, WebRenderImageInfo};

2
components/layout_thread/Cargo.toml
View file

@ -37,7 +37,7 @@ script_layout_interface = { workspace = true }
script_traits = { workspace = true }
servo_allocator = { path = "../allocator" }
servo_arc = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_url = { path = "../url" }
style = { workspace = true }

2
components/layout_thread/lib.rs
View file

@ -67,7 +67,6 @@ use script_traits::{
UntrustedNodeAddress, WindowSizeData,
};
use servo_arc::Arc as ServoArc;
use servo_atoms::Atom;
use servo_config::opts::{self, DebugOptions};
use servo_config::pref;
use servo_url::ServoUrl;
@ -100,6 +99,7 @@ use style::values::computed::font::GenericFontFamily;
use style::values::computed::{FontSize, Length, NonNegativeLength};
use style::values::specified::font::KeywordInfo;
use style_traits::{CSSPixel, SpeculativePainter};
use stylo_atoms::Atom;
use time::Duration;
use url::Url;
use webrender_api::units::DevicePixel;

2
components/layout_thread_2020/Cargo.toml
View file

@ -36,7 +36,7 @@ script_layout_interface = { workspace = true }
script_traits = { workspace = true }
servo_allocator = { path = "../allocator" }
servo_arc = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_url = { path = "../url" }
style = { workspace = true }

2
components/layout_thread_2020/lib.rs
View file

@ -55,7 +55,6 @@ use script_traits::{
UntrustedNodeAddress, WindowSizeData,
};
use servo_arc::Arc as ServoArc;
use servo_atoms::Atom;
use servo_config::opts::{self, DebugOptions};
use servo_config::pref;
use servo_url::ServoUrl;
@ -87,6 +86,7 @@ use style::values::computed::{CSSPixelLength, FontSize, Length, NonNegativeLengt
use style::values::specified::font::KeywordInfo;
use style::{Zero, driver};
use style_traits::{CSSPixel, SpeculativePainter};
use stylo_atoms::Atom;
use url::Url;
use webrender_api::units::{DevicePixel, LayoutPixel};
use webrender_api::{ExternalScrollId, HitTestFlags, units};

2
components/malloc_size_of/Cargo.toml
View file

@ -26,7 +26,7 @@ servo_arc = { workspace = true }
smallvec = { workspace = true }
string_cache = { workspace = true }
style = { workspace = true }
style_dom = { workspace = true }
stylo_dom = { workspace = true }
style_malloc_size_of = { workspace = true }
thin-vec = { workspace = true }
tokio = { workspace = true, features = ["sync"] }

2
components/malloc_size_of/lib.rs
View file

@ -803,4 +803,4 @@ malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStretch);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontStyle);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::FontWeight);
malloc_size_of_is_style_malloc_size_of!(style::values::computed::font::SingleFontFamily);
malloc_size_of_is_style_malloc_size_of!(style_dom::ElementState);
malloc_size_of_is_style_malloc_size_of!(stylo_dom::ElementState);

4
components/script/Cargo.toml
View file

@ -104,7 +104,7 @@ serde_json = { workspace = true }
servo-media = { workspace = true }
servo_allocator = { path = "../allocator" }
servo_arc = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" }
servo_rand = { path = "../rand" }
@ -113,7 +113,7 @@ smallvec = { workspace = true, features = ["union"] }
style_malloc_size_of = { workspace = true }
glow = { workspace = true }
style = { workspace = true }
style_dom = { workspace = true }
stylo_dom = { workspace = true }
style_traits = { workspace = true }
swapper = "0.1"
tempfile = "3"

2
components/script/dom/animationevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::AnimationEventBinding::{
AnimationEventInit, AnimationEventMethods,

2
components/script/dom/attr.rs
View file

@ -9,9 +9,9 @@ use std::mem;
use devtools_traits::AttrInfo;
use dom_struct::dom_struct;
use html5ever::{LocalName, Namespace, Prefix, namespace_url, ns};
use servo_atoms::Atom;
use style::attr::{AttrIdentifier, AttrValue};
use style::values::GenericAtomIdent;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::{DomRefCell, Ref};
use crate::dom::bindings::codegen::Bindings::AttrBinding::AttrMethods;

2
components/script/dom/beforeunloadevent.rs
View file

@ -5,7 +5,7 @@
#![allow(dead_code)]
use dom_struct::dom_struct;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::BeforeUnloadEventBinding::BeforeUnloadEventMethods;

2
components/script/dom/bluetooth/bluetoothadvertisingevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::BluetoothAdvertisingEventBinding::{
BluetoothAdvertisingEventInit, BluetoothAdvertisingEventMethods,

2
components/script/dom/closeevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::CloseEventBinding;
use crate::dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods;

2
components/script/dom/customevent.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::CustomEventBinding;
use crate::dom::bindings::codegen::Bindings::CustomEventBinding::CustomEventMethods;

2
components/script/dom/document.rs
View file

@ -57,7 +57,6 @@ use script_traits::{
AnimationState, AnimationTickType, ConstellationInputEvent, DocumentActivity, ScriptMsg,
};
use servo_arc::Arc;
use servo_atoms::Atom;
use servo_config::pref;
use servo_media::{ClientContextId, ServoMedia};
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
@ -69,6 +68,7 @@ use style::shared_lock::SharedRwLock as StyleSharedRwLock;
use style::str::{split_html_space_chars, str_join};
use style::stylesheet_set::DocumentStylesheetSet;
use style::stylesheets::{Origin, OriginSet, Stylesheet};
use stylo_atoms::Atom;
use url::Host;
use uuid::Uuid;
#[cfg(feature = "webgpu")]

2
components/script/dom/documentfragment.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use super::bindings::trace::HashMapTracedValues;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/documentorshadowroot.rs
View file

@ -8,12 +8,12 @@ use euclid::default::Point2D;
use script_layout_interface::{NodesFromPointQueryType, QueryMsg};
use script_traits::UntrustedNodeAddress;
use servo_arc::Arc;
use servo_atoms::Atom;
use style::invalidation::media_queries::{MediaListKey, ToMediaListKey};
use style::media_queries::MediaList;
use style::shared_lock::{SharedRwLock as StyleSharedRwLock, SharedRwLockReadGuard};
use style::stylesheets::scope_rule::ImplicitScopeRoot;
use style::stylesheets::{Stylesheet, StylesheetContents};
use stylo_atoms::Atom;
use super::bindings::trace::HashMapTracedValues;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/domtokenlist.rs
View file

@ -4,8 +4,8 @@
use dom_struct::dom_struct;
use html5ever::{LocalName, namespace_url, ns};
use servo_atoms::Atom;
use style::str::HTML_SPACE_CHARACTERS;
use stylo_atoms::Atom;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::DOMTokenListBinding::DOMTokenListMethods;

4
components/script/dom/element.rs
View file

@ -32,7 +32,6 @@ use selectors::bloom::{BLOOM_HASH_MASK, BloomFilter};
use selectors::matching::{ElementSelectorFlags, MatchingContext};
use selectors::sink::Push;
use servo_arc::Arc;
use servo_atoms::Atom;
use style::applicable_declarations::ApplicableDeclarationBlock;
use style::attr::{AttrValue, LengthOrPercentageOrAuto};
use style::context::QuirksMode;
@ -57,7 +56,8 @@ use style::values::generics::position::PreferredRatio;
use style::values::generics::ratio::Ratio;
use style::values::{AtomIdent, AtomString, CSSFloat, computed, specified};
use style::{ArcSlice, CaseSensitivityExt, dom_apis, thread_state};
use style_dom::ElementState;
use stylo_atoms::Atom;
use stylo_dom::ElementState;
use xml5ever::serialize::TraversalScope::{
ChildrenOnly as XmlChildrenOnly, IncludeNode as XmlIncludeNode,
};

2
components/script/dom/errorevent.rs
View file

@ -8,7 +8,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::ErrorEventBinding;

2
components/script/dom/event.rs
View file

@ -9,7 +9,7 @@ use base::cross_process_instant::CrossProcessInstant;
use devtools_traits::{TimelineMarker, TimelineMarkerType};
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::callback::ExceptionHandling;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/eventsource.rs
View file

@ -22,8 +22,8 @@ use net_traits::{
CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseListener, FetchResponseMsg,
FilteredMetadata, NetworkError, ResourceFetchTiming, ResourceTimingType,
};
use servo_atoms::Atom;
use servo_url::ServoUrl;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::EventSourceBinding::{

2
components/script/dom/eventtarget.rs
View file

@ -21,9 +21,9 @@ use js::rust::{
CompileOptionsWrapper, HandleObject, RootedObjectVectorWrapper, transform_u16_to_source_text,
};
use libc::c_char;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use style::str::HTML_SPACE_CHARACTERS;
use stylo_atoms::Atom;
use crate::dom::beforeunloadevent::BeforeUnloadEvent;
use crate::dom::bindings::callback::{CallbackContainer, CallbackFunction, ExceptionHandling};

2
components/script/dom/extendableevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::{HandleObject, HandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::ExtendableEventBinding::{

2
components/script/dom/extendablemessageevent.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::ExtendableEventBinding::ExtendableEvent_Binding::ExtendableEventMethods;
use crate::dom::bindings::codegen::Bindings::ExtendableMessageEventBinding;

2
components/script/dom/filereader.rs
View file

@ -13,7 +13,7 @@ use js::jsval::{self, JSVal};
use js::rust::HandleObject;
use js::typedarray::{ArrayBuffer, CreateWith};
use mime::{self, Mime};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::BlobBinding::BlobMethods;

2
components/script/dom/formdataevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::FormDataEventBinding;

2
components/script/dom/gamepadevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::GamepadEventBinding;

2
components/script/dom/hashchangeevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::HashChangeEventBinding;

2
components/script/dom/htmlanchorelement.rs
View file

@ -9,9 +9,9 @@ use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use num_traits::ToPrimitive;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use style::attr::AttrValue;
use stylo_atoms::Atom;
use crate::dom::activation::Activatable;
use crate::dom::attr::Attr;

2
components/script/dom/htmlareaelement.rs
View file

@ -11,9 +11,9 @@ use dom_struct::dom_struct;
use euclid::default::Point2D;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use style::attr::AttrValue;
use stylo_atoms::Atom;
use crate::dom::activation::Activatable;
use crate::dom::attr::Attr;

2
components/script/dom/htmlbuttonelement.rs
View file

@ -8,7 +8,7 @@ use std::default::Default;
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name, namespace_url};
use js::rust::HandleObject;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::activation::Activatable;
use crate::dom::attr::Attr;

2
components/script/dom/htmlcollection.rs
View file

@ -7,8 +7,8 @@ use std::cmp::Ordering;
use dom_struct::dom_struct;
use html5ever::{LocalName, QualName, local_name, namespace_url, ns};
use servo_atoms::Atom;
use style::str::split_html_space_chars;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
use crate::dom::bindings::inheritance::Castable;

2
components/script/dom/htmlelement.rs
View file

@ -11,7 +11,7 @@ use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
use js::rust::HandleObject;
use script_layout_interface::QueryMsg;
use style::attr::AttrValue;
use style_dom::ElementState;
use stylo_dom::ElementState;
use super::customelementregistry::CustomElementState;
use crate::dom::activation::Activatable;

2
components/script/dom/htmlfieldsetelement.rs
View file

@ -7,7 +7,7 @@ use std::default::Default;
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::HTMLFieldSetElementBinding::HTMLFieldSetElementMethods;

2
components/script/dom/htmlfontelement.rs
View file

@ -6,13 +6,13 @@ use cssparser::match_ignore_ascii_case;
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
use js::rust::HandleObject;
use servo_atoms::Atom;
use style::attr::AttrValue;
use style::color::AbsoluteColor;
use style::str::{HTML_SPACE_CHARACTERS, read_numbers};
use style::values::computed::font::{
FamilyName, FontFamilyNameSyntax, GenericFontFamily, SingleFontFamily,
};
use stylo_atoms::Atom;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::HTMLFontElementBinding::HTMLFontElementMethods;

2
components/script/dom/htmlformcontrolscollection.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use dom_struct::dom_struct;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
use crate::dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding::HTMLFormControlsCollectionMethods;

4
components/script/dom/htmlformelement.rs
View file

@ -15,11 +15,11 @@ use mime::{self, Mime};
use net_traits::http_percent_encode;
use net_traits::request::Referrer;
use script_traits::{LoadData, LoadOrigin, NavigationHistoryBehavior};
use servo_atoms::Atom;
use servo_rand::random;
use style::attr::AttrValue;
use style::str::split_html_space_chars;
use style_dom::ElementState;
use stylo_atoms::Atom;
use stylo_dom::ElementState;
use super::bindings::trace::{HashMapTracedValues, NoTrace};
use crate::body::Extractable;

2
components/script/dom/htmliframeelement.rs
View file

@ -16,9 +16,9 @@ use script_traits::{
IFrameLoadInfo, IFrameLoadInfoWithData, JsEvalResult, LoadData, LoadOrigin,
NavigationHistoryBehavior, NewLayoutInfo, ScriptMsg, UpdatePipelineIdReason, WindowSizeData,
};
use servo_atoms::Atom;
use servo_url::ServoUrl;
use style::attr::{AttrValue, LengthOrPercentageOrAuto};
use stylo_atoms::Atom;
use crate::document_loader::{LoadBlocker, LoadType};
use crate::dom::attr::Attr;

4
components/script/dom/htmlinputelement.rs
View file

@ -26,10 +26,10 @@ use net_traits::blob_url_store::get_blob_origin;
use net_traits::filemanager_thread::FileManagerThreadMsg;
use net_traits::{CoreResourceMsg, IpcSend};
use profile_traits::ipc;
use servo_atoms::Atom;
use style::attr::AttrValue;
use style::str::{split_commas, str_join};
use style_dom::ElementState;
use stylo_atoms::Atom;
use stylo_dom::ElementState;
use time::{Month, OffsetDateTime, Time};
use unicode_bidi::{BidiClass, bidi_class};
use url::Url;

2
components/script/dom/htmllinkelement.rs
View file

@ -22,13 +22,13 @@ use net_traits::{
ResourceTimingType,
};
use servo_arc::Arc;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use style::attr::AttrValue;
use style::media_queries::MediaList;
use style::parser::ParserContext as CssParserContext;
use style::stylesheets::{CssRuleType, Origin, Stylesheet, UrlExtraData};
use style_traits::ParsingMode;
use stylo_atoms::Atom;
use crate::dom::attr::Attr;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/htmlmeterelement.rs
View file

@ -8,7 +8,7 @@ use std::ops::{Add, Div};
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::attr::Attr;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/htmloptgroupelement.rs
View file

@ -5,7 +5,7 @@
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::HTMLOptGroupElementBinding::HTMLOptGroupElementMethods;

2
components/script/dom/htmloptionelement.rs
View file

@ -9,7 +9,7 @@ use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, QualName, local_name, namespace_url, ns};
use js::rust::HandleObject;
use style::str::{split_html_space_chars, str_join};
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;

2
components/script/dom/htmlscriptelement.rs
View file

@ -28,10 +28,10 @@ use net_traits::{
FetchMetadata, FetchResponseListener, Metadata, NetworkError, ResourceFetchTiming,
ResourceTimingType,
};
use servo_atoms::Atom;
use servo_config::pref;
use servo_url::{ImmutableOrigin, ServoUrl};
use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec};
use stylo_atoms::Atom;
use uuid::Uuid;
use crate::HasParent;

2
components/script/dom/htmlselectelement.rs
View file

@ -9,7 +9,7 @@ use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name};
use js::rust::HandleObject;
use style::attr::AttrValue;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::attr::Attr;
use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;

2
components/script/dom/htmltextareaelement.rs
View file

@ -10,7 +10,7 @@ use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
use js::rust::HandleObject;
use style::attr::AttrValue;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::clipboard_provider::EmbedderClipboardProvider;
use crate::dom::attr::Attr;

2
components/script/dom/mediaquerylistevent.rs
View file

@ -6,7 +6,7 @@ use std::cell::Cell;
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::MediaQueryListEventBinding::{

2
components/script/dom/messageevent.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;

2
components/script/dom/nodelist.rs
View file

@ -5,7 +5,7 @@
use std::cell::Cell;
use dom_struct::dom_struct;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
use crate::dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods;

2
components/script/dom/offlineaudiocompletionevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::audiobuffer::AudioBuffer;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;

2
components/script/dom/pagetransitionevent.rs
View file

@ -6,7 +6,7 @@ use std::cell::Cell;
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::PageTransitionEventBinding;

2
components/script/dom/paintworkletglobalscope.rs
View file

@ -25,10 +25,10 @@ use net_traits::image_cache::ImageCache;
use pixels::PixelFormat;
use profile_traits::ipc;
use script_traits::{DrawAPaintImageResult, PaintWorkletError, Painter};
use servo_atoms::Atom;
use servo_config::pref;
use servo_url::ServoUrl;
use style_traits::{CSSPixel, SpeculativePainter};
use stylo_atoms::Atom;
use webrender_api::units::DevicePixel;
use super::bindings::trace::HashMapTracedValues;

2
components/script/dom/popstateevent.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::PopStateEventBinding;

2
components/script/dom/progressevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::ProgressEventBinding;

2
components/script/dom/promiserejectionevent.rs
View file

@ -9,7 +9,7 @@ use dom_struct::dom_struct;
use js::jsapi::{Heap, JSObject};
use js::jsval::JSVal;
use js::rust::{HandleObject, HandleValue, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::PromiseRejectionEventBinding;

2
components/script/dom/radionodelist.rs
View file

@ -3,7 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use dom_struct::dom_struct;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods;
use crate::dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods;

2
components/script/dom/raredata.rs
View file

@ -5,7 +5,7 @@
use std::rc::Rc;
use euclid::default::Rect;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::root::{Dom, MutNullableDom};
use crate::dom::customelementregistry::{

2
components/script/dom/rtcdatachannelevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::RTCDataChannelEventBinding::{

2
components/script/dom/rtcerrorevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::RTCErrorEventBinding::{

2
components/script/dom/rtcpeerconnectioniceevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::RTCPeerConnectionIceEventBinding::{

2
components/script/dom/rtctrackevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::RTCTrackEventBinding::{self, RTCTrackEventMethods};

2
components/script/dom/securitypolicyviolationevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use super::bindings::reflector::reflect_dom_object_with_proto;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;

2
components/script/dom/shadowroot.rs
View file

@ -7,12 +7,12 @@ use std::collections::hash_map::Entry;
use dom_struct::dom_struct;
use servo_arc::Arc;
use servo_atoms::Atom;
use style::author_styles::AuthorStyles;
use style::dom::TElement;
use style::shared_lock::SharedRwLockReadGuard;
use style::stylesheets::Stylesheet;
use style::stylist::{CascadeData, Stylist};
use stylo_atoms::Atom;
use crate::conversions::Convert;
use crate::dom::bindings::cell::DomRefCell;

2
components/script/dom/storageevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::cell::DomRefCell;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;

2
components/script/dom/stylepropertymapreadonly.rs
View file

@ -6,8 +6,8 @@ use std::cmp::Ordering;
use std::iter::Iterator;
use dom_struct::dom_struct;
use servo_atoms::Atom;
use style::custom_properties;
use stylo_atoms::Atom;
use super::bindings::trace::HashMapTracedValues;
use crate::dom::bindings::codegen::Bindings::StylePropertyMapReadOnlyBinding::StylePropertyMapReadOnlyMethods;

2
components/script/dom/submitevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::SubmitEventBinding;

2
components/script/dom/svgelement.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix, local_name, namespace_url, ns};
use js::rust::HandleObject;
use script_bindings::str::DOMString;
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::bindings::codegen::Bindings::SVGElementBinding::SVGElementMethods;
use crate::dom::bindings::inheritance::Castable;

2
components/script/dom/svggraphicselement.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix};
use style_dom::ElementState;
use stylo_dom::ElementState;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::document::Document;

2
components/script/dom/trackevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::audiotrack::AudioTrack;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;

2
components/script/dom/transitionevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::TransitionEventBinding::{

2
components/script/dom/uievent.rs
View file

@ -7,7 +7,7 @@ use std::default::Default;
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use super::node::NodeTraits;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;

2
components/script/dom/validitystate.rs
View file

@ -8,7 +8,7 @@ use std::fmt;
use bitflags::bitflags;
use dom_struct::dom_struct;
use itertools::Itertools;
use style_dom::ElementState;
use stylo_dom::ElementState;
use super::bindings::codegen::Bindings::ElementInternalsBinding::ValidityStateFlags;
use crate::dom::bindings::cell::{DomRefCell, Ref};

2
components/script/dom/webglcontextevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use crate::dom::bindings::codegen::Bindings::WebGLContextEventBinding::{

2
components/script/dom/webgpu/gpuuncapturederrorevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{

2
components/script/dom/webxr/xrinputsourceevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::XRInputSourceEventBinding::{

2
components/script/dom/webxr/xrinputsourceschangeevent.rs
View file

@ -6,7 +6,7 @@ use dom_struct::dom_struct;
use js::jsapi::Heap;
use js::jsval::JSVal;
use js::rust::{HandleObject, MutableHandleValue};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::XRInputSourcesChangeEventBinding::{

2
components/script/dom/webxr/xrlayerevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::XRLayerEventBinding::{

2
components/script/dom/webxr/xrreferencespaceevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::XRReferenceSpaceEventBinding::{

4
components/script/dom/webxr/xrsession.rs
View file

@ -17,7 +17,7 @@ use js::jsapi::JSObject;
use js::rust::MutableHandleValue;
use js::typedarray::Float32Array;
use profile_traits::ipc;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use webxr_api::{
self, util, ApiSpace, ContextId as WebXRContextId, Display, EntityTypes, EnvironmentBlendMode,
Event as XREvent, Frame, FrameUpdateEvent, HitTestId, HitTestSource, InputFrame, InputId, Ray,
@ -294,7 +294,7 @@ impl XRSession {
event.upcast::<Event>().fire(self.upcast(), can_gc);
},
XREvent::Select(input, kind, ty, frame) => {
use servo_atoms::Atom;
use stylo_atoms::Atom;
const START_ATOMS: [Atom; 2] = [atom!("selectstart"), atom!("squeezestart")];
const EVENT_ATOMS: [Atom; 2] = [atom!("select"), atom!("squeeze")];
const END_ATOMS: [Atom; 2] = [atom!("selectend"), atom!("squeezeend")];

2
components/script/dom/webxr/xrsessionevent.rs
View file

@ -4,7 +4,7 @@
use dom_struct::dom_struct;
use js::rust::HandleObject;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods;
use crate::dom::bindings::codegen::Bindings::XRSessionEventBinding::{self, XRSessionEventMethods};

2
components/script/dom/window.rs
View file

@ -66,7 +66,6 @@ use script_traits::{
};
use selectors::attr::CaseSensitivity;
use servo_arc::Arc as ServoArc;
use servo_atoms::Atom;
use servo_config::{opts, pref};
use servo_geometry::{DeviceIndependentIntRect, MaxRect, f32_rect_to_au_rect};
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
@ -81,6 +80,7 @@ use style::selector_parser::PseudoElement;
use style::str::HTML_SPACE_CHARACTERS;
use style::stylesheets::{CssRuleType, Origin, UrlExtraData};
use style_traits::{CSSPixel, ParsingMode};
use stylo_atoms::Atom;
use url::Position;
use webrender_api::units::{DevicePixel, LayoutPixel};
use webrender_api::{DocumentId, ExternalScrollId};

2
components/script/dom/workletglobalscope.rs
View file

@ -16,8 +16,8 @@ use net_traits::ResourceThreads;
use net_traits::image_cache::ImageCache;
use profile_traits::{mem, time};
use script_traits::{Painter, ScriptMsg, ScriptToConstellationChan};
use servo_atoms::Atom;
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
use stylo_atoms::Atom;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::root::DomRoot;

2
components/script/dom/xmlhttprequest.rs
View file

@ -32,8 +32,8 @@ use net_traits::{
};
use script_traits::DocumentActivity;
use script_traits::serializable::BlobImpl;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use stylo_atoms::Atom;
use url::Position;
use crate::body::{BodySource, Extractable, ExtractedBody, decode_to_utf16_with_bom_removal};

4
components/script/layout_dom/element.rs
View file

@ -19,7 +19,6 @@ use selectors::bloom::{BLOOM_HASH_MASK, BloomFilter};
use selectors::matching::{ElementSelectorFlags, MatchingContext, VisitedHandlingMode};
use selectors::sink::Push;
use servo_arc::{Arc, ArcBorrow};
use servo_atoms::Atom;
use style::CaseSensitivityExt;
use style::animation::AnimationSetKey;
use style::applicable_declarations::ApplicableDeclarationBlock;
@ -37,7 +36,8 @@ use style::shared_lock::Locked as StyleLocked;
use style::stylesheets::scope_rule::ImplicitScopeRoot;
use style::values::computed::Display;
use style::values::{AtomIdent, AtomString};
use style_dom::ElementState;
use stylo_atoms::Atom;
use stylo_dom::ElementState;
use crate::dom::attr::AttrHelpersForLayout;
use crate::dom::bindings::inheritance::{

2
components/script/lib.rs
View file

@ -22,7 +22,7 @@ extern crate log;
#[macro_use]
extern crate malloc_size_of_derive;
#[macro_use]
extern crate servo_atoms;
extern crate stylo_atoms;
mod animation_timeline;
mod animations;

2
components/script/messaging.rs
View file

@ -19,7 +19,7 @@ use net_traits::image_cache::PendingImageResponse;
use profile_traits::mem::{self as profile_mem, OpaqueSender, ReportsChan};
use profile_traits::time::{self as profile_time};
use script_traits::{LayoutMsg, Painter, ScriptMsg, ScriptThreadMessage};
use servo_atoms::Atom;
use stylo_atoms::Atom;
use timers::TimerScheduler;
#[cfg(feature = "webgpu")]
use webgpu::WebGPUMsg;

2
components/script/script_thread.rs
View file

@ -83,11 +83,11 @@ use script_traits::{
ProgressiveWebMetricType, ScriptMsg, ScriptThreadMessage, ScriptToConstellationChan,
ScrollState, StructuredSerializedData, UpdatePipelineIdReason, WindowSizeData, WindowSizeType,
};
use servo_atoms::Atom;
use servo_config::opts;
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
use style::dom::OpaqueNode;
use style::thread_state::{self, ThreadState};
use stylo_atoms::Atom;
use timers::{TimerEventRequest, TimerScheduler};
use url::Position;
#[cfg(feature = "webgpu")]

2
components/script/security_manager.rs
View file

@ -5,8 +5,8 @@
use js::jsapi::RuntimeCode;
use net_traits::request::Referrer;
use serde::Serialize;
use servo_atoms::Atom;
use servo_url::ServoUrl;
use stylo_atoms::Atom;
use crate::conversions::Convert;
use crate::dom::bindings::codegen::Bindings::EventBinding::EventInit;

2
components/script/task_source.rs
View file

@ -6,7 +6,7 @@ use std::fmt;
use base::id::PipelineId;
use malloc_size_of_derive::MallocSizeOf;
use servo_atoms::Atom;
use stylo_atoms::Atom;
use crate::dom::bindings::refcounted::Trusted;
use crate::dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask};

2
components/script_bindings/Cargo.toml
View file

@ -32,7 +32,7 @@ malloc_size_of = { workspace = true }
malloc_size_of_derive = { workspace = true }
num-traits = { workspace = true }
regex = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_config = { path = "../config" }
style = { workspace = true }

2
components/script_bindings/str.rs
View file

@ -16,7 +16,7 @@ use cssparser::CowRcStr;
use html5ever::{LocalName, Namespace};
use num_traits::Zero;
use regex::Regex;
use servo_atoms::Atom;
use stylo_atoms::Atom;
/// Encapsulates the IDL `ByteString` type.
#[derive(Clone, Debug, Default, Eq, JSTraceable, MallocSizeOf, PartialEq)]

2
components/shared/script/Cargo.toml
View file

@ -39,7 +39,7 @@ net_traits = { workspace = true }
pixels = { path = "../../pixels" }
profile_traits = { workspace = true }
serde = { workspace = true }
servo_atoms = { workspace = true }
stylo_atoms = { workspace = true }
servo_url = { path = "../../url" }
style_traits = { workspace = true }
uuid = { workspace = true }

Some files were not shown because too many files have changed in this diff Show more