diff options
105 files changed, 178 insertions, 179 deletions
diff --git a/Cargo.lock b/Cargo.lock index d96bfc14813..f213ce0d428 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1735,15 +1735,6 @@ dependencies = [ ] [[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" dependencies = [ @@ -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,22 +6862,13 @@ 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" dependencies = [ @@ -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", @@ -7235,11 +7217,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", @@ -7373,17 +7350,9 @@ dependencies = [ ] [[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,7 +7394,7 @@ dependencies = [ "selectors", "serde", "servo_arc", - "servo_atoms", + "stylo_atoms", "thin-vec", "to_shmem", "to_shmem_derive", @@ -7433,6 +7402,37 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", diff --git a/Cargo.toml b/Cargo.toml index 0bf07431ab5..e5946388f4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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: # diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index 8f0c85127e5..3697fa2d3c6 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -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 } diff --git a/components/config/prefs.rs b/components/config/prefs.rs index fabda028ba5..e2c2aab79b5 100644 --- a/components/config/prefs.rs +++ b/components/config/prefs.rs @@ -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, ); diff --git a/components/fonts/Cargo.toml b/components/fonts/Cargo.toml index 2230d663649..1854a32a472 100644 --- a/components/fonts/Cargo.toml +++ b/components/fonts/Cargo.toml @@ -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"] } diff --git a/components/fonts/tests/font_context.rs b/components/fonts/tests/font_context.rs index e4473b800d1..69ba4af479f 100644 --- a/components/fonts/tests/font_context.rs +++ b/components/fonts/tests/font_context.rs @@ -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; diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 2ac1462ed57..be78e51f531 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -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" } diff --git a/components/layout/context.rs b/components/layout/context.rs index 6c1d2e4e228..7ff6fd8f362 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -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}; diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 7b0f8b2bc1c..5b8491cd54d 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -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 } diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 1112d6ec989..ea635a8ab49 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -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; diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml index 0d9bdc560a4..63ad21399ae 100644 --- a/components/layout_thread_2020/Cargo.toml +++ b/components/layout_thread_2020/Cargo.toml @@ -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 } diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs index 6a3ae728038..696145598db 100644 --- a/components/layout_thread_2020/lib.rs +++ b/components/layout_thread_2020/lib.rs @@ -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}; diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 270c16b98d8..0d5ad08301b 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -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"] } diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index 241dba8eba9..ecadf8f28d9 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -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); diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 186366eef72..635c0e9cd0b 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -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" diff --git a/components/script/dom/animationevent.rs b/components/script/dom/animationevent.rs index 10902a9e012..943eb2114e2 100644 --- a/components/script/dom/animationevent.rs +++ b/components/script/dom/animationevent.rs @@ -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, diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 40dbb31e653..fff594cead0 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -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; diff --git a/components/script/dom/beforeunloadevent.rs b/components/script/dom/beforeunloadevent.rs index 088c009630a..e303c14d482 100644 --- a/components/script/dom/beforeunloadevent.rs +++ b/components/script/dom/beforeunloadevent.rs @@ -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; diff --git a/components/script/dom/bluetooth/bluetoothadvertisingevent.rs b/components/script/dom/bluetooth/bluetoothadvertisingevent.rs index b33f1e17323..ec52bbe2c9e 100644 --- a/components/script/dom/bluetooth/bluetoothadvertisingevent.rs +++ b/components/script/dom/bluetooth/bluetoothadvertisingevent.rs @@ -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, diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 3237f953f69..386ba94d4ce 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -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; diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index c64ff183c87..e1d4e4e6e46 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -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; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 6e1c5a467c6..c7343e889a9 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -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")] diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index b418d095b91..6a68ac4a36c 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -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; diff --git a/components/script/dom/documentorshadowroot.rs b/components/script/dom/documentorshadowroot.rs index af8f180fd5c..7c3997da34d 100644 --- a/components/script/dom/documentorshadowroot.rs +++ b/components/script/dom/documentorshadowroot.rs @@ -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; diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 3813a810964..8d479aba80d 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -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; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 47598081bca..d4ed7932dfa 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -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, }; diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index eb81c6a630f..758d4f108e9 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -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; diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 00b15f85a82..a9dd421b7e0 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -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; diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 70caa4949d5..8b3dc4d5113 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -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::{ diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index db705a7786e..0f7664a75d3 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -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}; diff --git a/components/script/dom/extendableevent.rs b/components/script/dom/extendableevent.rs index 87c5485f0f8..fe265886150 100644 --- a/components/script/dom/extendableevent.rs +++ b/components/script/dom/extendableevent.rs @@ -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::{ diff --git a/components/script/dom/extendablemessageevent.rs b/components/script/dom/extendablemessageevent.rs index d05488e7f52..029762d4dae 100644 --- a/components/script/dom/extendablemessageevent.rs +++ b/components/script/dom/extendablemessageevent.rs @@ -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; diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 32808a66fd0..b4e37e2cc2d 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -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; diff --git a/components/script/dom/formdataevent.rs b/components/script/dom/formdataevent.rs index 03fffb2a760..bb089a36c39 100644 --- a/components/script/dom/formdataevent.rs +++ b/components/script/dom/formdataevent.rs @@ -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; diff --git a/components/script/dom/gamepadevent.rs b/components/script/dom/gamepadevent.rs index df01850ab22..4479b5516c0 100644 --- a/components/script/dom/gamepadevent.rs +++ b/components/script/dom/gamepadevent.rs @@ -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; diff --git a/components/script/dom/hashchangeevent.rs b/components/script/dom/hashchangeevent.rs index b8ddd7e8306..bcecf6e3f5b 100644 --- a/components/script/dom/hashchangeevent.rs +++ b/components/script/dom/hashchangeevent.rs @@ -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; diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index ea7fe80bf68..2dc968ce049 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -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; diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index 010d941a446..95254650174 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -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; diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 5c7637305a3..24af541f554 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -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; diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 857ba572625..5558e2a2001 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -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; diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 1f0d1f223fb..aa72b536683 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -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; diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index f4ff9bd2d49..13e09c4125e 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -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; diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index 335d04b7fae..ee7015fb66d 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -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; diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs index ab922c0958c..90610b2384b 100644 --- a/components/script/dom/htmlformcontrolscollection.rs +++ b/components/script/dom/htmlformcontrolscollection.rs @@ -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; diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 75b4830dddd..c8431fdf365 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -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; diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index e34a863b623..de7c303c099 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -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; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 1cbf386e03e..afd248710f4 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -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; diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index bf5939138f5..af5bcd5f6d9 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -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; diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index beab46e58d7..c4726dafc61 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/components/script/dom/htmlmeterelement.rs @@ -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; diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index aa9c8ce6497..db1ec1084d7 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -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; diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index e1b02c6cfa2..d6428532f00 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -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; diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 617968b78f6..17c601d3706 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -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; diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 4fe55593d11..8f8a9d15601 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -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; diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index d35771b803b..315ac01ef9a 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -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; diff --git a/components/script/dom/mediaquerylistevent.rs b/components/script/dom/mediaquerylistevent.rs index f36f192dcbb..edbe9647d95 100644 --- a/components/script/dom/mediaquerylistevent.rs +++ b/components/script/dom/mediaquerylistevent.rs @@ -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::{ diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 0ed757614e8..de866425322 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -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; diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 743e372e907..b349f16a986 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -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; diff --git a/components/script/dom/offlineaudiocompletionevent.rs b/components/script/dom/offlineaudiocompletionevent.rs index e40f7014214..5a80892b6ea 100644 --- a/components/script/dom/offlineaudiocompletionevent.rs +++ b/components/script/dom/offlineaudiocompletionevent.rs @@ -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; diff --git a/components/script/dom/pagetransitionevent.rs b/components/script/dom/pagetransitionevent.rs index 6437ef50ad5..5d973b70d96 100644 --- a/components/script/dom/pagetransitionevent.rs +++ b/components/script/dom/pagetransitionevent.rs @@ -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; diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index cdbcc2658bc..a40884da746 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -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; diff --git a/components/script/dom/popstateevent.rs b/components/script/dom/popstateevent.rs index 99ba0f58b14..d5160eeac13 100644 --- a/components/script/dom/popstateevent.rs +++ b/components/script/dom/popstateevent.rs @@ -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; diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 1041ff750ea..e0a8ee2992f 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -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; diff --git a/components/script/dom/promiserejectionevent.rs b/components/script/dom/promiserejectionevent.rs index 593e5a4e7b0..fbd9b7acdda 100644 --- a/components/script/dom/promiserejectionevent.rs +++ b/components/script/dom/promiserejectionevent.rs @@ -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; diff --git a/components/script/dom/radionodelist.rs b/components/script/dom/radionodelist.rs index 998583bdb07..0ad8cd4b622 100644 --- a/components/script/dom/radionodelist.rs +++ b/components/script/dom/radionodelist.rs @@ -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; diff --git a/components/script/dom/raredata.rs b/components/script/dom/raredata.rs index 044ffe41500..3afa000511e 100644 --- a/components/script/dom/raredata.rs +++ b/components/script/dom/raredata.rs @@ -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::{ diff --git a/components/script/dom/rtcdatachannelevent.rs b/components/script/dom/rtcdatachannelevent.rs index 163a9036803..d8139c3f16c 100644 --- a/components/script/dom/rtcdatachannelevent.rs +++ b/components/script/dom/rtcdatachannelevent.rs @@ -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::{ diff --git a/components/script/dom/rtcerrorevent.rs b/components/script/dom/rtcerrorevent.rs index b92b447b166..04c07429c0d 100644 --- a/components/script/dom/rtcerrorevent.rs +++ b/components/script/dom/rtcerrorevent.rs @@ -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::{ diff --git a/components/script/dom/rtcpeerconnectioniceevent.rs b/components/script/dom/rtcpeerconnectioniceevent.rs index b550f29eb31..b3e1eb97c33 100644 --- a/components/script/dom/rtcpeerconnectioniceevent.rs +++ b/components/script/dom/rtcpeerconnectioniceevent.rs @@ -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::{ diff --git a/components/script/dom/rtctrackevent.rs b/components/script/dom/rtctrackevent.rs index 5e9ab153a95..dbb76928c49 100644 --- a/components/script/dom/rtctrackevent.rs +++ b/components/script/dom/rtctrackevent.rs @@ -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}; diff --git a/components/script/dom/securitypolicyviolationevent.rs b/components/script/dom/securitypolicyviolationevent.rs index fc973ac874e..3580e525e55 100644 --- a/components/script/dom/securitypolicyviolationevent.rs +++ b/components/script/dom/securitypolicyviolationevent.rs @@ -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; diff --git a/components/script/dom/shadowroot.rs b/components/script/dom/shadowroot.rs index c1adb60f566..73d5c13174b 100644 --- a/components/script/dom/shadowroot.rs +++ b/components/script/dom/shadowroot.rs @@ -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; diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index 343aa66b6ba..929e124a376 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -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; diff --git a/components/script/dom/stylepropertymapreadonly.rs b/components/script/dom/stylepropertymapreadonly.rs index 5d5260f887a..e9baaf3aebc 100644 --- a/components/script/dom/stylepropertymapreadonly.rs +++ b/components/script/dom/stylepropertymapreadonly.rs @@ -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; diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs index 02a33a8e82c..a4a7f4375fd 100644 --- a/components/script/dom/submitevent.rs +++ b/components/script/dom/submitevent.rs @@ -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; diff --git a/components/script/dom/svgelement.rs b/components/script/dom/svgelement.rs index 6dd90a2efa8..9a48653b768 100644 --- a/components/script/dom/svgelement.rs +++ b/components/script/dom/svgelement.rs @@ -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; diff --git a/components/script/dom/svggraphicselement.rs b/components/script/dom/svggraphicselement.rs index 48e7f1069a0..3c3408d13a4 100644 --- a/components/script/dom/svggraphicselement.rs +++ b/components/script/dom/svggraphicselement.rs @@ -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; diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs index 13849760c6a..82be7581883 100644 --- a/components/script/dom/trackevent.rs +++ b/components/script/dom/trackevent.rs @@ -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; diff --git a/components/script/dom/transitionevent.rs b/components/script/dom/transitionevent.rs index c7d2f2ec73c..65861c46349 100644 --- a/components/script/dom/transitionevent.rs +++ b/components/script/dom/transitionevent.rs @@ -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::{ diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index 35e84d8e42b..f30a58edb5a 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -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; diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index e757e09766a..0d3297f38d8 100755 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -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}; diff --git a/components/script/dom/webglcontextevent.rs b/components/script/dom/webglcontextevent.rs index a96e3218f37..61e69427aa2 100644 --- a/components/script/dom/webglcontextevent.rs +++ b/components/script/dom/webglcontextevent.rs @@ -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::{ diff --git a/components/script/dom/webgpu/gpuuncapturederrorevent.rs b/components/script/dom/webgpu/gpuuncapturederrorevent.rs index bae6948bce3..af9722c2ca3 100644 --- a/components/script/dom/webgpu/gpuuncapturederrorevent.rs +++ b/components/script/dom/webgpu/gpuuncapturederrorevent.rs @@ -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::{ diff --git a/components/script/dom/webxr/xrinputsourceevent.rs b/components/script/dom/webxr/xrinputsourceevent.rs index 0854fa6f5d8..c0386319196 100644 --- a/components/script/dom/webxr/xrinputsourceevent.rs +++ b/components/script/dom/webxr/xrinputsourceevent.rs @@ -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::{ diff --git a/components/script/dom/webxr/xrinputsourceschangeevent.rs b/components/script/dom/webxr/xrinputsourceschangeevent.rs index bc79918dceb..e69d59c8529 100644 --- a/components/script/dom/webxr/xrinputsourceschangeevent.rs +++ b/components/script/dom/webxr/xrinputsourceschangeevent.rs @@ -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::{ diff --git a/components/script/dom/webxr/xrlayerevent.rs b/components/script/dom/webxr/xrlayerevent.rs index 67d91539aa1..4b0425754da 100644 --- a/components/script/dom/webxr/xrlayerevent.rs +++ b/components/script/dom/webxr/xrlayerevent.rs @@ -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::{ diff --git a/components/script/dom/webxr/xrreferencespaceevent.rs b/components/script/dom/webxr/xrreferencespaceevent.rs index 14b320eafc1..77ea16fd773 100644 --- a/components/script/dom/webxr/xrreferencespaceevent.rs +++ b/components/script/dom/webxr/xrreferencespaceevent.rs @@ -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::{ diff --git a/components/script/dom/webxr/xrsession.rs b/components/script/dom/webxr/xrsession.rs index f5fd065619e..31fe2ceb144 100644 --- a/components/script/dom/webxr/xrsession.rs +++ b/components/script/dom/webxr/xrsession.rs @@ -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")]; diff --git a/components/script/dom/webxr/xrsessionevent.rs b/components/script/dom/webxr/xrsessionevent.rs index 3faf80dac0a..62cebb7b188 100644 --- a/components/script/dom/webxr/xrsessionevent.rs +++ b/components/script/dom/webxr/xrsessionevent.rs @@ -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}; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index fccbb112652..29a8eb60865 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -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}; diff --git a/components/script/dom/workletglobalscope.rs b/components/script/dom/workletglobalscope.rs index ae11c4ff214..0055d39bec3 100644 --- a/components/script/dom/workletglobalscope.rs +++ b/components/script/dom/workletglobalscope.rs @@ -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; diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 94e966fd12a..4cd7a3a3cd0 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -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}; diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs index c69a4b3fad4..3ccc68da10e 100644 --- a/components/script/layout_dom/element.rs +++ b/components/script/layout_dom/element.rs @@ -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::{ diff --git a/components/script/lib.rs b/components/script/lib.rs index 8c09e30e6a1..16af5491629 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -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; diff --git a/components/script/messaging.rs b/components/script/messaging.rs index 17d6664e1cf..44b7167a5f5 100644 --- a/components/script/messaging.rs +++ b/components/script/messaging.rs @@ -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; diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 669b08d2278..e3d8f898fc1 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -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")] diff --git a/components/script/security_manager.rs b/components/script/security_manager.rs index 66289689eab..391a54f30dd 100644 --- a/components/script/security_manager.rs +++ b/components/script/security_manager.rs @@ -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; diff --git a/components/script/task_source.rs b/components/script/task_source.rs index 3d9993f6082..cd36e176181 100644 --- a/components/script/task_source.rs +++ b/components/script/task_source.rs @@ -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}; diff --git a/components/script_bindings/Cargo.toml b/components/script_bindings/Cargo.toml index 95da7193edc..e503e473197 100644 --- a/components/script_bindings/Cargo.toml +++ b/components/script_bindings/Cargo.toml @@ -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 } diff --git a/components/script_bindings/str.rs b/components/script_bindings/str.rs index fcae1fd5abf..b1942c63d46 100644 --- a/components/script_bindings/str.rs +++ b/components/script_bindings/str.rs @@ -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)] diff --git a/components/shared/script/Cargo.toml b/components/shared/script/Cargo.toml index a1e71af824d..34c5e9a6582 100644 --- a/components/shared/script/Cargo.toml +++ b/components/shared/script/Cargo.toml @@ -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 } diff --git a/components/shared/script/lib.rs b/components/shared/script/lib.rs index 4ca8cff66ad..20f830b5f29 100644 --- a/components/shared/script/lib.rs +++ b/components/shared/script/lib.rs @@ -49,9 +49,9 @@ use net_traits::{ReferrerPolicy, ResourceThreads}; use pixels::PixelFormat; use profile_traits::{mem, time as profile_time}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use servo_atoms::Atom; use servo_url::{ImmutableOrigin, ServoUrl}; use style_traits::{CSSPixel, SpeculativePainter}; +use stylo_atoms::Atom; #[cfg(feature = "webgpu")] use webgpu::WebGPUMsg; use webrender_api::units::{DevicePixel, LayoutPixel}; diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 106bdd132d6..d78f52a4f6c 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -173,7 +173,7 @@ class MachCommands(CommandBase): "selectors", "servo_config", "servoshell", - "style_config", + "stylo_config", "webrender_traits", ] if not packages: diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index 5880aec6501..63adce0c2f6 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -21,7 +21,7 @@ rayon = { workspace = true } serde_json = { workspace = true } selectors = { workspace = true } servo_arc = { workspace = true } -servo_atoms = { workspace = true } +stylo_atoms = { workspace = true } style = { workspace = true } style_traits = { workspace = true } url = { workspace = true } diff --git a/tests/unit/style/lib.rs b/tests/unit/style/lib.rs index bf3c0bbcf42..3d0835bf681 100644 --- a/tests/unit/style/lib.rs +++ b/tests/unit/style/lib.rs @@ -14,9 +14,9 @@ extern crate rayon; extern crate selectors; extern crate serde_json; extern crate servo_arc; -extern crate servo_atoms; extern crate style; extern crate style_traits; +extern crate stylo_atoms; extern crate test; extern crate url; diff --git a/tests/unit/style/stylist.rs b/tests/unit/style/stylist.rs index b7d9a4cbc77..9fa422b2294 100644 --- a/tests/unit/style/stylist.rs +++ b/tests/unit/style/stylist.rs @@ -6,7 +6,6 @@ use cssparser::SourceLocation; use euclid::{Scale, Size2D}; use selectors::parser::{AncestorHashes, Selector}; use servo_arc::Arc; -use servo_atoms::Atom; use style::context::QuirksMode; use style::font_metrics::FontMetrics; use style::media_queries::{Device, MediaType}; @@ -27,6 +26,7 @@ use style::stylist::{ use style::thread_state::{self, ThreadState}; use style::values::computed::Length; use style::values::computed::font::GenericFontFamily; +use stylo_atoms::Atom; use url::Url; #[derive(Debug)] |