Commit our changes on top of upstream Stylo

This is a rebase of 42990da

Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Nico Burns <[email protected]>

Author: delan

Cargo.toml

@@ -0,0 +1,18 @@
+[workspace]
+resolver = "2"
+members = [
+    "stylo_atoms",
+    "stylo_dom",
+    "malloc_size_of",
+    "rustfmt.toml",
+    "selectors",
+    "servo_arc",
+    "style",
+    "style_derive",
+    "stylo_config",
+    "stylo_static_prefs",
+    "style_traits",
+    "to_shmem",
+    "to_shmem_derive",
+]
+default-members = ["style"]

malloc_size_of/Cargo.toml

@@ -20,7 +20,7 @@ euclid = "0.22"
 selectors = { path = "../selectors" }
 servo_arc = { path = "../servo_arc" }
 smallbitvec = "2.3.0"
-smallvec = "1.0"
+smallvec = "1.13"
 string_cache = { version = "0.8", optional = true }
-thin-vec = { version = "0.2.1" }
+thin-vec = { version = "0.2.13" }
 void = "1.0.2"

style/Cargo.toml

@@ -31,15 +31,15 @@ gecko = [
     "to_shmem/gecko",
 ]
 servo = [
-    "arrayvec/use_union",
     "cssparser/serde",
     "encoding_rs",
     "malloc_size_of/servo",
     "markup5ever",
+    "mime",
     "serde",
     "servo_arc/servo",
     "stylo_atoms",
-    "servo_config",
+    "style_config",
     "string_cache",
     "style_traits/servo",
     "url",
@@ -48,16 +48,17 @@ servo = [
 ]
 gecko_debug = []
 gecko_refcount_logging = []
+nsstring = []
 
 [dependencies]
-app_units = "0.7"
+app_units = "0.7.8"
 arrayvec = "0.7"
 atomic_refcell = "0.1"
 bitflags = "2"
 byteorder = "1.0"
 cssparser = "0.34"
 derive_more = { version = "0.99", default-features = false, features = ["add", "add_assign", "deref", "deref_mut", "from"] }
-dom = { path = "../../../dom/base/rust" }
+dom = { path = "../stylo_dom", version = "0.1", package = "stylo_dom" }
 new_debug_unreachable = "1.0"
 encoding_rs = {version = "0.8", optional = true}
 euclid = "0.22"
@@ -69,10 +70,10 @@ itoa = "1.0"
 lazy_static = "1"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
-malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
-markup5ever = { version = "0.12", optional = true }
+malloc_size_of_derive = "0.1"
+markup5ever = { version = "0.15", optional = true }
 matches = "0.1"
-nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true}
+mime = { version = "0.3.13", optional = true }
 num_cpus = {version = "1.1.0"}
 num-integer = "0.1"
 num-traits = "0.2"
@@ -84,22 +85,21 @@ rayon-core = "1"
 selectors = { path = "../selectors" }
 serde = {version = "1.0", optional = true, features = ["derive"]}
 servo_arc = { path = "../servo_arc" }
-stylo_atoms = {path = "../atoms", optional = true}
-servo_config = {path = "../config", optional = true}
+stylo_atoms = {path = "../stylo_atoms", optional = true}
 smallbitvec = "2.3.0"
 smallvec = "1.0"
 static_assertions = "1.1"
-static_prefs = { path = "../../../modules/libpref/init/static_prefs" }
+static_prefs = { version = "0.1", path = "../stylo_static_prefs", package = "stylo_static_prefs" }
 string_cache = { version = "0.8", optional = true }
+style_config = { version = "0.1", path = "../stylo_config", package = "stylo_config", optional = true }
 style_derive = {path = "../style_derive"}
 style_traits = {path = "../style_traits"}
 to_shmem = {path = "../to_shmem"}
 to_shmem_derive = {path = "../to_shmem_derive"}
-thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
+thin-vec = "0.2.1"
 uluru = "3.0"
 unicode-bidi = { version = "0.3", default-features = false }
 void = "1.0.2"
-gecko-profiler = { path = "../../../tools/profiler/rust-api" }
 url = { version = "2.5", optional = true, features = ["serde"] }
 
 [build-dependencies]

style/build.rs

@@ -21,7 +21,7 @@ mod build_gecko {
 lazy_static! {
     pub static ref PYTHON: String = env::var("PYTHON3").ok().unwrap_or_else(|| {
         let candidates = if cfg!(windows) {
-            ["python3.exe"]
+            ["python.exe"]
         } else {
             ["python3"]
         };

style/context.rs

@@ -450,7 +450,7 @@ impl<E: TElement> SequentialTask<E> {
     /// Executes this task.
     pub fn execute(self) {
         use self::SequentialTask::*;
-        debug_assert_eq!(thread_state::get(), ThreadState::LAYOUT);
+        debug_assert!(thread_state::get().contains(ThreadState::LAYOUT));
         match self {
             Unused(_) => unreachable!(),
             #[cfg(feature = "gecko")]
@@ -511,7 +511,7 @@ where
     E: TElement,
 {
     fn drop(&mut self) {
-        debug_assert_eq!(thread_state::get(), ThreadState::LAYOUT);
+        debug_assert!(thread_state::get().contains(ThreadState::LAYOUT));
         for task in self.0.drain(..) {
             task.execute()
         }

style/properties/Mako-1.1.2-py2.py3-none-any.whl

@@ -8,6 +8,7 @@
 import sys
 
 BASE = os.path.dirname(__file__.replace("\\", "/"))
+sys.path.insert(0, os.path.join(BASE, "Mako-1.1.2-py2.py3-none-any.whl"))
 sys.path.insert(0, BASE)  # For importing `data.py`
 
 from mako import exceptions

style/properties/build.py

@@ -1055,13 +1055,15 @@ impl<'b> Cascade<'b> {
             builder.add_flags(ComputedValueFlags::HAS_AUTHOR_SPECIFIED_WORD_SPACING);
         }
 
+        #[cfg(feature = "gecko")]
         if self
             .author_specified
             .contains(LonghandId::FontSynthesisWeight)
         {
             builder.add_flags(ComputedValueFlags::HAS_AUTHOR_SPECIFIED_FONT_SYNTHESIS_WEIGHT);
         }
 
+        #[cfg(feature = "gecko")]
         if self
             .author_specified
             .contains(LonghandId::FontSynthesisStyle)
@@ -1197,7 +1199,6 @@ impl<'b> Cascade<'b> {
     }
 
     /// Some keyword sizes depend on the font family and language.
-    #[cfg(feature = "gecko")]
     fn recompute_keyword_font_size_if_needed(&self, context: &mut computed::Context) {
         use crate::values::computed::ToComputedValue;
 
@@ -1216,6 +1217,7 @@ impl<'b> Cascade<'b> {
                 },
             };
 
+            #[cfg(feature = "gecko")]
             if font.mScriptUnconstrainedSize == new_size.computed_size {
                 return;
             }

style/properties/cascade.rs

@@ -20,7 +20,7 @@ ${helpers.predefined_type(
     "counter-increment",
     "CounterIncrement",
     engines="gecko servo",
-    servo_pref="layout.layout.unimplemented",
+    servo_pref="layout.unimplemented",
     initial_value="Default::default()",
     animation_type="discrete",
     spec="https://drafts.csswg.org/css-lists/#propdef-counter-increment",
@@ -32,7 +32,7 @@ ${helpers.predefined_type(
     "counter-reset",
     "CounterReset",
     engines="gecko servo",
-    servo_pref="layout.layout.unimplemented",
+    servo_pref="layout.unimplemented",
     initial_value="Default::default()",
     animation_type="discrete",
     spec="https://drafts.csswg.org/css-lists-3/#propdef-counter-reset",

style/properties/longhands/counters.mako.rs

@@ -9,7 +9,7 @@ ${helpers.predefined_type(
     "TextOverflow",
     "computed::TextOverflow::get_initial_value()",
     engines="gecko servo",
-    servo_pref="layout.layout.unimplemented",
+    servo_pref="layout.unimplemented",
     animation_type="discrete",
     boxed=True,
     spec="https://drafts.csswg.org/css-ui/#propdef-text-overflow",

style/properties/longhands/text.mako.rs

@@ -454,7 +454,7 @@ pub mod property_counts {
     /// The number of non-custom properties.
     pub const NON_CUSTOM: usize = LONGHANDS_AND_SHORTHANDS + ALIASES;
     /// The number of prioritary properties that we have.
-    pub const PRIORITARY: usize = ${len(PRIORITARY_PROPERTIES)};
+    pub const PRIORITARY: usize = ${len(PRIORITARY_PROPERTIES.intersection(set(list(map(lambda p: p.name, data.longhands)))))};
     /// The max number of longhands that a shorthand other than "all" expands to.
     pub const MAX_SHORTHAND_EXPANDED: usize =
         ${max(len(s.sub_properties) for s in data.shorthands_except_all())};

style/properties/properties.mako.rs

@@ -122,13 +122,12 @@ impl StylesheetContents {
     /// An empty namespace map should be fine, as it is only used for parsing,
     /// not serialization of existing selectors.  Since UA sheets are read only,
     /// we should never need the namespace map.
-    pub fn from_shared_data(
+    pub fn from_data(
         rules: Arc<Locked<CssRules>>,
         origin: Origin,
         url_data: UrlExtraData,
         quirks_mode: QuirksMode,
     ) -> Arc<Self> {
-        debug_assert!(rules.is_static());
         Arc::new(Self {
             rules,
             origin,
@@ -141,6 +140,17 @@ impl StylesheetContents {
         })
     }
 
+    /// Same as above, but ensuring that the rules are static.
+    pub fn from_shared_data(
+        rules: Arc<Locked<CssRules>>,
+        origin: Origin,
+        url_data: UrlExtraData,
+        quirks_mode: QuirksMode,
+    ) -> Arc<Self> {
+        debug_assert!(rules.is_static());
+        Self::from_data(rules, origin, url_data, quirks_mode)
+    }
+
     /// Returns a reference to the list of rules.
     #[inline]
     pub fn rules<'a, 'b: 'a>(&'a self, guard: &'b SharedRwLockReadGuard) -> &'a [CssRule] {

style/stylesheets/stylesheet.rs

@@ -515,7 +515,11 @@ impl LengthPercentage {
     /// Returns the used value.
     #[inline]
     pub fn to_used_value(&self, containing_length: Au) -> Au {
-        Au::from(self.to_pixel_length(containing_length))
+        let length = self.to_pixel_length(containing_length);
+        if let Unpacked::Percentage(_) = self.unpack() {
+            return Au::from_f32_px_trunc(length.px());
+        }
+        Au::from(length)
     }
 
     /// Returns the used value as CSSPixelLength.
@@ -528,7 +532,11 @@ impl LengthPercentage {
     #[inline]
     pub fn maybe_to_used_value(&self, container_len: Option<Au>) -> Option<Au> {
         self.maybe_percentage_relative_to(container_len.map(Length::from))
-            .map(Au::from)
+            .map(if let Unpacked::Percentage(_) = self.unpack() {
+                |length: Length| Au::from_f32_px_trunc(length.px())
+            } else {
+                Au::from
+            })
     }
 
     /// If there are special rules for computing percentages in a value (e.g.

style/values/computed/length_percentage.rs

@@ -75,13 +75,13 @@ impl<LengthPercentage> LengthPercentageOrAuto<LengthPercentage> {
     }
 }
 
-impl<LengthPercentage> LengthPercentageOrAuto<LengthPercentage>
+impl<T> LengthPercentageOrAuto<T>
 where
-    LengthPercentage: Clone,
+    T: Clone,
 {
     /// Resolves `auto` values by calling `f`.
     #[inline]
-    pub fn auto_is(&self, f: impl FnOnce() -> LengthPercentage) -> LengthPercentage {
+    pub fn auto_is(&self, f: impl FnOnce() -> T) -> T {
         match self {
             LengthPercentageOrAuto::LengthPercentage(length) => length.clone(),
             LengthPercentageOrAuto::Auto => f(),
@@ -90,15 +90,15 @@ where
 
     /// Returns the non-`auto` value, if any.
     #[inline]
-    pub fn non_auto(&self) -> Option<LengthPercentage> {
+    pub fn non_auto(&self) -> Option<T> {
         match self {
             LengthPercentageOrAuto::LengthPercentage(length) => Some(length.clone()),
             LengthPercentageOrAuto::Auto => None,
         }
     }
 
     /// Maps the length of this value.
-    pub fn map<T>(&self, f: impl FnOnce(LengthPercentage) -> T) -> LengthPercentageOrAuto<T> {
+    pub fn map<U>(&self, f: impl FnOnce(T) -> U) -> LengthPercentageOrAuto<U> {
         match self {
             LengthPercentageOrAuto::LengthPercentage(l) => {
                 LengthPercentageOrAuto::LengthPercentage(f(l.clone()))

style/values/generics/length.rs

@@ -53,7 +53,7 @@ pub type SpecifiedFilter = GenericFilter<
     NonNegativeFactor,
     ZeroToOneFactor,
     NonNegativeLength,
-    Impossible,
+    SimpleShadow,
     Impossible,
 >;
 

style/values/specified/effects.rs

@@ -398,10 +398,15 @@ bitflags! {
         /// Capitalize each word.
         const CAPITALIZE = 1 << 2;
         /// Automatic italicization of math variables.
+        #[cfg(feature = "gecko")]
         const MATH_AUTO = 1 << 3;
 
         /// All the case transforms, which are exclusive with each other.
+        #[cfg(feature = "gecko")]
         const CASE_TRANSFORMS = Self::UPPERCASE.0 | Self::LOWERCASE.0 | Self::CAPITALIZE.0 | Self::MATH_AUTO.0;
+        /// All the case transforms, which are exclusive with each other.
+        #[cfg(feature = "servo")]
+        const CASE_TRANSFORMS = Self::UPPERCASE.0 | Self::LOWERCASE.0 | Self::CAPITALIZE.0;
 
         /// full-width
         const FULL_WIDTH = 1 << 4;
@@ -428,6 +433,19 @@ impl TextTransform {
         // Case bits are exclusive with each other.
         case.is_empty() || case.bits().is_power_of_two()
     }
+
+    /// Returns the corresponding TextTransformCase.
+    pub fn case(&self) -> TextTransformCase {
+        match *self & Self::CASE_TRANSFORMS {
+            Self::NONE => TextTransformCase::None,
+            Self::UPPERCASE => TextTransformCase::Uppercase,
+            Self::LOWERCASE => TextTransformCase::Lowercase,
+            Self::CAPITALIZE => TextTransformCase::Capitalize,
+            #[cfg(feature = "gecko")]
+            Self::MATH_AUTO => TextTransformCase::MathAuto,
+            _ => unreachable!("Case bits are exclusive with each other"),
+        }
+    }
 }
 
 /// Specified and computed value of text-align-last.

style/values/specified/text.rs

@@ -13,20 +13,19 @@ path = "lib.rs"
 
 [features]
 servo = ["stylo_atoms", "cssparser/serde", "url", "euclid/serde"]
-gecko = ["nsstring"]
+gecko = []
 
 [dependencies]
 app_units = "0.7"
 bitflags = "2"
 cssparser = "0.34"
 euclid = "0.22"
 malloc_size_of = { path = "../malloc_size_of" }
-malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
-nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true}
+malloc_size_of_derive = "0.1"
 selectors = { path = "../selectors" }
 serde = "1.0"
 servo_arc = { path = "../servo_arc" }
-stylo_atoms = { path = "../atoms", optional = true }
+stylo_atoms = { path = "../stylo_atoms", optional = true }
 thin-vec = "0.2"
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }

style_traits/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "stylo_atoms"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+documentation = "https://docs.rs/stylo_atoms/"
+description = "Interned string type for the Servo and Stylo projects"
+repository = "https://github.com/servo/stylo"
+license = "MPL-2.0"
+edition = "2018"
+build = "build.rs"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+string_cache = "0.8"
+
+[build-dependencies]
+string_cache_codegen = "0.5"