From 46df06b3e2823fe09e3fcc7a31605a90e5327753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 22 Jun 2020 09:45:40 +0000
Subject: [PATCH 001/156] style: Use mozilla::Length rather than nscoord to
 store font sizes.

This avoids arbitrary precision loss when computing REM units and so on,
which is particularly important if we ever change the base of our app
units (but useful regardless).

Differential Revision: https://phabricator.services.mozilla.com/D79928
---
 components/style/gecko/media_queries.rs       | 35 ++++++------
 components/style/gecko/wrapper.rs             | 57 +++++++++++--------
 components/style/properties/cascade.rs        | 27 +++++----
 components/style/properties/gecko.mako.rs     | 42 +++++---------
 .../style/properties/longhands/font.mako.rs   |  3 +-
 components/style/servo/media_queries.rs       | 14 ++---
 components/style/style_adjuster.rs            |  5 +-
 components/style/values/computed/font.rs      |  2 +-
 components/style/values/computed/length.rs    |  6 ++
 components/style/values/computed/mod.rs       |  2 +-
 components/style/values/specified/font.rs     |  4 +-
 components/style/values/specified/length.rs   |  2 +-
 12 files changed, 99 insertions(+), 100 deletions(-)

diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs
index 27cb666fc6f..663acae7b6e 100644
--- a/components/style/gecko/media_queries.rs
+++ b/components/style/gecko/media_queries.rs
@@ -11,6 +11,7 @@ use crate::gecko_bindings::structs;
 use crate::media_queries::MediaType;
 use crate::properties::ComputedValues;
 use crate::string_cache::Atom;
+use crate::values::computed::Length;
 use crate::values::specified::font::FONT_MEDIUM_PX;
 use crate::values::{CustomIdent, KeyframesName};
 use app_units::{Au, AU_PER_PX};
@@ -19,7 +20,7 @@ use euclid::default::Size2D;
 use euclid::{Scale, SideOffsets2D};
 use servo_arc::Arc;
 use std::fmt;
-use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel};
 
@@ -30,15 +31,16 @@ pub struct Device {
     /// `Device`, so having a raw document pointer here is fine.
     document: *const structs::Document,
     default_values: Arc<ComputedValues>,
-    /// The font size of the root element
-    /// This is set when computing the style of the root
-    /// element, and used for rem units in other elements.
+    /// The font size of the root element.
     ///
-    /// When computing the style of the root element, there can't be any
-    /// other style being computed at the same time, given we need the style of
-    /// the parent to compute everything else. So it is correct to just use
-    /// a relaxed atomic here.
-    root_font_size: AtomicIsize,
+    /// This is set when computing the style of the root element, and used for
+    /// rem units in other elements.
+    ///
+    /// When computing the style of the root element, there can't be any other
+    /// style being computed at the same time, given we need the style of the
+    /// parent to compute everything else. So it is correct to just use a
+    /// relaxed atomic here.
+    root_font_size: AtomicU32,
     /// The body text color, stored as an `nscolor`, used for the "tables
     /// inherit from body" quirk.
     ///
@@ -85,8 +87,7 @@ impl Device {
         Device {
             document,
             default_values: ComputedValues::default_values(doc),
-            // FIXME(bz): Seems dubious?
-            root_font_size: AtomicIsize::new(Au::from_px(FONT_MEDIUM_PX as i32).0 as isize),
+            root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()),
             body_text_color: AtomicUsize::new(prefs.mDefaultColor as usize),
             used_root_font_size: AtomicBool::new(false),
             used_viewport_size: AtomicBool::new(false),
@@ -131,15 +132,15 @@ impl Device {
     }
 
     /// Get the font size of the root element (for rem)
-    pub fn root_font_size(&self) -> Au {
+    pub fn root_font_size(&self) -> Length {
         self.used_root_font_size.store(true, Ordering::Relaxed);
-        Au::new(self.root_font_size.load(Ordering::Relaxed) as i32)
+        Length::new(f32::from_bits(self.root_font_size.load(Ordering::Relaxed)))
     }
 
     /// Set the font size of the root element (for rem)
-    pub fn set_root_font_size(&self, size: Au) {
+    pub fn set_root_font_size(&self, size: Length) {
         self.root_font_size
-            .store(size.0 as isize, Ordering::Relaxed)
+            .store(size.px().to_bits(), Ordering::Relaxed)
     }
 
     /// Sets the body text color for the "inherit color from body" quirk.
@@ -298,13 +299,13 @@ impl Device {
 
     /// Applies text zoom to a font-size or line-height value (see nsStyleFont::ZoomText).
     #[inline]
-    pub fn zoom_text(&self, size: Au) -> Au {
+    pub fn zoom_text(&self, size: Length) -> Length {
         size.scale_by(self.effective_text_zoom())
     }
 
     /// Un-apply text zoom.
     #[inline]
-    pub fn unzoom_text(&self, size: Au) -> Au {
+    pub fn unzoom_text(&self, size: Length) -> Length {
         size.scale_by(1. / self.effective_text_zoom())
     }
 
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 8184ccaa3e4..d6c8e267a3c 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -71,7 +71,6 @@ use crate::values::computed::font::GenericFontFamily;
 use crate::values::computed::Length;
 use crate::values::specified::length::FontBaseSize;
 use crate::CaseSensitivityExt;
-use app_units::Au;
 use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -922,14 +921,12 @@ fn get_animation_rule(
 #[derive(Debug)]
 /// Gecko font metrics provider
 pub struct GeckoFontMetricsProvider {
-    /// Cache of base font sizes for each language
+    /// Cache of base font sizes for each language. Usually will have 1 element.
     ///
-    /// Usually will have 1 element.
-    ///
-    // This may be slow on pages using more languages, might be worth optimizing
-    // by caching lang->group mapping separately and/or using a hashmap on larger
-    // loads.
-    pub font_size_cache: RefCell<Vec<(Atom, crate::gecko_bindings::structs::FontSizePrefs)>>,
+    /// This may be slow on pages using more languages, might be worth
+    /// optimizing by caching lang->group mapping separately and/or using a
+    /// hashmap on larger loads.
+    pub font_size_cache: RefCell<Vec<(Atom, DefaultFontSizes)>>,
 }
 
 impl GeckoFontMetricsProvider {
@@ -952,8 +949,9 @@ impl FontMetricsProvider for GeckoFontMetricsProvider {
             return sizes.1.size_for_generic(font_family);
         }
         let sizes = unsafe { bindings::Gecko_GetBaseSize(font_name.as_ptr()) };
+        let size = sizes.size_for_generic(font_family);
         cache.push((font_name.clone(), sizes));
-        sizes.size_for_generic(font_family)
+        size
     }
 
     fn query(
@@ -967,7 +965,7 @@ impl FontMetricsProvider for GeckoFontMetricsProvider {
             None => return Default::default(),
         };
 
-        let size = Au::from(base_size.resolve(context));
+        let size = base_size.resolve(context);
         let style = context.style();
 
         let (wm, font) = match base_size {
@@ -987,15 +985,15 @@ impl FontMetricsProvider for GeckoFontMetricsProvider {
                 pc,
                 vertical_metrics,
                 font.gecko(),
-                size.0,
+                size,
                 // we don't use the user font set in a media query
                 !context.in_media_query,
             )
         };
         FontMetrics {
-            x_height: Some(Au(gecko_metrics.mXSize).into()),
-            zero_advance_measure: if gecko_metrics.mChSize >= 0 {
-                Some(Au(gecko_metrics.mChSize).into())
+            x_height: Some(gecko_metrics.mXSize),
+            zero_advance_measure: if gecko_metrics.mChSize.px() >= 0. {
+                Some(gecko_metrics.mChSize)
             } else {
                 None
             },
@@ -1003,20 +1001,31 @@ impl FontMetricsProvider for GeckoFontMetricsProvider {
     }
 }
 
-impl structs::FontSizePrefs {
+/// The default font sizes for generic families for a given language group.
+#[derive(Debug)]
+#[repr(C)]
+pub struct DefaultFontSizes {
+    variable: Length,
+    serif: Length,
+    sans_serif: Length,
+    monospace: Length,
+    cursive: Length,
+    fantasy: Length,
+}
+
+impl DefaultFontSizes {
     fn size_for_generic(&self, font_family: GenericFontFamily) -> Length {
-        Au(match font_family {
-            GenericFontFamily::None => self.mDefaultVariableSize,
-            GenericFontFamily::Serif => self.mDefaultSerifSize,
-            GenericFontFamily::SansSerif => self.mDefaultSansSerifSize,
-            GenericFontFamily::Monospace => self.mDefaultMonospaceSize,
-            GenericFontFamily::Cursive => self.mDefaultCursiveSize,
-            GenericFontFamily::Fantasy => self.mDefaultFantasySize,
+        match font_family {
+            GenericFontFamily::None => self.variable,
+            GenericFontFamily::Serif => self.serif,
+            GenericFontFamily::SansSerif => self.sans_serif,
+            GenericFontFamily::Monospace => self.monospace,
+            GenericFontFamily::Cursive => self.cursive,
+            GenericFontFamily::Fantasy => self.fantasy,
             GenericFontFamily::MozEmoji => unreachable!(
                 "Should never get here, since this doesn't (yet) appear on font family"
             ),
-        })
-        .into()
+        }
     }
 }
 
diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 595534bd974..11f3beb2481 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -845,7 +845,6 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
     fn recompute_keyword_font_size_if_needed(&mut self) {
         use crate::values::computed::ToComputedValue;
         use crate::values::specified;
-        use app_units::Au;
 
         if !self.seen.contains(LonghandId::XLang) &&
            !self.seen.contains(LonghandId::FontFamily) {
@@ -863,7 +862,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 }
             };
 
-            if font.gecko().mScriptUnconstrainedSize == Au::from(new_size.size()).0 {
+            if font.gecko().mScriptUnconstrainedSize == new_size.size {
                 return;
             }
 
@@ -878,6 +877,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
     #[cfg(feature = "gecko")]
     fn constrain_font_size_if_needed(&mut self) {
         use crate::gecko_bindings::bindings;
+        use crate::values::generics::NonNegative;
 
         if !self.seen.contains(LonghandId::XLang) &&
            !self.seen.contains(LonghandId::FontFamily) &&
@@ -896,11 +896,11 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 )
             };
 
-            if font.mFont.size >= min_font_size {
+            if font.mFont.size.0 >= min_font_size {
                 return;
             }
 
-            min_font_size
+            NonNegative(min_font_size)
         };
 
         builder.mutate_font().gecko_mut().mFont.size = min_font_size;
@@ -942,8 +942,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
     /// not clear to me. For now just pretend those don't exist here.
     #[cfg(feature = "gecko")]
     fn handle_mathml_scriptlevel_if_needed(&mut self) {
-        use app_units::Au;
-        use std::cmp;
+        use crate::values::generics::NonNegative;
 
         if !self.seen.contains(LonghandId::MozScriptLevel) &&
            !self.seen.contains(LonghandId::MozScriptMinSize) &&
@@ -968,14 +967,14 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 return;
             }
 
-            let mut min = Au(parent_font.mScriptMinSize);
+            let mut min = parent_font.mScriptMinSize;
             if font.mAllowZoomAndMinSize {
                 min = builder.device.zoom_text(min);
             }
 
             let scale = (parent_font.mScriptSizeMultiplier as f32).powi(delta as i32);
-            let parent_size = Au(parent_font.mSize);
-            let parent_unconstrained_size = Au(parent_font.mScriptUnconstrainedSize);
+            let parent_size = parent_font.mSize.0;
+            let parent_unconstrained_size = parent_font.mScriptUnconstrainedSize.0;
             let new_size = parent_size.scale_by(scale);
             let new_unconstrained_size = parent_unconstrained_size.scale_by(scale);
 
@@ -987,7 +986,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 if parent_size <= min {
                     (parent_size, new_unconstrained_size)
                 } else {
-                    (cmp::max(min, new_size), new_unconstrained_size)
+                    (min.max(new_size), new_unconstrained_size)
                 }
             } else {
                 // If the new unconstrained size is larger than the min size,
@@ -996,15 +995,15 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 // However, if the new size is even larger (perhaps due to usage
                 // of em units), use that instead.
                 (
-                    cmp::min(new_size, cmp::max(new_unconstrained_size, min)),
+                    new_size.min(new_unconstrained_size.max(min)),
                     new_unconstrained_size
                 )
             }
         };
         let font = builder.mutate_font().gecko_mut();
-        font.mFont.size = new_size.0;
-        font.mSize = new_size.0;
-        font.mScriptUnconstrainedSize = new_unconstrained_size.0;
+        font.mFont.size = NonNegative(new_size);
+        font.mSize = NonNegative(new_size);
+        font.mScriptUnconstrainedSize = NonNegative(new_unconstrained_size);
     }
 
     /// Various properties affect how font-size and font-family are computed.
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index a8e246b4a0e..80199caa563 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -376,18 +376,6 @@ def set_gecko_property(ffi_name, expr):
 <%call expr="impl_simple_clone(ident, gecko_ffi_name)"></%call>
 </%def>
 
-<%def name="impl_absolute_length(ident, gecko_ffi_name)">
-    #[allow(non_snake_case)]
-    pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
-        ${set_gecko_property(gecko_ffi_name, "v.to_i32_au()")}
-    }
-    <%call expr="impl_simple_copy(ident, gecko_ffi_name)"></%call>
-    #[allow(non_snake_case)]
-    pub fn clone_${ident}(&self) -> longhands::${ident}::computed_value::T {
-        Au(self.gecko.${gecko_ffi_name}).into()
-    }
-</%def>
-
 <%def name="impl_non_negative_length(ident, gecko_ffi_name, inherit_from=None,
                                      round_to_pixels=False)">
     #[allow(non_snake_case)]
@@ -593,11 +581,6 @@ impl Clone for ${style_struct.gecko_struct_name} {
     longhands = [x for x in style_struct.longhands
                 if not (skip_longhands == "*" or x.name in skip_longhands.split())]
 
-    # Types used with predefined_type()-defined properties that we can auto-generate.
-    predefined_types = {
-        "MozScriptMinSize": impl_absolute_length,
-    }
-
     def longhand_method(longhand):
         args = dict(ident=longhand.ident, gecko_ffi_name=longhand.gecko_ffi_name)
 
@@ -610,8 +593,6 @@ impl Clone for ${style_struct.gecko_struct_name} {
             args.update(keyword=longhand.keyword)
             if "font" in longhand.ident:
                 args.update(cast_type=longhand.cast_type)
-        elif longhand.predefined_type in predefined_types:
-            method = predefined_types[longhand.predefined_type]
         else:
             method = impl_simple
 
@@ -920,9 +901,10 @@ fn static_assert() {
     }
 
     pub fn unzoom_fonts(&mut self, device: &Device) {
-        self.gecko.mSize = device.unzoom_text(Au(self.gecko.mSize)).0;
-        self.gecko.mScriptUnconstrainedSize = device.unzoom_text(Au(self.gecko.mScriptUnconstrainedSize)).0;
-        self.gecko.mFont.size = device.unzoom_text(Au(self.gecko.mFont.size)).0;
+        use crate::values::generics::NonNegative;
+        self.gecko.mSize = NonNegative(device.unzoom_text(self.gecko.mSize.0));
+        self.gecko.mScriptUnconstrainedSize = NonNegative(device.unzoom_text(self.gecko.mScriptUnconstrainedSize.0));
+        self.gecko.mFont.size = NonNegative(device.unzoom_text(self.gecko.mFont.size.0));
     }
 
     pub fn copy_font_size_from(&mut self, other: &Self) {
@@ -942,25 +924,27 @@ fn static_assert() {
     }
 
     pub fn set_font_size(&mut self, v: FontSize) {
-        let size = Au::from(v.size());
-        self.gecko.mScriptUnconstrainedSize = size.0;
+        let size = v.size;
+        self.gecko.mScriptUnconstrainedSize = size;
 
         // These two may be changed from Cascade::fixup_font_stuff.
-        self.gecko.mSize = size.0;
-        self.gecko.mFont.size = size.0;
+        self.gecko.mSize = size;
+        self.gecko.mFont.size = size;
+
         self.gecko.mFontSizeKeyword = v.keyword_info.kw;
         self.gecko.mFontSizeFactor = v.keyword_info.factor;
-        self.gecko.mFontSizeOffset = v.keyword_info.offset.to_i32_au();
+        self.gecko.mFontSizeOffset = v.keyword_info.offset;
     }
 
     pub fn clone_font_size(&self) -> FontSize {
         use crate::values::specified::font::KeywordInfo;
+
         FontSize {
-            size: Au(self.gecko.mSize).into(),
+            size: self.gecko.mSize,
             keyword_info: KeywordInfo {
                 kw: self.gecko.mFontSizeKeyword,
                 factor: self.gecko.mFontSizeFactor,
-                offset: Au(self.gecko.mFontSizeOffset).into()
+                offset: self.gecko.mFontSizeOffset,
             }
         }
     }
diff --git a/components/style/properties/longhands/font.mako.rs b/components/style/properties/longhands/font.mako.rs
index 86575720eba..2ed226f781d 100644
--- a/components/style/properties/longhands/font.mako.rs
+++ b/components/style/properties/longhands/font.mako.rs
@@ -307,7 +307,6 @@ ${helpers.predefined_type(
         //! variable reference. We may want to improve this behavior at some
         //! point. See also https://github.com/w3c/csswg-drafts/issues/1586.
 
-        use app_units::Au;
         use cssparser::{Parser, ToCss};
         use crate::values::computed::font::GenericFontFamily;
         use crate::properties::longhands;
@@ -397,7 +396,7 @@ ${helpers.predefined_type(
                         is_system_font: true,
                     },
                     font_size: FontSize {
-                        size: NonNegative(cx.maybe_zoom_text(Au(system.size).into())),
+                        size: NonNegative(cx.maybe_zoom_text(system.size.0)),
                         keyword_info: KeywordInfo::none()
                     },
                     font_weight,
diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs
index 8c0ac014437..039bcf95e29 100644
--- a/components/style/servo/media_queries.rs
+++ b/components/style/servo/media_queries.rs
@@ -17,7 +17,7 @@ use app_units::Au;
 use cssparser::RGBA;
 use euclid::default::Size2D as UntypedSize2D;
 use euclid::{Scale, SideOffsets2D, Size2D};
-use std::sync::atomic::{AtomicBool, AtomicIsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel};
 
@@ -43,7 +43,7 @@ pub struct Device {
     /// the parent to compute everything else. So it is correct to just use
     /// a relaxed atomic here.
     #[ignore_malloc_size_of = "Pure stack type"]
-    root_font_size: AtomicIsize,
+    root_font_size: AtomicU32,
     /// Whether any styles computed in the document relied on the root font-size
     /// by using rem units.
     #[ignore_malloc_size_of = "Pure stack type"]
@@ -68,7 +68,7 @@ impl Device {
             viewport_size,
             device_pixel_ratio,
             // FIXME(bz): Seems dubious?
-            root_font_size: AtomicIsize::new(Au::from_px(FONT_MEDIUM_PX).0 as isize),
+            root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()),
             used_root_font_size: AtomicBool::new(false),
             used_viewport_units: AtomicBool::new(false),
             environment: CssEnvironment,
@@ -90,15 +90,15 @@ impl Device {
     }
 
     /// Get the font size of the root element (for rem)
-    pub fn root_font_size(&self) -> Au {
+    pub fn root_font_size(&self) -> CSSPixelLength {
         self.used_root_font_size.store(true, Ordering::Relaxed);
-        Au::new(self.root_font_size.load(Ordering::Relaxed) as i32)
+        CSSPixelLength::new(f32::from_bits(self.root_font_size.load(Ordering::Relaxed)))
     }
 
     /// Set the font size of the root element (for rem)
-    pub fn set_root_font_size(&self, size: Au) {
+    pub fn set_root_font_size(&self, size: CSSPixelLength) {
         self.root_font_size
-            .store(size.0 as isize, Ordering::Relaxed)
+            .store(size.px().to_bits(), Ordering::Relaxed)
     }
 
     /// Sets the body text color for the "inherit color from body" quirk.
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index c2a15f7fa0e..712e0d68c4b 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -12,7 +12,6 @@ use crate::properties::longhands::float::computed_value::T as Float;
 use crate::properties::longhands::overflow_x::computed_value::T as Overflow;
 use crate::properties::longhands::position::computed_value::T as Position;
 use crate::properties::{self, ComputedValues, StyleBuilder};
-use app_units::Au;
 
 /// A struct that implements all the adjustment methods.
 ///
@@ -414,7 +413,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
             .none_or_hidden() &&
             self.style.get_outline().outline_has_nonzero_width()
         {
-            self.style.mutate_outline().set_outline_width(Au(0).into());
+            self.style
+                .mutate_outline()
+                .set_outline_width(crate::Zero::zero());
         }
     }
 
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index b8d2cb4c680..af56e59abd3 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -156,7 +156,7 @@ impl FontSize {
     /// Get default value of font size.
     pub fn medium() -> Self {
         Self {
-            size: NonNegative(Length::new(specified::FONT_MEDIUM_PX as CSSFloat)),
+            size: NonNegative(Length::new(specified::FONT_MEDIUM_PX)),
             keyword_info: KeywordInfo::medium(),
         }
     }
diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
index 9a7e2cbb1a4..2cca9f71b78 100644
--- a/components/style/values/computed/length.rs
+++ b/components/style/values/computed/length.rs
@@ -224,6 +224,12 @@ impl CSSPixelLength {
         CSSPixelLength(px)
     }
 
+    /// Scale the length by a given amount.
+    #[inline]
+    pub fn scale_by(self, scale: CSSFloat) -> Self {
+        CSSPixelLength(self.0 * scale)
+    }
+
     /// Return the containing pixel value.
     #[inline]
     pub fn px(self) -> CSSFloat {
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index c05fb1ef0fe..aa13ff89d7c 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -232,7 +232,7 @@ impl<'a> Context<'a> {
         // -x-text-zoom property, which leads to a false value
         // in mAllowZoomAndMinSize
         if self.style().get_font().gecko.mAllowZoomAndMinSize {
-            self.device().zoom_text(Au::from(size)).into()
+            self.device().zoom_text(size)
         } else {
             size
         }
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 49368548f98..05862f6aba7 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -787,13 +787,13 @@ impl ToComputedValue for FontSizeAdjust {
 const LARGER_FONT_SIZE_RATIO: f32 = 1.2;
 
 /// The default font size.
-pub const FONT_MEDIUM_PX: i32 = 16;
+pub const FONT_MEDIUM_PX: f32 = 16.0;
 
 impl FontSizeKeyword {
     #[inline]
     #[cfg(feature = "servo")]
     fn to_length(&self, _: &Context) -> NonNegativeLength {
-        let medium = Length::new(FONT_MEDIUM_PX as f32);
+        let medium = Length::new(FONT_MEDIUM_PX);
         // https://drafts.csswg.org/css-fonts-3/#font-size-prop
         NonNegative(match *self {
             FontSizeKeyword::XXSmall => medium * 3.0 / 5.0,
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
index bf81a4d5e3d..64a2e8cf5db 100644
--- a/components/style/values/specified/length.rs
+++ b/components/style/values/specified/length.rs
@@ -241,7 +241,7 @@ impl FontRelativeLength {
                 let reference_size = if context.builder.is_root_element || context.in_media_query {
                     reference_font_size
                 } else {
-                    computed::Length::new(context.device().root_font_size().to_f32_px())
+                    context.device().root_font_size()
                 };
                 (reference_size, length)
             },

From 8ff565c86bd278c2f92819ad1217f55fcb6fd5b5 Mon Sep 17 00:00:00 2001
From: Zeke Medley <zekemedley@gmail.com>
Date: Mon, 29 Jun 2020 17:46:12 +0000
Subject: [PATCH 002/156] style: Implement the prefers-contrast media-query.

Differential Revision: https://phabricator.services.mozilla.com/D79553
---
 components/style/gecko/media_features.rs      | 60 ++++++++++++++++++-
 .../media_queries/media_feature_expression.rs | 10 +++-
 components/style/properties/gecko.mako.rs     |  5 +-
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index a02ddcfd688..f3b8297439f 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -308,6 +308,53 @@ fn eval_prefers_reduced_motion(device: &Device, query_value: Option<PrefersReduc
     }
 }
 
+/// Possible values for prefers-contrast media query.
+/// https://drafts.csswg.org/mediaqueries-5/#prefers-contrast
+#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq, Parse, ToCss)]
+#[repr(u8)]
+#[allow(missing_docs)]
+enum PrefersContrast {
+    High,
+    Low,
+    NoPreference,
+    Forced,
+}
+
+/// Represents the parts of prefers-contrast that explicitly deal with
+/// contrast. Used in combination with information about rather or not
+/// forced colors are active this allows for evaluation of the
+/// prefers-contrast media query.
+#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq)]
+#[repr(u8)]
+pub enum ContrastPref {
+    /// High contrast is prefered. Corresponds to an accessibility theme
+    /// being enabled or firefox forcing high contrast colors.
+    High,
+    /// Low contrast is prefered. Corresponds to the
+    /// browser.display.prefers_low_contrast pref being true.
+    Low,
+    /// The default value if neither high or low contrast is enabled.
+    NoPreference,
+}
+
+/// https://drafts.csswg.org/mediaqueries-5/#prefers-contrast
+fn eval_prefers_contrast(device: &Device, query_value: Option<PrefersContrast>) -> bool {
+    let forced_colors = !device.use_document_colors();
+    let contrast_pref =
+        unsafe { bindings::Gecko_MediaFeatures_PrefersContrast(device.document(), forced_colors) };
+    if let Some(query_value) = query_value {
+        match query_value {
+            PrefersContrast::Forced => forced_colors,
+            PrefersContrast::High => contrast_pref == ContrastPref::High,
+            PrefersContrast::Low => contrast_pref == ContrastPref::Low,
+            PrefersContrast::NoPreference => contrast_pref == ContrastPref::NoPreference,
+        }
+    } else {
+        // Only prefers-contrast: no-preference evaluates to false.
+        forced_colors || (contrast_pref != ContrastPref::NoPreference)
+    }
+}
+
 #[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum OverflowBlock {
@@ -548,7 +595,7 @@ macro_rules! system_metric_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 53] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 54] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -666,6 +713,17 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 53] = [
         keyword_evaluator!(eval_prefers_reduced_motion, PrefersReducedMotion),
         ParsingRequirements::empty(),
     ),
+    feature!(
+        atom!("prefers-contrast"),
+        AllowsRanges::No,
+        keyword_evaluator!(eval_prefers_contrast, PrefersContrast),
+        // Note: by default this is only enabled in browser chrome and
+        // ua. It can be enabled on the web via the
+        // layout.css.prefers-contrast.enabled preference. See
+        // disabed_by_pref in media_feature_expression.rs for how that
+        // is done.
+        ParsingRequirements::empty(),
+    ),
     feature!(
         atom!("overflow-block"),
         AllowsRanges::No,
diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs
index 61e62f4ab70..0d2262f1def 100644
--- a/components/style/media_queries/media_feature_expression.rs
+++ b/components/style/media_queries/media_feature_expression.rs
@@ -218,12 +218,18 @@ fn consume_operation_or_colon(input: &mut Parser) -> Result<Option<Operator>, ()
 }
 
 #[allow(unused_variables)]
-fn disabled_by_pref(feature: &Atom) -> bool {
+fn disabled_by_pref(feature: &Atom, context: &ParserContext) -> bool {
     #[cfg(feature = "gecko")]
     {
         if *feature == atom!("-moz-touch-enabled") {
             return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled");
         }
+        // prefers-contrast is always enabled in the ua and chrome. On
+        // the web it is hidden behind a preference.
+        if *feature == atom!("prefers-contrast") {
+            return !context.in_ua_or_chrome_sheet() &&
+                !static_prefs::pref!("layout.css.prefers-contrast.enabled");
+        }
     }
     false
 }
@@ -305,7 +311,7 @@ impl MediaFeatureExpression {
             },
         };
 
-        if disabled_by_pref(&feature.name) ||
+        if disabled_by_pref(&feature.name, context) ||
             !requirements.contains(feature.requirements) ||
             (range.is_some() && !feature.allows_ranges())
         {
diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs
index 80199caa563..9bb13eb62b0 100644
--- a/components/style/properties/gecko.mako.rs
+++ b/components/style/properties/gecko.mako.rs
@@ -2089,7 +2089,9 @@ pub fn assert_initial_values_match(data: &PerDocumentStyleData) {
         let data = data.borrow();
         let cv = data.stylist.device().default_computed_values();
         <%
-            # Skip properties with initial values that change at computed value time.
+            # Skip properties with initial values that change at computed
+            # value time, or whose initial value depends on the document
+            # / other prefs.
             SKIPPED = [
                 "border-top-width",
                 "border-bottom-width",
@@ -2098,6 +2100,7 @@ pub fn assert_initial_values_match(data: &PerDocumentStyleData) {
                 "font-family",
                 "font-size",
                 "outline-width",
+                "color",
             ]
             TO_TEST = [p for p in data.longhands if p.enabled_in != "" and not p.logical and not p.name in SKIPPED]
         %>

From 75b38efefd101441ac1f2a84f54acbe6ca4c39d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 30 Jun 2020 22:31:22 +0000
Subject: [PATCH 003/156] style: Have the destructor of CalcNode be never
 inline.

You tell me which other things need it... Copy-constructor? operator==?
and such?

Differential Revision: https://phabricator.services.mozilla.com/D73385
---
 components/style/values/generics/calc.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/style/values/generics/calc.rs b/components/style/values/generics/calc.rs
index cd331818386..0d791e5d00d 100644
--- a/components/style/values/generics/calc.rs
+++ b/components/style/values/generics/calc.rs
@@ -60,6 +60,13 @@ pub enum SortKey {
 ///
 /// FIXME: This would be much more elegant if we used `Self` in the types below,
 /// but we can't because of https://github.com/serde-rs/serde/issues/1565.
+///
+/// FIXME: The following annotations are to workaround an LLVM inlining bug, see
+/// bug 1631929.
+///
+/// cbindgen:destructor-attributes=MOZ_NEVER_INLINE
+/// cbindgen:copy-constructor-attributes=MOZ_NEVER_INLINE
+/// cbindgen:eq-attributes=MOZ_NEVER_INLINE
 #[repr(u8)]
 #[derive(
     Clone,

From 87612b65c57f0e8b7d39db8c21d138e60a350840 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 3 Jul 2020 04:06:13 +0000
Subject: [PATCH 004/156] style: Remove unused StyleAppearance values.

The parsing of these values was disabled in bug 1554150.

Differential Revision: https://phabricator.services.mozilla.com/D82122
---
 components/style/values/specified/box.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 4519a60aaa0..5c1d6c298f6 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1536,16 +1536,9 @@ pub enum Appearance {
     ButtonArrowPrevious,
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ButtonArrowUp,
-    /// A rectangular button that contains complex content
-    /// like images (e.g. HTML <button> elements)
-    #[css(skip)]
-    ButtonBevel,
     /// The focus outline box inside of a button.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ButtonFocus,
-    /// The caret of a text area
-    #[css(skip)]
-    Caret,
     /// A dual toolbar button (e.g., a Back button with a dropdown)
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Dualbutton,
@@ -1556,9 +1549,6 @@ pub enum Appearance {
     InnerSpinButton,
     /// List boxes.
     Listbox,
-    /// A listbox item.
-    #[css(skip)]
-    Listitem,
     /// Menu Bar background
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Menubar,
@@ -1579,9 +1569,6 @@ pub enum Appearance {
     /// The text part of a dropdown list, to left of button.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MenulistText,
-    /// An editable textfield with a dropdown list (a combobox).
-    #[css(skip)]
-    MenulistTextfield,
     /// Menu Popup background.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Menupopup,

From 1f9d6ad5ef80d3dc743c691c8c42d2f1f2669e51 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 3 Jul 2020 04:11:18 +0000
Subject: [PATCH 005/156] style: Remove unused function on Appearance.

Differential Revision: https://phabricator.services.mozilla.com/D82124
---
 components/style/values/specified/box.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 5c1d6c298f6..6199ed2275d 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1847,14 +1847,6 @@ pub enum Appearance {
     Count,
 }
 
-impl Appearance {
-    /// Returns whether we're the `none` value.
-    #[inline]
-    pub fn is_none(self) -> bool {
-        self == Appearance::None
-    }
-}
-
 /// A kind of break between two boxes.
 ///
 /// https://drafts.csswg.org/css-break/#break-between

From 1c8d4be6b22796cb5b35e1f10ff52803ad0f6a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 6 Jul 2020 16:26:20 +0000
Subject: [PATCH 006/156] style: Fix an off-by-one in the transition property
 iterator.

By the time we get to iterate over the longhands of a shorthand, we've
already advanced the range iterator, so we look at the next duration and
such, which causes this bug.

I'm seriously baffled that no existing test caught this when it
landed, neither in our internal test suite nor wpt...  :/

Differential Revision: https://phabricator.services.mozilla.com/D82396
---
 components/style/properties/helpers/animated_properties.mako.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs
index 304f026deda..f2fc745c57b 100644
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@@ -820,7 +820,7 @@ impl<'a> Iterator for TransitionPropertyIterator<'a> {
                 if let Some(longhand_id) = longhand_iterator.next() {
                     return Some(TransitionPropertyIteration {
                         longhand_id,
-                        index: self.index_range.start,
+                        index: self.index_range.start - 1,
                     });
                 }
                 self.longhand_iterator = None;

From 9d3876bda08e0b7e115b13260f06aecac1fe0d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 15 Jul 2020 03:45:33 +0000
Subject: [PATCH 007/156] style: Apply a grayscale filter to pages when
 monochrome.

This hooks the "monochrome" media query and co to the
nsIPrintSettings.printInColor setting.

This print setting we're using is not exposed in the print preview UI,
but you can test it setting the print.print_in_color preference to
"false", and then print preview will correctly show up greyscale'd.

Once this lands, the UI folks just have to use it as they see fit :)

I would've liked to add a proper rendering test, but the print reftests
check only whether the PDF text matches.

I could add a test to printpreview_helper.xhtml, but I'm refactoring
that file in bug 1648064 so I'd rather wait a bit and add it in a
separate bug. The test for the media feature should make sure that we
test that code path at least.

Differential Revision: https://phabricator.services.mozilla.com/D83552
---
 components/style/gecko/media_features.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index f3b8297439f..0a86980167c 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -247,13 +247,12 @@ fn eval_color_index(
 
 /// https://drafts.csswg.org/mediaqueries-4/#monochrome
 fn eval_monochrome(
-    _: &Device,
+    device: &Device,
     query_value: Option<u32>,
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
     // For color devices we should return 0.
-    // FIXME: On a monochrome device, return the actual color depth, not 0!
-    let depth = 0;
+    let depth = unsafe { bindings::Gecko_MediaFeatures_GetMonochromeBitsPerPixel(device.document()) };
     RangeOrOperator::evaluate(range_or_operator, query_value, depth)
 }
 

From 01efe3a45988b6918d13b1899678d86910abe64e Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:11 +0000
Subject: [PATCH 008/156] style: Add unprefixed appearance property and make
 -moz-appearance and -webkit-appearance be aliases.

Differential Revision: https://phabricator.services.mozilla.com/D83428
---
 components/style/properties/longhands/box.mako.rs | 13 +++++--------
 components/style/style_adjuster.rs                |  4 ++--
 components/style/values/specified/box.rs          |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 943bd0f27ff..18a46bc18f2 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -615,22 +615,19 @@ ${helpers.predefined_type(
     spec="https://drafts.csswg.org/css-contain/#contain-property",
 )}
 
-// Non-standard
 ${helpers.predefined_type(
-    "-moz-appearance",
+    "appearance",
     "Appearance",
     "computed::Appearance::None",
     engines="gecko",
-    alias="-webkit-appearance",
-    spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-appearance)",
+    alias="-moz-appearance -webkit-appearance",
+    spec="https://drafts.csswg.org/css-ui-4/#propdef-appearance",
     animation_value_type="discrete",
     gecko_ffi_name="mAppearance",
 )}
 
-// A UA-sheet only property that is always set to the same value as
-// -moz-appearance.  Used to record telemetry for when author sheets
-// override the value of -moz-appearance; see
-// nsIFrame::RecordAppearanceTelemetry.
+// The inherent widget type of an element, selected by specifying
+// `appearance: auto`.
 ${helpers.predefined_type(
     "-moz-default-appearance",
     "Appearance",
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index 712e0d68c4b..b33458a0f9b 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -763,10 +763,10 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     where
         E: TElement,
     {
-        use crate::properties::longhands::_moz_appearance::computed_value::T as Appearance;
+        use crate::properties::longhands::appearance::computed_value::T as Appearance;
         use crate::properties::longhands::line_height::computed_value::T as LineHeight;
 
-        if self.style.get_box().clone__moz_appearance() == Appearance::Menulist {
+        if self.style.get_box().clone_appearance() == Appearance::Menulist {
             if self.style.get_inherited_text().clone_line_height() == LineHeight::normal() {
                 return;
             }
diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 6199ed2275d..afe1fee3303 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1525,6 +1525,11 @@ pub enum Resize {
 pub enum Appearance {
     /// No appearance at all.
     None,
+    /// Default appearance for the element.
+    ///
+    /// This value doesn't make sense for -moz-default-appearance, but we don't bother to guard
+    /// against parsing it.
+    Auto,
     /// A typical dialog button.
     Button,
     /// Various arrows that go in buttons

From 7ae2f8602e10a9eb47a1ed5690e06345f4ab4e68 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:12 +0000
Subject: [PATCH 009/156] style: Defer to -moz-default-appearance when
 appearance is auto.

Differential Revision: https://phabricator.services.mozilla.com/D83429
---
 components/style/style_adjuster.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index b33458a0f9b..8ab4aea3d21 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -766,7 +766,13 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         use crate::properties::longhands::appearance::computed_value::T as Appearance;
         use crate::properties::longhands::line_height::computed_value::T as LineHeight;
 
-        if self.style.get_box().clone_appearance() == Appearance::Menulist {
+        let box_ = self.style.get_box();
+        let appearance = match box_.clone_appearance() {
+            Appearance::Auto => box_.clone__moz_default_appearance(),
+            a => a,
+        };
+
+        if appearance == Appearance::Menulist {
             if self.style.get_inherited_text().clone_line_height() == LineHeight::normal() {
                 return;
             }

From 845766620494d3c9351161c53323429bfb527e5d Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:14 +0000
Subject: [PATCH 010/156] style: Change internal uses of -moz-appearance to
 appearance and -moz-default-appearance.

Uses of `-moz-appearance: none` are changed to `appearance: none`.

Uses of other values that are simply reverting the appearance back to
its default are changed to `appearance: auto`.

Uses of values in UA sheets that are defining the inherent appearance of
widgets are changed to:

  appearance: auto;
  -moz-default-appearance: <value>;

since those values are either no longer supported on (-moz-)appearance,
or are still supported but only in some limited form.

There are some uses of `-moz-appearance: textfield` on <input
type=number> elements that are renamed to `appearance: textfield`.

Differential Revision: https://phabricator.services.mozilla.com/D83430
---
 components/style/properties/longhands/box.mako.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 18a46bc18f2..ca93fd916ea 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -635,7 +635,7 @@ ${helpers.predefined_type(
     engines="gecko",
     animation_value_type="none",
     spec="Internal (not web-exposed)",
-    enabled_in="ua",
+    enabled_in="chrome",
     gecko_ffi_name="mDefaultAppearance",
 )}
 

From 21b6c69322d7196b580a21a5351f5df6d8b7ac25 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:14 +0000
Subject: [PATCH 011/156] style: Remove appearance values not used by the
 browser or Web content.

Differential Revision: https://phabricator.services.mozilla.com/D83431
---
 components/style/values/specified/box.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index afe1fee3303..b7def063a70 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1550,8 +1550,6 @@ pub enum Appearance {
     /// A groupbox.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Groupbox,
-    /// A inner-spin button.
-    InnerSpinButton,
     /// List boxes.
     Listbox,
     /// Menu Bar background
@@ -1606,8 +1604,6 @@ pub enum Appearance {
     /// The progress bar's progress indicator
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Progresschunk,
-    /// A vertical progress bar.
-    ProgressbarVertical,
     /// A checkbox element.
     Checkbox,
     /// A radio element within a radio group.
@@ -1634,17 +1630,6 @@ pub enum Appearance {
     /// The resizer itself.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Resizer,
-    /// A slider.
-    ScaleHorizontal,
-    ScaleVertical,
-    /// A slider's thumb.
-    ScalethumbHorizontal,
-    ScalethumbVertical,
-    /// If the platform supports it, the left/right chunks of the slider thumb.
-    Scalethumbstart,
-    Scalethumbend,
-    /// The ticks for a slider.
-    Scalethumbtick,
     /// A scrollbar.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Scrollbar,

From ab3791234ec98f948633f814b204c2e0a8423d9e Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:17 +0000
Subject: [PATCH 012/156] style: Mark appearance values that are only used
 internally as chrome-only.

Differential Revision: https://phabricator.services.mozilla.com/D83432
---
 components/style/values/specified/box.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index b7def063a70..42d17b09e6b 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1653,10 +1653,14 @@ pub enum Appearance {
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarbuttonRight,
     /// The scrollbar thumb.
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarthumbHorizontal,
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarthumbVertical,
     /// The scrollbar track.
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbartrackHorizontal,
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbartrackVertical,
     /// The scroll corner
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]

From f03883774b005722ec7014f26beb300473c27e51 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:21 +0000
Subject: [PATCH 013/156] style: Avoid exposing `appearance: range-thumb` to
 content.

Differential Revision: https://phabricator.services.mozilla.com/D83433
---
 components/style/values/specified/box.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 42d17b09e6b..ef53c7b4cfd 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1622,7 +1622,8 @@ pub enum Appearance {
     RadioLabel,
     /// nsRangeFrame and its subparts
     Range,
-    RangeThumb, // FIXME: This should not be exposed to content.
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    RangeThumb,
     /// The resizer background area in a status bar for the resizer widget in
     /// the corner of a window.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]

From 862b7d124902b3054805b90146c0bbd701e124d7 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:24 +0000
Subject: [PATCH 014/156] style: Make `appearance: button` behave like auto on
 various elements.

Differential Revision: https://phabricator.services.mozilla.com/D83434
---
 components/style/properties/data.py           |  1 +
 .../style/properties/longhands/box.mako.rs    | 19 ++++++++++++++
 components/style/values/computed/box.rs       |  4 +--
 components/style/values/computed/mod.rs       |  2 +-
 components/style/values/specified/box.rs      | 25 +++++++++++++++++++
 components/style/values/specified/mod.rs      |  2 +-
 6 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 718b4771663..b68d40e402f 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -334,6 +334,7 @@ class Longhand(object):
                 "BackgroundRepeat",
                 "BorderImageRepeat",
                 "BorderStyle",
+                "ButtonAppearance",
                 "Clear",
                 "ColumnCount",
                 "Contain",
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index ca93fd916ea..32a541481e2 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -639,6 +639,25 @@ ${helpers.predefined_type(
     gecko_ffi_name="mDefaultAppearance",
 )}
 
+// A UA-sheet only property that controls the effect of `appearance: button`
+// on the element: `-moz-button-appearance: allow` means the element is rendered
+// with button appearance, and `-moz-button-appearance: disallow` is treated
+// like `appearance: auto`.
+//
+// https://github.com/w3c/csswg-drafts/issues/5174 proposes to simplify `button`
+// to mean `auto` unconditionally, at which point this property can be removed.
+${helpers.predefined_type(
+    "-moz-button-appearance",
+    "ButtonAppearance",
+    "computed::ButtonAppearance::Allow",
+    engines="gecko",
+    animation_value_type="none",
+    needs_context=False,
+    spec="Internal (not web-exposed)",
+    enabled_in="ua",
+    gecko_ffi_name="mButtonAppearance",
+)}
+
 ${helpers.single_keyword(
     "-moz-orient",
     "inline block horizontal vertical",
diff --git a/components/style/values/computed/box.rs b/components/style/values/computed/box.rs
index d5adeb206a6..8054a9bda58 100644
--- a/components/style/values/computed/box.rs
+++ b/components/style/values/computed/box.rs
@@ -12,8 +12,8 @@ use crate::values::generics::box_::VerticalAlign as GenericVerticalAlign;
 use crate::values::specified::box_ as specified;
 
 pub use crate::values::specified::box_::{AnimationName, Appearance, BreakBetween, BreakWithin};
-pub use crate::values::specified::box_::{Clear as SpecifiedClear, Float as SpecifiedFloat};
-pub use crate::values::specified::box_::{Contain, Display, Overflow};
+pub use crate::values::specified::box_::{ButtonAppearance, Clear as SpecifiedClear};
+pub use crate::values::specified::box_::{Float as SpecifiedFloat, Contain, Display, Overflow};
 pub use crate::values::specified::box_::{OverflowAnchor, OverflowClipBox, OverscrollBehavior};
 pub use crate::values::specified::box_::{
     ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType,
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index aa13ff89d7c..95fb405e4ba 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -43,7 +43,7 @@ pub use self::border::{BorderCornerRadius, BorderRadius, BorderSpacing};
 pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderImageSlice, BorderImageWidth};
 pub use self::box_::{AnimationIterationCount, AnimationName, Contain};
-pub use self::box_::{Appearance, BreakBetween, BreakWithin, Clear, Float};
+pub use self::box_::{Appearance, BreakBetween, BreakWithin, ButtonAppearance, Clear, Float};
 pub use self::box_::{Display, Overflow, OverflowAnchor, TransitionProperty};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize};
 pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType};
diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index ef53c7b4cfd..84de346b1f6 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1842,6 +1842,31 @@ pub enum Appearance {
     Count,
 }
 
+/// The effect of `appearance: button` on an element.
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToCss,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(u8)]
+pub enum ButtonAppearance {
+    /// `appearance: button` means the element is rendered with button
+    /// appearance.
+    Allow,
+    /// `appearance: button` is treated like `appearance: auto`.
+    Disallow,
+}
+
 /// A kind of break between two boxes.
 ///
 /// https://drafts.csswg.org/css-break/#break-between
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 8ddca48d599..8de81acf8ff 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -37,7 +37,7 @@ pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth};
 pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderRadius, BorderSideWidth, BorderSpacing, BorderStyle};
 pub use self::box_::{AnimationIterationCount, AnimationName, Contain, Display};
-pub use self::box_::{Appearance, BreakBetween, BreakWithin};
+pub use self::box_::{Appearance, BreakBetween, BreakWithin, ButtonAppearance};
 pub use self::box_::{Clear, Float, Overflow, OverflowAnchor};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize};
 pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType};

From da503c4b48263d063b0225e02e6a8cfb9b10d19b Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:31 +0000
Subject: [PATCH 015/156] style: Re-order Appearance values.

Differential Revision: https://phabricator.services.mozilla.com/D83437
---
 components/style/values/specified/box.rs | 46 ++++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 84de346b1f6..20f5ead3d20 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1530,8 +1530,31 @@ pub enum Appearance {
     /// This value doesn't make sense for -moz-default-appearance, but we don't bother to guard
     /// against parsing it.
     Auto,
+    /// A searchfield.
+    Searchfield,
+    /// A multi-line text field, e.g. HTML <textarea>.
+    #[parse(aliases = "textfield-multiline")]
+    Textarea,
+    /// A checkbox element.
+    Checkbox,
+    /// A radio element within a radio group.
+    Radio,
+    /// A dropdown list.
+    Menulist,
+    /// List boxes.
+    Listbox,
+    /// A horizontal meter bar.
+    #[parse(aliases = "meterbar")]
+    Meter,
+    /// A horizontal progress bar.
+    #[parse(aliases = "progressbar")]
+    ProgressBar,
     /// A typical dialog button.
     Button,
+    /// A single-line text field, e.g. HTML <input type=text>.
+    Textfield,
+    /// The dropdown button(s) that open up a dropdown list.
+    MenulistButton,
     /// Various arrows that go in buttons
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ButtonArrowDown,
@@ -1550,8 +1573,6 @@ pub enum Appearance {
     /// A groupbox.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Groupbox,
-    /// List boxes.
-    Listbox,
     /// Menu Bar background
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Menubar,
@@ -1565,10 +1586,6 @@ pub enum Appearance {
     /// For text on non-iconic menuitems only
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Menuitemtext,
-    /// A dropdown list.
-    Menulist,
-    /// The dropdown button(s) that open up a dropdown list.
-    MenulistButton,
     /// The text part of a dropdown list, to left of button.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MenulistText,
@@ -1587,9 +1604,6 @@ pub enum Appearance {
     /// An image in the menu gutter, like in bookmarks or history.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Menuimage,
-    /// A horizontal meter bar.
-    #[parse(aliases = "meterbar")]
-    Meter,
     /// The meter bar's meter indicator.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Meterchunk,
@@ -1598,16 +1612,9 @@ pub enum Appearance {
     MozMenulistArrowButton,
     /// For HTML's <input type=number>
     NumberInput,
-    /// A horizontal progress bar.
-    #[parse(aliases = "progressbar")]
-    ProgressBar,
     /// The progress bar's progress indicator
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Progresschunk,
-    /// A checkbox element.
-    Checkbox,
-    /// A radio element within a radio group.
-    Radio,
     /// A generic container that always repaints on state changes. This is a
     /// hack to make XUL checkboxes and radio buttons work.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
@@ -1666,8 +1673,6 @@ pub enum Appearance {
     /// The scroll corner
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Scrollcorner,
-    /// A searchfield.
-    Searchfield,
     /// A separator.  Can be horizontal or vertical.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Separator,
@@ -1706,11 +1711,6 @@ pub enum Appearance {
     TabScrollArrowBack,
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     TabScrollArrowForward,
-    /// A multi-line text field, e.g. HTML <textarea>.
-    #[parse(aliases = "textfield-multiline")]
-    Textarea,
-    /// A single-line text field, e.g. HTML <input type=text>.
-    Textfield,
     /// A toolbar in an application window.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Toolbar,

From a2b016157e645bffa5654e706c4247bebe681e4e Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 16 Jul 2020 22:04:38 +0000
Subject: [PATCH 016/156] style: Hide range and number-input appearance values
 from content.

Forgot to follow up on these two remaining non-standard values that may have
been being used to reset a <meter> or <input type=number> back to its
original appearance, but which telemetry showed no usage of.

Differential Revision: https://phabricator.services.mozilla.com/D83598
---
 components/style/values/specified/box.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 20f5ead3d20..4274905310d 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1611,6 +1611,7 @@ pub enum Appearance {
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MozMenulistArrowButton,
     /// For HTML's <input type=number>
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     NumberInput,
     /// The progress bar's progress indicator
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
@@ -1628,6 +1629,7 @@ pub enum Appearance {
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     RadioLabel,
     /// nsRangeFrame and its subparts
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Range,
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     RangeThumb,

From 5752e4a3a2b161104f2da8423b2d74fae903f94a Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 17 Jul 2020 09:56:53 +0000
Subject: [PATCH 017/156] style: Don't use attribute selectors for determining
 if a select is a drop down or a list box.

Instead add a pseudo-class that does the expected size="" attribute parsing.

Removing the Gtk-specific rule setting the text color since it doesn't
seem to have any effect currently.

Differential Revision: https://phabricator.services.mozilla.com/D83448
---
 components/style/gecko/non_ts_pseudo_class_list.rs       | 1 +
 components/style/gecko/wrapper.rs                        | 3 +++
 components/style/invalidation/element/element_wrapper.rs | 9 +++++++++
 .../style/invalidation/element/invalidation_map.rs       | 6 ++++++
 4 files changed, 19 insertions(+)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 7b737f4d9cf..034ce0694ad 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -32,6 +32,7 @@ macro_rules! apply_non_ts_list {
             [
                 ("-moz-table-border-nonzero", MozTableBorderNonzero, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-browser-frame", MozBrowserFrame, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+                ("-moz-select-list-box", MozSelectListBox, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("link", Link, IN_UNVISITED_STATE, _),
                 ("any-link", AnyLink, IN_VISITED_OR_UNVISITED_STATE, _),
                 ("visited", Visited, IN_VISITED_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index d6c8e267a3c..7e984dc3ae1 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2116,6 +2116,9 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
                 bindings::Gecko_IsTableBorderNonzero(self.0)
             },
             NonTSPseudoClass::MozBrowserFrame => unsafe { bindings::Gecko_IsBrowserFrame(self.0) },
+            NonTSPseudoClass::MozSelectListBox => unsafe {
+                bindings::Gecko_IsSelectListBox(self.0)
+            },
             NonTSPseudoClass::MozIsHTML => self.is_html_element_in_html_document(),
             NonTSPseudoClass::MozLWTheme => self.document_theme() != DocumentTheme::Doc_Theme_None,
             NonTSPseudoClass::MozLWThemeBrightText => {
diff --git a/components/style/invalidation/element/element_wrapper.rs b/components/style/invalidation/element/element_wrapper.rs
index 1154c136165..2b6f934c8b7 100644
--- a/components/style/invalidation/element/element_wrapper.rs
+++ b/components/style/invalidation/element/element_wrapper.rs
@@ -239,6 +239,15 @@ where
                 }
             },
 
+            #[cfg(feature = "gecko")]
+            NonTSPseudoClass::MozSelectListBox => {
+                if let Some(snapshot) = self.snapshot() {
+                    if snapshot.has_other_pseudo_class_state() {
+                        return snapshot.mIsSelectListBox();
+                    }
+                }
+            },
+
             // :lang() needs to match using the closest ancestor xml:lang="" or
             // lang="" attribtue from snapshots.
             NonTSPseudoClass::Lang(ref lang_arg) => {
diff --git a/components/style/invalidation/element/invalidation_map.rs b/components/style/invalidation/element/invalidation_map.rs
index 6d9b6c1e85d..ea08bb4f4fb 100644
--- a/components/style/invalidation/element/invalidation_map.rs
+++ b/components/style/invalidation/element/invalidation_map.rs
@@ -506,6 +506,12 @@ impl<'a> SelectorVisitor for SelectorDependencyCollector<'a> {
                     NonTSPseudoClass::MozTableBorderNonzero => local_name!("border"),
                     #[cfg(feature = "gecko")]
                     NonTSPseudoClass::MozBrowserFrame => local_name!("mozbrowser"),
+                    #[cfg(feature = "gecko")]
+                    NonTSPseudoClass::MozSelectListBox => {
+                        // This depends on two attributes.
+                        return self.add_attr_dependency(local_name!("multiple")) &&
+                            self.add_attr_dependency(local_name!("size"));
+                    },
                     NonTSPseudoClass::Lang(..) => local_name!("lang"),
                     _ => return true,
                 };

From 780beace0046f7402528fdf9546f6056933c0ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 20 Jul 2020 07:40:17 +0000
Subject: [PATCH 018/156] style: Make stylesheet invalidation faster.

This fixes performance issues when there's a massive number of rules and
a massive DOM.

Instead of going through all rules for all the DOM, we now look stuff in
hashmaps.

Differential Revision: https://phabricator.services.mozilla.com/D83506
---
 components/style/invalidation/stylesheets.rs | 304 +++++++++++--------
 components/style/selector_map.rs             |  15 +-
 2 files changed, 197 insertions(+), 122 deletions(-)

diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index 244366af21d..4b37133a282 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -7,28 +7,23 @@
 
 #![deny(unsafe_code)]
 
+use crate::context::QuirksMode;
 use crate::dom::{TDocument, TElement, TNode};
-use crate::hash::HashSet;
 use crate::invalidation::element::element_wrapper::{ElementSnapshot, ElementWrapper};
 use crate::invalidation::element::restyle_hints::RestyleHint;
 use crate::media_queries::Device;
+use crate::selector_map::{MaybeCaseInsensitiveHashMap, PrecomputedHashMap};
 use crate::selector_parser::{SelectorImpl, Snapshot, SnapshotMap};
 use crate::shared_lock::SharedRwLockReadGuard;
 use crate::stylesheets::{CssRule, StylesheetInDocument};
 use crate::Atom;
-use crate::CaseSensitivityExt;
 use crate::LocalName as SelectorLocalName;
-use fxhash::FxHasher;
-use selectors::attr::CaseSensitivity;
 use selectors::parser::{Component, LocalName, Selector};
-use std::hash::BuildHasherDefault;
-
-type FxHashSet<K> = HashSet<K, BuildHasherDefault<FxHasher>>;
 
 /// A style sheet invalidation represents a kind of element or subtree that may
 /// need to be restyled. Whether it represents a whole subtree or just a single
-/// element is determined by whether the invalidation is stored in the
-/// StylesheetInvalidationSet's invalid_scopes or invalid_elements table.
+/// element is determined by the given InvalidationKind in
+/// StylesheetInvalidationSet's maps.
 #[derive(Debug, Eq, Hash, MallocSizeOf, PartialEq)]
 enum Invalidation {
     /// An element with a given id.
@@ -50,56 +45,35 @@ impl Invalidation {
     fn is_id_or_class(&self) -> bool {
         matches!(*self, Invalidation::ID(..) | Invalidation::Class(..))
     }
+}
 
-    fn matches<E>(
-        &self,
-        element: E,
-        snapshot: Option<&Snapshot>,
-        case_sensitivity: CaseSensitivity,
-    ) -> bool
-    where
-        E: TElement,
-    {
-        match *self {
-            Invalidation::Class(ref class) => {
-                if element.has_class(class, case_sensitivity) {
-                    return true;
-                }
+/// Whether we should invalidate just the element, or the whole subtree within
+/// it.
+#[derive(Copy, Clone, Debug, Eq, MallocSizeOf, Ord, PartialEq, PartialOrd)]
+enum InvalidationKind {
+    None = 0,
+    Element,
+    Scope,
+}
 
-                if let Some(snapshot) = snapshot {
-                    if snapshot.has_class(class, case_sensitivity) {
-                        return true;
-                    }
-                }
-            },
-            Invalidation::ID(ref id) => {
-                if let Some(ref element_id) = element.id() {
-                    if case_sensitivity.eq_atom(element_id, id) {
-                        return true;
-                    }
-                }
+impl std::ops::BitOrAssign for InvalidationKind {
+    #[inline]
+    fn bitor_assign(&mut self, other: Self) {
+        *self = std::cmp::max(*self, other);
+    }
+}
 
-                if let Some(snapshot) = snapshot {
-                    if let Some(ref old_id) = snapshot.id_attr() {
-                        if case_sensitivity.eq_atom(old_id, id) {
-                            return true;
-                        }
-                    }
-                }
-            },
-            Invalidation::LocalName {
-                ref name,
-                ref lower_name,
-            } => {
-                // This could look at the quirks mode of the document, instead
-                // of testing against both names, but it's probably not worth
-                // it.
-                let local_name = element.local_name();
-                return *local_name == **name || *local_name == **lower_name;
-            },
+impl InvalidationKind {
+    #[inline]
+    fn is_scope(self) -> bool {
+        matches!(self, Self::Scope)
+    }
+
+    #[inline]
+    fn add(&mut self, other: Option<&InvalidationKind>) {
+        if let Some(other) = other {
+            *self |= *other;
         }
-
-        false
     }
 }
 
@@ -107,31 +81,24 @@ impl Invalidation {
 ///
 /// TODO(emilio): We might be able to do the same analysis for media query
 /// changes too (or even selector changes?).
-#[derive(MallocSizeOf)]
+#[derive(Debug, Default, MallocSizeOf)]
 pub struct StylesheetInvalidationSet {
-    /// The subtrees we know we have to restyle so far.
-    invalid_scopes: FxHashSet<Invalidation>,
-    /// The elements we know we have to restyle so far.
-    invalid_elements: FxHashSet<Invalidation>,
-    /// Whether the whole document should be restyled.
+    classes: MaybeCaseInsensitiveHashMap<Atom, InvalidationKind>,
+    ids: MaybeCaseInsensitiveHashMap<Atom, InvalidationKind>,
+    local_names: PrecomputedHashMap<SelectorLocalName, InvalidationKind>,
     fully_invalid: bool,
 }
 
 impl StylesheetInvalidationSet {
     /// Create an empty `StylesheetInvalidationSet`.
     pub fn new() -> Self {
-        Self {
-            invalid_scopes: FxHashSet::default(),
-            invalid_elements: FxHashSet::default(),
-            fully_invalid: false,
-        }
+        Default::default()
     }
 
     /// Mark the DOM tree styles' as fully invalid.
     pub fn invalidate_fully(&mut self) {
         debug!("StylesheetInvalidationSet::invalidate_fully");
-        self.invalid_scopes.clear();
-        self.invalid_elements.clear();
+        self.clear();
         self.fully_invalid = true;
     }
 
@@ -157,22 +124,19 @@ impl StylesheetInvalidationSet {
             return; // Nothing to do here.
         }
 
+        let quirks_mode = stylesheet.quirks_mode(guard);
         for rule in stylesheet.effective_rules(device, guard) {
-            self.collect_invalidations_for_rule(rule, guard, device);
+            self.collect_invalidations_for_rule(rule, guard, device, quirks_mode);
             if self.fully_invalid {
-                self.invalid_scopes.clear();
-                self.invalid_elements.clear();
                 break;
             }
         }
 
+        debug!(" > resulting class invalidations: {:?}", self.classes);
+        debug!(" > resulting id invalidations: {:?}", self.ids);
         debug!(
-            " > resulting subtree invalidations: {:?}",
-            self.invalid_scopes
-        );
-        debug!(
-            " > resulting self invalidations: {:?}",
-            self.invalid_elements
+            " > resulting local name invalidations: {:?}",
+            self.local_names
         );
         debug!(" > fully_invalid: {}", self.fully_invalid);
     }
@@ -198,21 +162,83 @@ impl StylesheetInvalidationSet {
         have_invalidations
     }
 
+    fn is_empty(&self) -> bool {
+        !self.fully_invalid &&
+            self.classes.is_empty() &&
+            self.ids.is_empty() &&
+            self.local_names.is_empty()
+    }
+
+    fn invalidation_kind_for<E>(
+        &self,
+        element: E,
+        snapshot: Option<&Snapshot>,
+        quirks_mode: QuirksMode,
+    ) -> InvalidationKind
+    where
+        E: TElement,
+    {
+        debug_assert!(!self.fully_invalid);
+
+        let mut kind = InvalidationKind::None;
+
+        if !self.classes.is_empty() {
+            element.each_class(|c| {
+                kind.add(self.classes.get(c, quirks_mode));
+            });
+
+            if kind.is_scope() {
+                return kind;
+            }
+
+            if let Some(snapshot) = snapshot {
+                snapshot.each_class(|c| {
+                    kind.add(self.classes.get(c, quirks_mode));
+                });
+
+                if kind.is_scope() {
+                    return kind;
+                }
+            }
+        }
+
+        if !self.ids.is_empty() {
+            if let Some(ref id) = element.id() {
+                kind.add(self.ids.get(id, quirks_mode));
+                if kind.is_scope() {
+                    return kind;
+                }
+            }
+
+            if let Some(ref old_id) = snapshot.and_then(|s| s.id_attr()) {
+                kind.add(self.ids.get(old_id, quirks_mode));
+                if kind.is_scope() {
+                    return kind;
+                }
+            }
+        }
+
+        if !self.local_names.is_empty() {
+            kind.add(self.local_names.get(element.local_name()));
+        }
+
+        kind
+    }
+
     /// Clears the invalidation set without processing.
     pub fn clear(&mut self) {
-        self.invalid_scopes.clear();
-        self.invalid_elements.clear();
+        self.classes.clear();
+        self.ids.clear();
+        self.local_names.clear();
         self.fully_invalid = false;
+        debug_assert!(self.is_empty());
     }
 
     fn process_invalidations<E>(&self, element: E, snapshots: Option<&SnapshotMap>) -> bool
     where
         E: TElement,
     {
-        debug!(
-            "Stylist::process_invalidations({:?}, {:?}, {:?})",
-            element, self.invalid_scopes, self.invalid_elements,
-        );
+        debug!("Stylist::process_invalidations({:?}, {:?})", element, self);
 
         {
             let mut data = match element.mutate_data() {
@@ -227,22 +253,18 @@ impl StylesheetInvalidationSet {
             }
         }
 
-        if self.invalid_scopes.is_empty() && self.invalid_elements.is_empty() {
+        if self.is_empty() {
             debug!("process_invalidations: empty invalidation set");
             return false;
         }
 
-        let case_sensitivity = element
-            .as_node()
-            .owner_doc()
-            .quirks_mode()
-            .classes_and_ids_case_sensitivity();
-        self.process_invalidations_in_subtree(element, snapshots, case_sensitivity)
+        let quirks_mode = element.as_node().owner_doc().quirks_mode();
+        self.process_invalidations_in_subtree(element, snapshots, quirks_mode)
     }
 
     /// Process style invalidations in a given subtree. This traverses the
-    /// subtree looking for elements that match the invalidations in
-    /// invalid_scopes and invalid_elements.
+    /// subtree looking for elements that match the invalidations in our hash
+    /// map members.
     ///
     /// Returns whether it invalidated at least one element's style.
     #[allow(unsafe_code)]
@@ -250,7 +272,7 @@ impl StylesheetInvalidationSet {
         &self,
         element: E,
         snapshots: Option<&SnapshotMap>,
-        case_sensitivity: CaseSensitivity,
+        quirks_mode: QuirksMode,
     ) -> bool
     where
         E: TElement,
@@ -275,31 +297,24 @@ impl StylesheetInvalidationSet {
 
         let element_wrapper = snapshots.map(|s| ElementWrapper::new(element, s));
         let snapshot = element_wrapper.as_ref().and_then(|e| e.snapshot());
-        for invalidation in &self.invalid_scopes {
-            if invalidation.matches(element, snapshot, case_sensitivity) {
+
+        match self.invalidation_kind_for(element, snapshot, quirks_mode) {
+            InvalidationKind::None => {},
+            InvalidationKind::Element => {
                 debug!(
-                    "process_invalidations_in_subtree: {:?} matched subtree {:?}",
-                    element, invalidation
+                    "process_invalidations_in_subtree: {:?} matched self",
+                    element
+                );
+                data.hint.insert(RestyleHint::RESTYLE_SELF);
+            },
+            InvalidationKind::Scope => {
+                debug!(
+                    "process_invalidations_in_subtree: {:?} matched subtree",
+                    element
                 );
                 data.hint.insert(RestyleHint::restyle_subtree());
                 return true;
-            }
-        }
-
-        let mut self_invalid = false;
-
-        if !data.hint.contains(RestyleHint::RESTYLE_SELF) {
-            for invalidation in &self.invalid_elements {
-                if invalidation.matches(element, snapshot, case_sensitivity) {
-                    debug!(
-                        "process_invalidations_in_subtree: {:?} matched self {:?}",
-                        element, invalidation
-                    );
-                    data.hint.insert(RestyleHint::RESTYLE_SELF);
-                    self_invalid = true;
-                    break;
-                }
-            }
+            },
         }
 
         let mut any_children_invalid = false;
@@ -311,7 +326,7 @@ impl StylesheetInvalidationSet {
             };
 
             any_children_invalid |=
-                self.process_invalidations_in_subtree(child, snapshots, case_sensitivity);
+                self.process_invalidations_in_subtree(child, snapshots, quirks_mode);
         }
 
         if any_children_invalid {
@@ -322,7 +337,7 @@ impl StylesheetInvalidationSet {
             unsafe { element.set_dirty_descendants() }
         }
 
-        return self_invalid || any_children_invalid;
+        data.hint.contains(RestyleHint::RESTYLE_SELF) || any_children_invalid
     }
 
     fn scan_component(
@@ -371,7 +386,11 @@ impl StylesheetInvalidationSet {
     /// prefer to generate subtree invalidations for the outermost part
     /// of the selector, to reduce the amount of traversal we need to do
     /// when flushing invalidations.
-    fn collect_invalidations(&mut self, selector: &Selector<SelectorImpl>) {
+    fn collect_invalidations(
+        &mut self,
+        selector: &Selector<SelectorImpl>,
+        quirks_mode: QuirksMode,
+    ) {
         debug!(
             "StylesheetInvalidationSet::collect_invalidations({:?})",
             selector
@@ -404,13 +423,14 @@ impl StylesheetInvalidationSet {
 
         if let Some(s) = subtree_invalidation {
             debug!(" > Found subtree invalidation: {:?}", s);
-            if self.invalid_scopes.try_insert(s).is_ok() {
+            if self.insert_invalidation(s, InvalidationKind::Scope, quirks_mode) {
                 return;
             }
         }
+
         if let Some(s) = element_invalidation {
             debug!(" > Found element invalidation: {:?}", s);
-            if self.invalid_elements.try_insert(s).is_ok() {
+            if self.insert_invalidation(s, InvalidationKind::Element, quirks_mode) {
                 return;
             }
         }
@@ -418,7 +438,48 @@ impl StylesheetInvalidationSet {
         // The selector was of a form that we can't handle. Any element could
         // match it, so let's just bail out.
         debug!(" > Can't handle selector or OOMd, marking fully invalid");
-        self.fully_invalid = true;
+        self.invalidate_fully()
+    }
+
+    fn insert_invalidation(
+        &mut self,
+        invalidation: Invalidation,
+        kind: InvalidationKind,
+        quirks_mode: QuirksMode,
+    ) -> bool {
+        match invalidation {
+            Invalidation::Class(c) => {
+                let entry = match self.classes.try_entry(c, quirks_mode) {
+                    Ok(e) => e,
+                    Err(..) => return false,
+                };
+                *entry.or_insert(InvalidationKind::None) |= kind;
+            },
+            Invalidation::ID(i) => {
+                let entry = match self.ids.try_entry(i, quirks_mode) {
+                    Ok(e) => e,
+                    Err(..) => return false,
+                };
+                *entry.or_insert(InvalidationKind::None) |= kind;
+            },
+            Invalidation::LocalName { name, lower_name } => {
+                let insert_lower = name != lower_name;
+                let entry = match self.local_names.try_entry(name) {
+                    Ok(e) => e,
+                    Err(..) => return false,
+                };
+                *entry.or_insert(InvalidationKind::None) |= kind;
+                if insert_lower {
+                    let entry = match self.local_names.try_entry(lower_name) {
+                        Ok(e) => e,
+                        Err(..) => return false,
+                    };
+                    *entry.or_insert(InvalidationKind::None) |= kind;
+                }
+            },
+        }
+
+        true
     }
 
     /// Collects invalidations for a given CSS rule.
@@ -427,6 +488,7 @@ impl StylesheetInvalidationSet {
         rule: &CssRule,
         guard: &SharedRwLockReadGuard,
         device: &Device,
+        quirks_mode: QuirksMode,
     ) {
         use crate::stylesheets::CssRule::*;
         debug!("StylesheetInvalidationSet::collect_invalidations_for_rule");
@@ -436,7 +498,7 @@ impl StylesheetInvalidationSet {
             Style(ref lock) => {
                 let style_rule = lock.read_with(guard);
                 for selector in &style_rule.selectors.0 {
-                    self.collect_invalidations(selector);
+                    self.collect_invalidations(selector, quirks_mode);
                     if self.fully_invalid {
                         return;
                     }
diff --git a/components/style/selector_map.rs b/components/style/selector_map.rs
index 6350caef0cf..4ea8cc1a018 100644
--- a/components/style/selector_map.rs
+++ b/components/style/selector_map.rs
@@ -620,13 +620,20 @@ pub struct MaybeCaseInsensitiveHashMap<K: PrecomputedHash + Hash + Eq, V: 'stati
     PrecomputedHashMap<K, V>,
 );
 
+impl<V: 'static> Default for MaybeCaseInsensitiveHashMap<Atom, V> {
+    #[inline]
+    fn default() -> Self {
+        MaybeCaseInsensitiveHashMap(PrecomputedHashMap::default())
+    }
+}
+
 // FIXME(Manishearth) the 'static bound can be removed when
 // our HashMap fork (hashglobe) is able to use NonZero,
 // or when stdlib gets fallible collections
 impl<V: 'static> MaybeCaseInsensitiveHashMap<Atom, V> {
     /// Empty map
     pub fn new() -> Self {
-        MaybeCaseInsensitiveHashMap(PrecomputedHashMap::default())
+        Self::default()
     }
 
     /// HashMap::try_entry
@@ -641,6 +648,12 @@ impl<V: 'static> MaybeCaseInsensitiveHashMap<Atom, V> {
         self.0.try_entry(key)
     }
 
+    /// HashMap::is_empty
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
     /// HashMap::iter
     pub fn iter(&self) -> hash_map::Iter<Atom, V> {
         self.0.iter()

From 5382a99adb00a77e8b25fc246b3213616a471f79 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Tue, 21 Jul 2020 19:46:45 +0000
Subject: [PATCH 019/156] style: [css-grid] Make empty and all-whitespace
 strings in 'grid-template-areas' invalid.

Differential Revision: https://phabricator.services.mozilla.com/D84398
---
 components/style/values/specified/position.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/style/values/specified/position.rs b/components/style/values/specified/position.rs
index 72886b2d7b1..1b55e010878 100644
--- a/components/style/values/specified/position.rs
+++ b/components/style/values/specified/position.rs
@@ -710,6 +710,11 @@ impl TemplateAreas {
                     });
                     current_area_index = Some(index);
                 }
+                if column == 0 {
+                    // Each string must produce a valid token.
+                    // https://github.com/w3c/csswg-drafts/issues/5110
+                    return Err(());
+                }
                 if let Some(index) = current_area_index {
                     if areas[index].columns.end != column + 1 {
                         assert_ne!(areas[index].rows.start, row);

From ad22c7a3695c3df5f4ba4e64cd7d40a73b75d192 Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Wed, 22 Jul 2020 00:44:18 +0000
Subject: [PATCH 020/156] style: Allow animations and transitions on ::marker

As per the following change to the spec:

https://github.com/w3c/csswg-drafts/commit/6b3d7240b57aec90846c4b6b753bdc4bf7726c8c

The additional failure annotation is added because we don't currently treat
text-combine-upright as non-animatable and this patch exposes the existing bug
(bug 1654195).

Differential Revision: https://phabricator.services.mozilla.com/D84308
---
 components/style/properties/data.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index b68d40e402f..f141160af1a 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -778,7 +778,9 @@ class PropertyRestrictions:
             "direction",
             "content",
             "-moz-osx-font-smoothing",
-        ] + PropertyRestrictions.spec(data, "css-fonts"))
+        ] + PropertyRestrictions.spec(data, "css-fonts")
+          + PropertyRestrictions.spec(data, "css-animations")
+          + PropertyRestrictions.spec(data, "css-transitions"))
 
     # https://www.w3.org/TR/webvtt1/#the-cue-pseudo-element
     @staticmethod

From cd8c07abac9b47c878af29ae4009bec51727a09a Mon Sep 17 00:00:00 2001
From: Philipp Zech <zech.ph@gmail.com>
Date: Thu, 23 Jul 2020 21:31:23 +0000
Subject: [PATCH 021/156] style: Convert writing-modes #defines to an enum
 class.

Differential Revision: https://phabricator.services.mozilla.com/D84016
---
 components/style/properties/longhands/inherited_box.mako.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/properties/longhands/inherited_box.mako.rs b/components/style/properties/longhands/inherited_box.mako.rs
index 37d86d62695..32f9819a42d 100644
--- a/components/style/properties/longhands/inherited_box.mako.rs
+++ b/components/style/properties/longhands/inherited_box.mako.rs
@@ -31,6 +31,7 @@ ${helpers.single_keyword(
     servo_2020_pref="layout.writing-mode.enabled",
     animation_value_type="none",
     spec="https://drafts.csswg.org/css-writing-modes/#propdef-writing-mode",
+    gecko_enum_prefix="StyleWritingModeProperty",
     servo_restyle_damage="rebuild_and_reflow",
 )}
 

From 32f92d18a8d022417eacbc79066538f4c9b8c957 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Sun, 26 Jul 2020 21:30:56 +0000
Subject: [PATCH 022/156] style: implement -moz-inert CSS property.

-moz-inert CSS property reflects inert subtrees concept and can be used to implement HTML:dialog element and HTML:inert attribute

Differential Revision: https://phabricator.services.mozilla.com/D81701
---
 components/style/element_state.rs             |  3 ++
 .../style/gecko/non_ts_pseudo_class_list.rs   |  1 +
 components/style/gecko/wrapper.rs             |  1 +
 .../properties/longhands/inherited_ui.mako.rs | 11 ++++
 components/style/servo/selector_parser.rs     |  2 +
 components/style/style_adjuster.rs            | 51 +++++++++++++++++++
 6 files changed, 69 insertions(+)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index 027ebc839b4..da44186b44b 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -145,6 +145,9 @@ bitflags! {
         ///
         /// https://html.spec.whatwg.org/multipage/#centered-alignment
         const IN_MODAL_DIALOG_STATE = 1 << 53;
+
+        /// https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees
+        const IN_MOZINERT_STATE = 1 << 54;
     }
 }
 
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 034ce0694ad..bdd994c7095 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -48,6 +48,7 @@ macro_rules! apply_non_ts_list {
                 ("-moz-drag-over", MozDragOver, IN_DRAGOVER_STATE, _),
                 ("target", Target, IN_TARGET_STATE, _),
                 ("indeterminate", Indeterminate, IN_INDETERMINATE_STATE, _),
+                ("-moz-inert", MozInert, IN_MOZINERT_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-devtools-highlighted", MozDevtoolsHighlighted, IN_DEVTOOLS_HIGHLIGHTED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-styleeditor-transitioning", MozStyleeditorTransitioning, IN_STYLEEDITOR_TRANSITIONING_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("fullscreen", Fullscreen, IN_FULLSCREEN_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 7e984dc3ae1..3d4f186fcc3 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2022,6 +2022,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::Checked |
             NonTSPseudoClass::Fullscreen |
             NonTSPseudoClass::Indeterminate |
+            NonTSPseudoClass::MozInert |
             NonTSPseudoClass::PlaceholderShown |
             NonTSPseudoClass::Target |
             NonTSPseudoClass::Valid |
diff --git a/components/style/properties/longhands/inherited_ui.mako.rs b/components/style/properties/longhands/inherited_ui.mako.rs
index bbe34209647..cb48acaa1fe 100644
--- a/components/style/properties/longhands/inherited_ui.mako.rs
+++ b/components/style/properties/longhands/inherited_ui.mako.rs
@@ -29,6 +29,17 @@ ${helpers.single_keyword(
     gecko_enum_prefix="StylePointerEvents",
 )}
 
+${helpers.single_keyword(
+    "-moz-inert",
+    "none inert",
+    engines="gecko",
+    gecko_ffi_name="mInert",
+    gecko_enum_prefix="StyleInert",
+    animation_value_type="discrete",
+    enabled_in="ua",
+    spec="Nonstandard (https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees)",
+)}
+
 ${helpers.single_keyword(
     "-moz-user-input",
     "auto none",
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index 66e87b339d4..b11751fbec0 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -349,6 +349,7 @@ impl ToCss for NonTSPseudoClass {
             Fullscreen => ":fullscreen",
             Hover => ":hover",
             Indeterminate => ":indeterminate",
+            MozInert => ":-moz-inert",
             Link => ":link",
             PlaceholderShown => ":placeholder-shown",
             ReadWrite => ":read-write",
@@ -438,6 +439,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
             "fullscreen" => Fullscreen,
             "hover" => Hover,
             "indeterminate" => Indeterminate,
+            "-moz-inert" => MozInert,
             "link" => Link,
             "placeholder-shown" => PlaceholderShown,
             "read-write" => ReadWrite,
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index 8ab4aea3d21..fb5fae96bd0 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -153,6 +153,56 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         }
     }
 
+    /// https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees
+    ///
+    ///    If -moz-inert is applied then add:
+    ///        -moz-user-focus: none;
+    ///        -moz-user-input: none;
+    ///        -moz-user-modify: read-only;
+    ///        user-select: none;
+    ///        pointer-events: none;
+    ///        cursor: default;
+    fn adjust_for_inert(&mut self) {
+        use properties::longhands::_moz_inert::computed_value::T as Inert;
+        use properties::longhands::_moz_user_focus::computed_value::T as UserFocus;
+        use properties::longhands::_moz_user_input::computed_value::T as UserInput;
+        use properties::longhands::_moz_user_modify::computed_value::T as UserModify;
+        use properties::longhands::pointer_events::computed_value::T as PointerEvents;
+        use properties::longhands::cursor::computed_value::T as Cursor;
+        use crate::values::specified::ui::CursorKind;
+        use crate::values::specified::ui::UserSelect;
+
+        let needs_update = {
+            let ui = self.style.get_inherited_ui();
+            if ui.clone__moz_inert() == Inert::None {
+                return;
+            }
+
+            ui.clone__moz_user_focus() != UserFocus::None ||
+                ui.clone__moz_user_input() != UserInput::None ||
+                ui.clone__moz_user_modify() != UserModify::ReadOnly ||
+                ui.clone_pointer_events() != PointerEvents::None ||
+                ui.clone_cursor().keyword != CursorKind::Default ||
+                ui.clone_cursor().images != Default::default()
+        };
+
+        if needs_update {
+            let ui = self.style.mutate_inherited_ui();
+            ui.set__moz_user_focus(UserFocus::None);
+            ui.set__moz_user_input(UserInput::None);
+            ui.set__moz_user_modify(UserModify::ReadOnly);
+            ui.set_pointer_events(PointerEvents::None);
+            ui.set_cursor(Cursor {
+                images: Default::default(),
+                keyword: CursorKind::Default,
+            });
+        }
+
+        if self.style.get_ui().clone_user_select() != UserSelect::None {
+            self.style.mutate_ui().set_user_select(UserSelect::None);
+        }
+    }
+
     /// Whether we should skip any item-based display property blockification on
     /// this element.
     fn skip_item_display_fixup<E>(&self, element: Option<E>) -> bool
@@ -855,6 +905,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         #[cfg(feature = "gecko")]
         {
             self.adjust_for_appearance(element);
+            self.adjust_for_inert();
         }
         self.set_bits();
     }

From 7c3d815f783982dfe27f0d9b6b43a26f886cbceb Mon Sep 17 00:00:00 2001
From: Brian Birtles <birtles@gmail.com>
Date: Mon, 27 Jul 2020 18:45:35 +0000
Subject: [PATCH 023/156] style: Make text-combine-upright not animatable.

Differential Revision: https://phabricator.services.mozilla.com/D84935
---
 components/style/properties/longhands/inherited_text.mako.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs
index 6587627a58f..8e9e5340420 100644
--- a/components/style/properties/longhands/inherited_text.mako.rs
+++ b/components/style/properties/longhands/inherited_text.mako.rs
@@ -352,7 +352,7 @@ ${helpers.single_keyword(
     "text-combine-upright",
     "none all",
     engines="gecko",
-    animation_value_type="discrete",
+    animation_value_type="none",
     spec="https://drafts.csswg.org/css-writing-modes-3/#text-combine-upright",
 )}
 

From 8f89ebffec5fbd85979a9078b93b4a1da5efe47b Mon Sep 17 00:00:00 2001
From: Zeke Medley <zekemedley@gmail.com>
Date: Fri, 31 Jul 2020 16:11:38 +0000
Subject: [PATCH 024/156] style: Add parsing for cross-fade from CSS Image
 Values and Replaced Content Module Level 4.

This is the first of what will likely be a couple patches for
cross-fade's implementation. Bug 546052 tracks it's complete
implementation.

Differential Revision: https://phabricator.services.mozilla.com/D81889
---
 components/style/parser.rs                 | 12 +++
 components/style/values/computed/image.rs  |  9 +-
 components/style/values/generics/image.rs  | 97 +++++++++++++++++++++-
 components/style/values/specified/image.rs | 91 +++++++++++++++++++-
 4 files changed, 204 insertions(+), 5 deletions(-)

diff --git a/components/style/parser.rs b/components/style/parser.rs
index 26e7cab1ad9..81effece0a6 100644
--- a/components/style/parser.rs
+++ b/components/style/parser.rs
@@ -207,6 +207,18 @@ where
     }
 }
 
+impl<T> Parse for Box<T>
+where
+    T: Parse
+{
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        T::parse(context, input).map(Box::new)
+    }
+}
+
 impl Parse for crate::OwnedStr {
     fn parse<'i, 't>(
         _: &ParserContext,
diff --git a/components/style/values/computed/image.rs b/components/style/values/computed/image.rs
index a2b59809021..4eda2e91e21 100644
--- a/components/style/values/computed/image.rs
+++ b/components/style/values/computed/image.rs
@@ -8,6 +8,7 @@
 //! [image]: https://drafts.csswg.org/css-images/#image-values
 
 use crate::values::computed::position::Position;
+use crate::values::computed::percentage::Percentage;
 use crate::values::computed::url::ComputedImageUrl;
 #[cfg(feature = "gecko")]
 use crate::values::computed::NumberOrPercentage;
@@ -25,7 +26,7 @@ use style_traits::{CssWriter, ToCss};
 
 /// Computed values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl>;
+pub type Image = generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl, Color, Percentage>;
 
 /// Computed values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
@@ -40,6 +41,12 @@ pub type Gradient = generic::GenericGradient<
     Color,
 >;
 
+/// Computed values for CSS cross-fade
+/// <https://drafts.csswg.org/css-images-4/#cross-fade-function>
+pub type CrossFade = generic::CrossFade<Image, Color, Percentage>;
+/// A computed percentage or nothing.
+pub type PercentOrNone = generic::PercentOrNone<Percentage>;
+
 /// A computed radial gradient ending shape.
 pub type EndingShape = generic::GenericEndingShape<NonNegativeLength, NonNegativeLengthPercentage>;
 
diff --git a/components/style/values/generics/image.rs b/components/style/values/generics/image.rs
index 9376cad2c2e..f92eca8ae2f 100644
--- a/components/style/values/generics/image.rs
+++ b/components/style/values/generics/image.rs
@@ -22,7 +22,7 @@ use style_traits::{CssWriter, ToCss};
     Clone, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem,
 )]
 #[repr(C, u8)]
-pub enum GenericImage<G, MozImageRect, ImageUrl> {
+pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage> {
     /// `none` variant.
     None,
     /// A `<url()>` image.
@@ -45,10 +45,96 @@ pub enum GenericImage<G, MozImageRect, ImageUrl> {
     /// <https://drafts.css-houdini.org/css-paint-api/>
     #[cfg(feature = "servo-layout-2013")]
     PaintWorklet(PaintWorklet),
+
+    /// A `<cross-fade()>` image. Storing this directly inside of
+    /// GenericImage increases the size by 8 bytes so we box it here
+    /// and store images directly inside of cross-fade instead of
+    /// boxing them there.
+    CrossFade(Box<GenericCrossFade<Self, Color, Percentage>>),
 }
 
 pub use self::GenericImage as Image;
 
+/// <https://drafts.csswg.org/css-images-4/#cross-fade-function>
+#[css(comma, function = "cross-fade")]
+#[derive(
+    Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss, ToComputedValue,
+)]
+#[repr(C)]
+pub struct GenericCrossFade<Image, Color, Percentage> {
+    /// All of the image percent pairings passed as arguments to
+    /// cross-fade.
+    #[css(iterable)]
+    pub elements: crate::OwnedSlice<GenericCrossFadeElement<Image, Color, Percentage>>,
+}
+
+/// A `<percent> | none` value. Represents optional percentage values
+/// assosicated with cross-fade images.
+#[derive(
+    Clone,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+    ToCss,
+)]
+#[repr(C, u8)]
+pub enum PercentOrNone<Percentage> {
+    /// `none` variant.
+    #[css(skip)]
+    None,
+    /// A percentage variant.
+    Percent(Percentage),
+}
+
+/// An optional percent and a cross fade image.
+#[derive(
+    Clone,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+    ToCss,
+)]
+#[repr(C)]
+pub struct GenericCrossFadeElement<Image, Color, Percentage> {
+    /// The percent of the final image that `image` will be.
+    pub percent: PercentOrNone<Percentage>,
+    /// A color or image that will be blended when cross-fade is
+    /// evaluated.
+    pub image: GenericCrossFadeImage<Image, Color>,
+}
+
+/// An image or a color. `cross-fade` takes either when blending
+/// images together.
+#[derive(
+    Clone,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+    ToCss,
+    Parse,
+)]
+#[repr(C, u8)]
+pub enum GenericCrossFadeImage<I, C> {
+    /// A boxed image value. Boxing provides indirection so images can
+    /// be cross-fades and cross-fades can be images.
+    Image(I),
+    /// A color value.
+    Color(C),
+}
+
+pub use self::GenericCrossFade as CrossFade;
+pub use self::GenericCrossFadeElement as CrossFadeElement;
+pub use self::GenericCrossFadeImage as CrossFadeImage;
+
 /// A CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
 #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem)]
@@ -291,22 +377,26 @@ pub struct GenericMozImageRect<NumberOrPercentage, MozImageRectUrl> {
 
 pub use self::GenericMozImageRect as MozImageRect;
 
-impl<G, R, U> fmt::Debug for Image<G, R, U>
+impl<G, R, U, C, P> fmt::Debug for Image<G, R, U, C, P>
 where
     G: ToCss,
     R: ToCss,
     U: ToCss,
+    C: ToCss,
+    P: ToCss,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.to_css(&mut CssWriter::new(f))
     }
 }
 
-impl<G, R, U> ToCss for Image<G, R, U>
+impl<G, R, U, C, P> ToCss for Image<G, R, U, C, P>
 where
     G: ToCss,
     R: ToCss,
     U: ToCss,
+    C: ToCss,
+    P: ToCss,
 {
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
     where
@@ -325,6 +415,7 @@ where
                 serialize_atom_identifier(selector, dest)?;
                 dest.write_str(")")
             },
+            Image::CrossFade(ref cf) => cf.to_css(dest),
         }
     }
 }
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 088a4ace687..684fa3e2bab 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -35,7 +35,7 @@ use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss};
 
 /// Specified values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::Image<Gradient, MozImageRect, SpecifiedImageUrl>;
+pub type Image = generic::Image<Gradient, MozImageRect, SpecifiedImageUrl, Color, Percentage>;
 
 /// Specified values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
@@ -50,6 +50,17 @@ pub type Gradient = generic::Gradient<
     Color,
 >;
 
+/// Specified values for CSS cross-fade
+/// cross-fade( CrossFadeElement, ...)
+/// <https://drafts.csswg.org/css-images-4/#cross-fade-function>
+pub type CrossFade = generic::CrossFade<Image, Color, Percentage>;
+/// CrossFadeElement = percent? CrossFadeImage
+pub type CrossFadeElement = generic::CrossFadeElement<Image, Color, Percentage>;
+/// CrossFadeImage = image | color
+pub type CrossFadeImage = generic::CrossFadeImage<Image, Color>;
+/// A specified percentage or nothing.
+pub type PercentOrNone = generic::PercentOrNone<Percentage>;
+
 type LengthPercentageItemList = crate::OwnedSlice<generic::GradientItem<Color, LengthPercentage>>;
 
 #[cfg(feature = "gecko")]
@@ -62,6 +73,16 @@ fn conic_gradients_enabled() -> bool {
     false
 }
 
+#[cfg(feature = "gecko")]
+fn cross_fade_enabled() -> bool {
+    static_prefs::pref!("layout.css.cross-fade.enabled")
+}
+
+#[cfg(feature = "servo")]
+fn cross_fade_enabled() -> bool {
+    false
+}
+
 impl SpecifiedValueInfo for Gradient {
     const SUPPORTED_TYPES: u8 = CssType::GRADIENT;
 
@@ -89,6 +110,18 @@ impl SpecifiedValueInfo for Gradient {
     }
 }
 
+// Need to manually implement as whether or not cross-fade shows up in
+// completions & etc is dependent on it being enabled.
+impl<Image, Color, Percentage> SpecifiedValueInfo for generic::CrossFade<Image, Color, Percentage> {
+    const SUPPORTED_TYPES: u8 = 0;
+
+    fn collect_completion_keywords(f: KeywordsCollectFn) {
+        if cross_fade_enabled() {
+            f(&["cross-fade"]);
+        }
+    }
+}
+
 /// A specified gradient line direction.
 ///
 /// FIXME(emilio): This should be generic over Angle.
@@ -141,6 +174,11 @@ impl Parse for Image {
         if let Ok(gradient) = input.try_parse(|i| Gradient::parse(context, i)) {
             return Ok(generic::Image::Gradient(Box::new(gradient)));
         }
+        if cross_fade_enabled() {
+            if let Ok(cf) = input.try_parse(|input| CrossFade::parse(context, input)) {
+                return Ok(generic::Image::CrossFade(Box::new(cf)));
+            }
+        }
         #[cfg(feature = "servo-layout-2013")]
         {
             if let Ok(paint_worklet) = input.try_parse(|i| PaintWorklet::parse(context, i)) {
@@ -197,6 +235,57 @@ impl Image {
     }
 }
 
+impl Parse for CrossFade {
+    /// cross-fade() = cross-fade( <cf-image># )
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        input.expect_function_matching("cross-fade")?;
+        let elements = input.parse_nested_block(|input| {
+            input.parse_comma_separated(|input| CrossFadeElement::parse(context, input))
+        })?;
+        let elements = crate::OwnedSlice::from(elements);
+        Ok(Self { elements })
+    }
+}
+
+impl Parse for CrossFadeElement {
+    /// <cf-image> = <percentage>? && [ <image> | <color> ]
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        // Try and parse a leading percent sign.
+        let mut percent = PercentOrNone::parse_or_none(context, input);
+        // Parse the image
+        let image = CrossFadeImage::parse(context, input)?;
+        // Try and parse a trailing percent sign.
+        if percent == PercentOrNone::None {
+            percent = PercentOrNone::parse_or_none(context, input);
+        }
+        Ok(Self { percent, image })
+    }
+}
+
+impl PercentOrNone {
+    fn parse_or_none<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Self {
+        // We clamp our values here as this is the way that Safari and
+        // Chrome's implementation handle out-of-bounds percentages
+        // but whether or not this behavior follows the specification
+        // is still being discussed. See:
+        // <https://github.com/w3c/csswg-drafts/issues/5333>
+        if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input)) {
+            Self::Percent(percent.clamp_to_hundred())
+        } else {
+            Self::None
+        }
+    }
+}
+
 impl Parse for Gradient {
     fn parse<'i, 't>(
         context: &ParserContext,

From 9bfcb3d74164f1b0a65c5d3c3c36810f54574c4b Mon Sep 17 00:00:00 2001
From: Jeremy Ir <jir.opensource@gmail.com>
Date: Sat, 1 Aug 2020 01:56:58 +0000
Subject: [PATCH 025/156] style: Rename overflow:-moz-hidden-unscrollable to
 overflow:clip.

Differential Revision: https://phabricator.services.mozilla.com/D73716
---
 components/style/style_adjuster.rs       |  6 +++---
 components/style/values/specified/box.rs | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index fb5fae96bd0..a11a19561c4 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -499,10 +499,10 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         {
             // overflow: clip is deprecated, so convert to hidden if it's
             // specified in only one dimension.
-            if overflow_x == Overflow::MozHiddenUnscrollable {
+            if overflow_x == Overflow::Clip {
                 overflow_x = Overflow::Hidden;
             }
-            if overflow_y == Overflow::MozHiddenUnscrollable {
+            if overflow_y == Overflow::Clip {
                 overflow_y = Overflow::Hidden;
             }
         }
@@ -560,7 +560,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         let overflow_y = box_style.clone_overflow_y();
 
         fn scrollable(v: Overflow) -> bool {
-            v != Overflow::MozHiddenUnscrollable && v != Overflow::Visible
+            v != Overflow::Clip && v != Overflow::Visible
         }
 
         // If at least one is scrollable we'll adjust the other one in
diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 4274905310d..82bb0ab9df0 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1991,5 +1991,25 @@ pub enum Overflow {
     Scroll,
     Auto,
     #[cfg(feature = "gecko")]
-    MozHiddenUnscrollable,
+    #[parse(aliases = "-moz-hidden-unscrollable")]
+    Clip,
+}
+
+impl Overflow {
+    /// Return true if the value will create a scrollable box.
+    #[inline]
+    pub fn is_scrollable(&self) -> bool {
+        matches!(*self, Self::Hidden | Self::Scroll | Self::Auto)
+    }
+    /// Convert the value to a scrollable value if it's not already scrollable.
+    /// This maps `visible` to `auto` and `clip` to `hidden`.
+    #[inline]
+    pub fn to_scrollable(&self) -> Self {
+        match *self {
+            Self::Hidden | Self::Scroll | Self::Auto => *self,
+            Self::Visible => Self::Auto,
+            #[cfg(feature = "gecko")]
+            Self::Clip => Self::Hidden,
+        }
+    }
 }

From b29824bf750625aa0c7b8279bbc9f2ce3ce49867 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Sat, 1 Aug 2020 01:57:41 +0000
Subject: [PATCH 026/156] style: Implement overflow:clip/visible combinations.

Differential Revision: https://phabricator.services.mozilla.com/D73717
---
 components/style/style_adjuster.rs | 48 +++++++-----------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index a11a19561c4..e612d3b9977 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -469,48 +469,22 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         }
     }
 
-    /// CSS3 overflow-x and overflow-y require some fixup as well in some
-    /// cases.
-    ///
-    /// overflow: clip and overflow: visible are meaningful only when used in
-    /// both dimensions.
+    /// CSS overflow-x and overflow-y require some fixup as well in some cases.
+    /// https://drafts.csswg.org/css-overflow-3/#overflow-properties
+    /// "Computed value: as specified, except with `visible`/`clip` computing to
+    /// `auto`/`hidden` (respectively) if one of `overflow-x` or `overflow-y` is
+    /// neither `visible` nor `clip`."
     fn adjust_for_overflow(&mut self) {
-        let original_overflow_x = self.style.get_box().clone_overflow_x();
-        let original_overflow_y = self.style.get_box().clone_overflow_y();
-
-        let mut overflow_x = original_overflow_x;
-        let mut overflow_y = original_overflow_y;
-
+        let overflow_x = self.style.get_box().clone_overflow_x();
+        let overflow_y = self.style.get_box().clone_overflow_y();
         if overflow_x == overflow_y {
-            return;
+            return; // optimization for the common case
         }
 
-        // If 'visible' is specified but doesn't match the other dimension,
-        // it turns into 'auto'.
-        if overflow_x == Overflow::Visible {
-            overflow_x = Overflow::Auto;
-        }
-
-        if overflow_y == Overflow::Visible {
-            overflow_y = Overflow::Auto;
-        }
-
-        #[cfg(feature = "gecko")]
-        {
-            // overflow: clip is deprecated, so convert to hidden if it's
-            // specified in only one dimension.
-            if overflow_x == Overflow::Clip {
-                overflow_x = Overflow::Hidden;
-            }
-            if overflow_y == Overflow::Clip {
-                overflow_y = Overflow::Hidden;
-            }
-        }
-
-        if overflow_x != original_overflow_x || overflow_y != original_overflow_y {
+        if overflow_x.is_scrollable() != overflow_y.is_scrollable() {
             let box_style = self.style.mutate_box();
-            box_style.set_overflow_x(overflow_x);
-            box_style.set_overflow_y(overflow_y);
+            box_style.set_overflow_x(overflow_x.to_scrollable());
+            box_style.set_overflow_y(overflow_y.to_scrollable());
         }
     }
 

From 687fc20274f1f7b6a133efea776934211dc27f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 3 Aug 2020 21:19:56 +0000
Subject: [PATCH 027/156] style: Use Overflow::is_scrollable in StyleAdjuster.

It was introduced in the overflow: clip work but this standalone
equivalent remained.

Differential Revision: https://phabricator.services.mozilla.com/D85778
---
 components/style/style_adjuster.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index e612d3b9977..c48d1bc011a 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -533,13 +533,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         let overflow_x = box_style.clone_overflow_x();
         let overflow_y = box_style.clone_overflow_y();
 
-        fn scrollable(v: Overflow) -> bool {
-            v != Overflow::Clip && v != Overflow::Visible
-        }
-
         // If at least one is scrollable we'll adjust the other one in
         // adjust_for_overflow if needed.
-        if scrollable(overflow_x) || scrollable(overflow_y) {
+        if overflow_x.is_scrollable() || overflow_y.is_scrollable() {
             return;
         }
 

From 1f36216b59023590f9cc8dd714e1feb76d331d81 Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Wed, 5 Aug 2020 08:37:38 +0000
Subject: [PATCH 028/156] style: Update euclid in stylo.

Differential Revision: https://phabricator.services.mozilla.com/D85762
---
 components/malloc_size_of/Cargo.toml          |  2 +-
 components/style/Cargo.toml                   |  2 +-
 components/style/values/generics/transform.rs | 55 +++++++++----------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index e9b5bedd228..3f6d6e80ed9 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -32,7 +32,7 @@ app_units = "0.7"
 content-security-policy = { version = "0.4.0", features = ["serde"], optional = true }
 crossbeam-channel = { version = "0.4", optional = true }
 cssparser = "0.27"
-euclid = "0.20"
+euclid = "0.22"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
 hyper_serde = { version = "0.11", optional = true }
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 91e26f7c06e..4a62541f3b3 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -38,7 +38,7 @@ byteorder = "1.0"
 cssparser = "0.27"
 derive_more = "0.99"
 encoding_rs = { version = "0.8", optional = true }
-euclid = "0.20"
+euclid = "0.22"
 fallible = { path = "../fallible" }
 fxhash = "0.2"
 hashglobe = { path = "../hashglobe" }
diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs
index e5739b6ef56..21104fd44d3 100644
--- a/components/style/values/generics/transform.rs
+++ b/components/style/values/generics/transform.rs
@@ -76,7 +76,7 @@ pub use self::GenericMatrix3D as Matrix3D;
 impl<T: Into<f64>> From<Matrix<T>> for Transform3D<f64> {
     #[inline]
     fn from(m: Matrix<T>) -> Self {
-        Transform3D::row_major(
+        Transform3D::new(
             m.a.into(), m.b.into(), 0.0, 0.0,
             m.c.into(), m.d.into(), 0.0, 0.0,
             0.0,        0.0,        1.0, 0.0,
@@ -89,7 +89,7 @@ impl<T: Into<f64>> From<Matrix<T>> for Transform3D<f64> {
 impl<T: Into<f64>> From<Matrix3D<T>> for Transform3D<f64> {
     #[inline]
     fn from(m: Matrix3D<T>) -> Self {
-        Transform3D::row_major(
+        Transform3D::new(
             m.m11.into(), m.m12.into(), m.m13.into(), m.m14.into(),
             m.m21.into(), m.m22.into(), m.m23.into(), m.m24.into(),
             m.m31.into(), m.m32.into(), m.m33.into(), m.m34.into(),
@@ -443,15 +443,14 @@ where
         use self::TransformOperation::*;
         use std::f64;
 
-        const TWO_PI: f64 = 2.0f64 * f64::consts::PI;
         let reference_width = reference_box.map(|v| v.size.width);
         let reference_height = reference_box.map(|v| v.size.height);
         let matrix = match *self {
             Rotate3D(ax, ay, az, theta) => {
-                let theta = TWO_PI - theta.radians64();
+                let theta = theta.radians64();
                 let (ax, ay, az, theta) =
                     get_normalized_vector_and_angle(ax.into(), ay.into(), az.into(), theta);
-                Transform3D::create_rotation(
+                Transform3D::rotation(
                     ax as f64,
                     ay as f64,
                     az as f64,
@@ -459,56 +458,56 @@ where
                 )
             },
             RotateX(theta) => {
-                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
-                Transform3D::create_rotation(1., 0., 0., theta)
+                let theta = euclid::Angle::radians(theta.radians64());
+                Transform3D::rotation(1., 0., 0., theta)
             },
             RotateY(theta) => {
-                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
-                Transform3D::create_rotation(0., 1., 0., theta)
+                let theta = euclid::Angle::radians(theta.radians64());
+                Transform3D::rotation(0., 1., 0., theta)
             },
             RotateZ(theta) | Rotate(theta) => {
-                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
-                Transform3D::create_rotation(0., 0., 1., theta)
+                let theta = euclid::Angle::radians(theta.radians64());
+                Transform3D::rotation(0., 0., 1., theta)
             },
             Perspective(ref d) => {
                 let m = create_perspective_matrix(d.to_pixel_length(None)?);
                 m.cast()
             },
-            Scale3D(sx, sy, sz) => Transform3D::create_scale(sx.into(), sy.into(), sz.into()),
-            Scale(sx, sy) => Transform3D::create_scale(sx.into(), sy.into(), 1.),
-            ScaleX(s) => Transform3D::create_scale(s.into(), 1., 1.),
-            ScaleY(s) => Transform3D::create_scale(1., s.into(), 1.),
-            ScaleZ(s) => Transform3D::create_scale(1., 1., s.into()),
+            Scale3D(sx, sy, sz) => Transform3D::scale(sx.into(), sy.into(), sz.into()),
+            Scale(sx, sy) => Transform3D::scale(sx.into(), sy.into(), 1.),
+            ScaleX(s) => Transform3D::scale(s.into(), 1., 1.),
+            ScaleY(s) => Transform3D::scale(1., s.into(), 1.),
+            ScaleZ(s) => Transform3D::scale(1., 1., s.into()),
             Translate3D(ref tx, ref ty, ref tz) => {
                 let tx = tx.to_pixel_length(reference_width)? as f64;
                 let ty = ty.to_pixel_length(reference_height)? as f64;
-                Transform3D::create_translation(tx, ty, tz.to_pixel_length(None)? as f64)
+                Transform3D::translation(tx, ty, tz.to_pixel_length(None)? as f64)
             },
             Translate(ref tx, ref ty) => {
                 let tx = tx.to_pixel_length(reference_width)? as f64;
                 let ty = ty.to_pixel_length(reference_height)? as f64;
-                Transform3D::create_translation(tx, ty, 0.)
+                Transform3D::translation(tx, ty, 0.)
             },
             TranslateX(ref t) => {
                 let t = t.to_pixel_length(reference_width)? as f64;
-                Transform3D::create_translation(t, 0., 0.)
+                Transform3D::translation(t, 0., 0.)
             },
             TranslateY(ref t) => {
                 let t = t.to_pixel_length(reference_height)? as f64;
-                Transform3D::create_translation(0., t, 0.)
+                Transform3D::translation(0., t, 0.)
             },
             TranslateZ(ref z) => {
-                Transform3D::create_translation(0., 0., z.to_pixel_length(None)? as f64)
+                Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64)
             },
-            Skew(theta_x, theta_y) => Transform3D::create_skew(
+            Skew(theta_x, theta_y) => Transform3D::skew(
                 euclid::Angle::radians(theta_x.radians64()),
                 euclid::Angle::radians(theta_y.radians64()),
             ),
-            SkewX(theta) => Transform3D::create_skew(
+            SkewX(theta) => Transform3D::skew(
                 euclid::Angle::radians(theta.radians64()),
                 euclid::Angle::radians(0.),
             ),
-            SkewY(theta) => Transform3D::create_skew(
+            SkewY(theta) => Transform3D::skew(
                 euclid::Angle::radians(0.),
                 euclid::Angle::radians(theta.radians64()),
             ),
@@ -547,7 +546,7 @@ impl<T: ToMatrix> Transform<T> {
         let cast_3d_transform = |m: Transform3D<f64>| -> Transform3D<CSSFloat> {
             use std::{f32, f64};
             let cast = |v: f64| { v.min(f32::MAX as f64).max(f32::MIN as f64) as f32 };
-            Transform3D::row_major(
+            Transform3D::new(
                 cast(m.m11), cast(m.m12), cast(m.m13), cast(m.m14),
                 cast(m.m21), cast(m.m22), cast(m.m23), cast(m.m24),
                 cast(m.m31), cast(m.m32), cast(m.m33), cast(m.m34),
@@ -565,7 +564,7 @@ impl<T: ToMatrix> Transform<T> {
         reference_box: Option<&Rect<ComputedLength>>,
     ) -> Result<(Transform3D<f64>, bool), ()> {
         // We intentionally use Transform3D<f64> during computation to avoid error propagation
-        // because using f32 to compute triangle functions (e.g. in create_rotation()) is not
+        // because using f32 to compute triangle functions (e.g. in rotation()) is not
         // accurate enough. In Gecko, we also use "double" to compute the triangle functions.
         // Therefore, let's use Transform3D<f64> during matrix computation and cast it into f32
         // in the end.
@@ -575,7 +574,7 @@ impl<T: ToMatrix> Transform<T> {
         for operation in &*self.0 {
             let matrix = operation.to_3d_matrix(reference_box)?;
             contain_3d |= operation.is_3d();
-            transform = transform.pre_transform(&matrix);
+            transform = matrix.then(&transform);
         }
 
         Ok((transform, contain_3d))
@@ -595,7 +594,7 @@ pub fn create_perspective_matrix(d: CSSFloat) -> Transform3D<CSSFloat> {
     if d <= 0.0 {
         Transform3D::identity()
     } else {
-        Transform3D::create_perspective(d)
+        Transform3D::perspective(d)
     }
 }
 

From dfa715a8d8b89f4e5768f30f2de892d320cb1bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 10 Aug 2020 18:00:29 +0000
Subject: [PATCH 029/156] style: Fix a silly mistake in which we'd prefer a
 local name / tag invalidation to an id invalidation.

ID invalidations should always win.

This also prefers invalidations deeper in the subtree to higher up.

Differential Revision: https://phabricator.services.mozilla.com/D85615
---
 components/style/invalidation/stylesheets.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index 4b37133a282..18d24a28a78 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -340,6 +340,8 @@ impl StylesheetInvalidationSet {
         data.hint.contains(RestyleHint::RESTYLE_SELF) || any_children_invalid
     }
 
+    /// TODO(emilio): Reuse the bucket stuff from selectormap? That handles
+    /// :is() / :where() etc.
     fn scan_component(
         component: &Component<SelectorImpl>,
         invalidation: &mut Option<Invalidation>,
@@ -349,7 +351,7 @@ impl StylesheetInvalidationSet {
                 ref name,
                 ref lower_name,
             }) => {
-                if invalidation.as_ref().map_or(true, |s| !s.is_id_or_class()) {
+                if invalidation.is_none() {
                     *invalidation = Some(Invalidation::LocalName {
                         name: name.clone(),
                         lower_name: lower_name.clone(),
@@ -357,12 +359,12 @@ impl StylesheetInvalidationSet {
                 }
             },
             Component::Class(ref class) => {
-                if invalidation.as_ref().map_or(true, |s| !s.is_id()) {
+                if invalidation.as_ref().map_or(true, |s| !s.is_id_or_class()) {
                     *invalidation = Some(Invalidation::Class(class.clone()));
                 }
             },
             Component::ID(ref id) => {
-                if invalidation.is_none() {
+                if invalidation.as_ref().map_or(true, |s| !s.is_id()) {
                     *invalidation = Some(Invalidation::ID(id.clone()));
                 }
             },

From ca7e1ecfd8bd3c18b38f0e3890b6c05eedc7b60c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 10 Aug 2020 18:00:44 +0000
Subject: [PATCH 030/156] style: Invalidate for CSSOM changes in a more
 fine-grained way.

Also, for changes in CSS declarations, like changing
cssRules[i].style.color or something, we end up avoiding a lot of the
work we were doing.

This page still trips us in the sense that they add a stylesheet, then
call getBoundingClientRect(), then insert more rules in the stylesheet,
which causes us to rebuild a lot of the cascade data.

We could try to detect appends to the last stylesheet on the list or
something I guess, and avoid rebuilding the cascade data in some cases.

Depends on D85615

Differential Revision: https://phabricator.services.mozilla.com/D85616
---
 components/style/invalidation/stylesheets.rs  |  88 ++++++++-
 components/style/stylesheet_set.rs            |  55 +++++-
 components/style/stylesheets/mod.rs           |   2 +-
 .../style/stylesheets/rules_iterator.rs       | 187 +++++++++++-------
 components/style/stylesheets/stylesheet.rs    |   2 +-
 components/style/stylist.rs                   |  13 ++
 6 files changed, 273 insertions(+), 74 deletions(-)

diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index 18d24a28a78..b5868883248 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -16,10 +16,26 @@ use crate::selector_map::{MaybeCaseInsensitiveHashMap, PrecomputedHashMap};
 use crate::selector_parser::{SelectorImpl, Snapshot, SnapshotMap};
 use crate::shared_lock::SharedRwLockReadGuard;
 use crate::stylesheets::{CssRule, StylesheetInDocument};
+use crate::stylesheets::{EffectiveRules, EffectiveRulesIterator};
 use crate::Atom;
 use crate::LocalName as SelectorLocalName;
 use selectors::parser::{Component, LocalName, Selector};
 
+/// The kind of change that happened for a given rule.
+#[repr(u32)]
+#[derive(Clone, Copy, Debug, Eq, Hash, MallocSizeOf, PartialEq)]
+pub enum RuleChangeKind {
+    /// The rule was inserted.
+    Insertion,
+    /// The rule was removed.
+    Removal,
+    /// Some change in the rule which we don't know about, and could have made
+    /// the rule change in any way.
+    Generic,
+    /// A change in the declarations of a style rule.
+    StyleRuleDeclarations,
+}
+
 /// A style sheet invalidation represents a kind of element or subtree that may
 /// need to be restyled. Whether it represents a whole subtree or just a single
 /// element is determined by the given InvalidationKind in
@@ -162,7 +178,8 @@ impl StylesheetInvalidationSet {
         have_invalidations
     }
 
-    fn is_empty(&self) -> bool {
+    /// Returns whether there's no invalidation to process.
+    pub fn is_empty(&self) -> bool {
         !self.fully_invalid &&
             self.classes.is_empty() &&
             self.ids.is_empty() &&
@@ -484,6 +501,75 @@ impl StylesheetInvalidationSet {
         true
     }
 
+    /// Collects invalidations for a given CSS rule, if not fully invalid
+    /// already.
+    ///
+    /// TODO(emilio): we can't check whether the rule is inside a non-effective
+    /// subtree, we potentially could do that.
+    pub fn rule_changed<S>(
+        &mut self,
+        stylesheet: &S,
+        rule: &CssRule,
+        guard: &SharedRwLockReadGuard,
+        device: &Device,
+        quirks_mode: QuirksMode,
+        change_kind: RuleChangeKind,
+    ) where
+        S: StylesheetInDocument,
+    {
+        use crate::stylesheets::CssRule::*;
+
+        debug!("StylesheetInvalidationSet::rule_changed");
+        if self.fully_invalid {
+            return;
+        }
+
+        if !stylesheet.enabled() || !stylesheet.is_effective_for_device(device, guard) {
+            debug!(" > Stylesheet was not effective");
+            return; // Nothing to do here.
+        }
+
+        let is_generic_change = change_kind == RuleChangeKind::Generic;
+
+        match *rule {
+            Namespace(..) => {
+                // It's not clear what handling changes for this correctly would
+                // look like.
+            },
+            CounterStyle(..) |
+            Page(..) |
+            Viewport(..) |
+            FontFeatureValues(..) |
+            FontFace(..) |
+            Keyframes(..) |
+            Style(..) => {
+                if is_generic_change {
+                    // TODO(emilio): We need to do this for selector / keyframe
+                    // name / font-face changes, because we don't have the old
+                    // selector / name.  If we distinguish those changes
+                    // specially, then we can at least use this invalidation for
+                    // style declaration changes.
+                    return self.invalidate_fully();
+                }
+
+                self.collect_invalidations_for_rule(rule, guard, device, quirks_mode)
+            },
+            Document(..) | Import(..) | Media(..) | Supports(..) => {
+                if !is_generic_change &&
+                    !EffectiveRules::is_effective(guard, device, quirks_mode, rule)
+                {
+                    return;
+                }
+
+                let rules =
+                    EffectiveRulesIterator::effective_children(device, quirks_mode, guard, rule);
+                for rule in rules {
+                    self.collect_invalidations_for_rule(rule, guard, device, quirks_mode)
+                }
+            },
+        }
+    }
+
     /// Collects invalidations for a given CSS rule.
     fn collect_invalidations_for_rule(
         &mut self,
diff --git a/components/style/stylesheet_set.rs b/components/style/stylesheet_set.rs
index a9cd39eef20..93f4b986052 100644
--- a/components/style/stylesheet_set.rs
+++ b/components/style/stylesheet_set.rs
@@ -5,11 +5,11 @@
 //! A centralized set of stylesheets for a document.
 
 use crate::dom::TElement;
-use crate::invalidation::stylesheets::StylesheetInvalidationSet;
+use crate::invalidation::stylesheets::{StylesheetInvalidationSet, RuleChangeKind};
 use crate::media_queries::Device;
 use crate::selector_parser::SnapshotMap;
 use crate::shared_lock::SharedRwLockReadGuard;
-use crate::stylesheets::{Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument};
+use crate::stylesheets::{CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument};
 use std::{mem, slice};
 
 /// Entry for a StylesheetSet.
@@ -438,6 +438,56 @@ macro_rules! sheet_set_methods {
             let collection = self.collection_for(&sheet, guard);
             collection.remove(&sheet)
         }
+
+        /// Notify the set that a rule from a given stylesheet has changed
+        /// somehow.
+        pub fn rule_changed(
+            &mut self,
+            device: Option<&Device>,
+            sheet: &S,
+            rule: &CssRule,
+            guard: &SharedRwLockReadGuard,
+            change_kind: RuleChangeKind,
+        ) {
+            if let Some(device) = device {
+                let quirks_mode = sheet.quirks_mode(guard);
+                self.invalidations.rule_changed(
+                    sheet,
+                    rule,
+                    guard,
+                    device,
+                    quirks_mode,
+                    change_kind,
+                );
+            }
+
+            let validity = match change_kind {
+                // Insertion / Removals need to rebuild both the cascade and
+                // invalidation data. For generic changes this is conservative,
+                // could be optimized on a per-case basis.
+                RuleChangeKind::Generic |
+                RuleChangeKind::Insertion |
+                RuleChangeKind::Removal => DataValidity::FullyInvalid,
+                // TODO(emilio): This, in theory, doesn't need to invalidate
+                // style data, if the rule we're modifying is actually in the
+                // CascadeData already.
+                //
+                // But this is actually a bit tricky to prove, because when we
+                // copy-on-write a stylesheet we don't bother doing a rebuild,
+                // so we may still have rules from the original stylesheet
+                // instead of the cloned one that we're modifying. So don't
+                // bother for now and unconditionally rebuild, it's no worse
+                // than what we were already doing anyway.
+                //
+                // Maybe we could record whether we saw a clone in this flush,
+                // and if so do the conservative thing, otherwise just
+                // early-return.
+                RuleChangeKind::StyleRuleDeclarations => DataValidity::FullyInvalid,
+            };
+
+            let collection = self.collection_for(&sheet, guard);
+            collection.set_data_validity_at_least(validity);
+        }
     };
 }
 
@@ -485,6 +535,7 @@ where
 
     /// Returns whether the given set has changed from the last flush.
     pub fn has_changed(&self) -> bool {
+        !self.invalidations.is_empty() ||
         self.collections
             .iter_origins()
             .any(|(collection, _)| collection.dirty)
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index 12ba46b3e06..f83595dacef 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -56,7 +56,7 @@ pub use self::page_rule::PageRule;
 pub use self::rule_list::{CssRules, CssRulesHelpers};
 pub use self::rule_parser::{InsertRuleContext, State, TopLevelRuleParser};
 pub use self::rules_iterator::{AllRules, EffectiveRules};
-pub use self::rules_iterator::{NestedRuleIterationCondition, RulesIterator};
+pub use self::rules_iterator::{NestedRuleIterationCondition, EffectiveRulesIterator, RulesIterator};
 pub use self::style_rule::StyleRule;
 pub use self::stylesheet::{AllowImportRules, SanitizationData, SanitizationKind};
 pub use self::stylesheet::{DocumentStyleSheet, Namespaces, Stylesheet};
diff --git a/components/style/stylesheets/rules_iterator.rs b/components/style/stylesheets/rules_iterator.rs
index 866879ef30e..1fa25837a8c 100644
--- a/components/style/stylesheets/rules_iterator.rs
+++ b/components/style/stylesheets/rules_iterator.rs
@@ -35,15 +35,15 @@ where
         device: &'a Device,
         quirks_mode: QuirksMode,
         guard: &'a SharedRwLockReadGuard<'b>,
-        rules: &'a [CssRule],
+        rules: slice::Iter<'a, CssRule>,
     ) -> Self {
         let mut stack = SmallVec::new();
-        stack.push(rules.iter());
+        stack.push(rules);
         Self {
-            device: device,
-            quirks_mode: quirks_mode,
-            guard: guard,
-            stack: stack,
+            device,
+            quirks_mode,
+            guard,
+            stack,
             _phantom: ::std::marker::PhantomData,
         }
     }
@@ -54,6 +54,61 @@ where
     }
 }
 
+fn children_of_rule<'a, C>(
+    rule: &'a CssRule,
+    device: &'a Device,
+    quirks_mode: QuirksMode,
+    guard: &'a SharedRwLockReadGuard<'_>,
+    effective: &mut bool,
+) -> slice::Iter<'a, CssRule>
+where
+    C: NestedRuleIterationCondition + 'static,
+{
+    *effective = true;
+    match *rule {
+        CssRule::Namespace(_) |
+        CssRule::Style(_) |
+        CssRule::FontFace(_) |
+        CssRule::CounterStyle(_) |
+        CssRule::Viewport(_) |
+        CssRule::Keyframes(_) |
+        CssRule::Page(_) |
+        CssRule::FontFeatureValues(_) => [].iter(),
+        CssRule::Import(ref import_rule) => {
+            let import_rule = import_rule.read_with(guard);
+            if !C::process_import(guard, device, quirks_mode, import_rule) {
+                *effective = false;
+                return [].iter();
+            }
+            import_rule.stylesheet.rules(guard).iter()
+        },
+        CssRule::Document(ref doc_rule) => {
+            let doc_rule = doc_rule.read_with(guard);
+            if !C::process_document(guard, device, quirks_mode, doc_rule) {
+                *effective = false;
+                return [].iter();
+            }
+            doc_rule.rules.read_with(guard).0.iter()
+        },
+        CssRule::Media(ref lock) => {
+            let media_rule = lock.read_with(guard);
+            if !C::process_media(guard, device, quirks_mode, media_rule) {
+                *effective = false;
+                return [].iter();
+            }
+            media_rule.rules.read_with(guard).0.iter()
+        },
+        CssRule::Supports(ref lock) => {
+            let supports_rule = lock.read_with(guard);
+            if !C::process_supports(guard, device, quirks_mode, supports_rule) {
+                *effective = false;
+                return [].iter();
+            }
+            supports_rule.rules.read_with(guard).0.iter()
+        },
+    }
+}
+
 impl<'a, 'b, C> Iterator for RulesIterator<'a, 'b, C>
 where
     'b: 'a,
@@ -62,78 +117,28 @@ where
     type Item = &'a CssRule;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let mut nested_iter_finished = false;
         while !self.stack.is_empty() {
-            if nested_iter_finished {
-                self.stack.pop();
-                nested_iter_finished = false;
-                continue;
-            }
-
-            let rule;
-            let sub_iter = {
+            let rule = {
                 let nested_iter = self.stack.last_mut().unwrap();
-                rule = match nested_iter.next() {
+                match nested_iter.next() {
                     Some(r) => r,
                     None => {
-                        nested_iter_finished = true;
+                        self.stack.pop();
                         continue;
                     },
-                };
-
-                match *rule {
-                    CssRule::Namespace(_) |
-                    CssRule::Style(_) |
-                    CssRule::FontFace(_) |
-                    CssRule::CounterStyle(_) |
-                    CssRule::Viewport(_) |
-                    CssRule::Keyframes(_) |
-                    CssRule::Page(_) |
-                    CssRule::FontFeatureValues(_) => return Some(rule),
-                    CssRule::Import(ref import_rule) => {
-                        let import_rule = import_rule.read_with(self.guard);
-                        if !C::process_import(
-                            self.guard,
-                            self.device,
-                            self.quirks_mode,
-                            import_rule,
-                        ) {
-                            continue;
-                        }
-                        import_rule.stylesheet.rules(self.guard).iter()
-                    },
-                    CssRule::Document(ref doc_rule) => {
-                        let doc_rule = doc_rule.read_with(self.guard);
-                        if !C::process_document(self.guard, self.device, self.quirks_mode, doc_rule)
-                        {
-                            continue;
-                        }
-                        doc_rule.rules.read_with(self.guard).0.iter()
-                    },
-                    CssRule::Media(ref lock) => {
-                        let media_rule = lock.read_with(self.guard);
-                        if !C::process_media(self.guard, self.device, self.quirks_mode, media_rule)
-                        {
-                            continue;
-                        }
-                        media_rule.rules.read_with(self.guard).0.iter()
-                    },
-                    CssRule::Supports(ref lock) => {
-                        let supports_rule = lock.read_with(self.guard);
-                        if !C::process_supports(
-                            self.guard,
-                            self.device,
-                            self.quirks_mode,
-                            supports_rule,
-                        ) {
-                            continue;
-                        }
-                        supports_rule.rules.read_with(self.guard).0.iter()
-                    },
                 }
             };
 
-            self.stack.push(sub_iter);
+            let mut effective = true;
+            let children = children_of_rule::<C>(rule, self.device, self.quirks_mode, self.guard, &mut effective);
+            if !effective {
+                continue;
+            }
+
+            if !children.as_slice().is_empty() {
+                self.stack.push(children);
+            }
+
             return Some(rule);
         }
 
@@ -180,6 +185,36 @@ pub trait NestedRuleIterationCondition {
 /// A struct that represents the condition that a rule applies to the document.
 pub struct EffectiveRules;
 
+impl EffectiveRules {
+    /// Returns whether a given rule is effective.
+    pub fn is_effective(
+        guard: &SharedRwLockReadGuard,
+        device: &Device,
+        quirks_mode: QuirksMode,
+        rule: &CssRule,
+    ) -> bool {
+        match *rule {
+            CssRule::Import(ref import_rule) => {
+            let import_rule = import_rule.read_with(guard);
+                Self::process_import(guard, device, quirks_mode, import_rule)
+            },
+            CssRule::Document(ref doc_rule) => {
+                let doc_rule = doc_rule.read_with(guard);
+                Self::process_document(guard, device, quirks_mode, doc_rule)
+            },
+            CssRule::Media(ref lock) => {
+                let media_rule = lock.read_with(guard);
+                Self::process_media(guard, device, quirks_mode, media_rule)
+            },
+            CssRule::Supports(ref lock) => {
+                let supports_rule = lock.read_with(guard);
+                Self::process_supports(guard, device, quirks_mode, supports_rule)
+            },
+            _ => true,
+        }
+    }
+}
+
 impl NestedRuleIterationCondition for EffectiveRules {
     fn process_import(
         guard: &SharedRwLockReadGuard,
@@ -260,3 +295,17 @@ impl NestedRuleIterationCondition for AllRules {
 ///
 /// NOTE: This iterator recurses into `@import` rules.
 pub type EffectiveRulesIterator<'a, 'b> = RulesIterator<'a, 'b, EffectiveRules>;
+
+impl<'a, 'b> EffectiveRulesIterator<'a, 'b> {
+    /// Returns an iterator over the effective children of a rule, even if
+    /// `rule` itself is not effective.
+    pub fn effective_children(
+        device: &'a Device,
+        quirks_mode: QuirksMode,
+        guard: &'a SharedRwLockReadGuard<'b>,
+        rule: &'a CssRule,
+    ) -> Self {
+        let children = children_of_rule::<AllRules>(rule, device, quirks_mode, guard, &mut false);
+        EffectiveRulesIterator::new(device, quirks_mode, guard, children)
+    }
+}
diff --git a/components/style/stylesheets/stylesheet.rs b/components/style/stylesheets/stylesheet.rs
index 6679f587a41..e5b0c073f2f 100644
--- a/components/style/stylesheets/stylesheet.rs
+++ b/components/style/stylesheets/stylesheet.rs
@@ -243,7 +243,7 @@ pub trait StylesheetInDocument: ::std::fmt::Debug {
     where
         C: NestedRuleIterationCondition,
     {
-        RulesIterator::new(device, self.quirks_mode(guard), guard, self.rules(guard))
+        RulesIterator::new(device, self.quirks_mode(guard), guard, self.rules(guard).iter())
     }
 
     /// Returns whether the style-sheet applies for the current device.
diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index fc363b2ce68..8cf9efb3927 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -13,6 +13,7 @@ use crate::font_metrics::FontMetricsProvider;
 use crate::gecko_bindings::structs::{ServoStyleSetSizes, StyleRuleInclusion};
 use crate::invalidation::element::invalidation_map::InvalidationMap;
 use crate::invalidation::media_queries::{EffectiveMediaQueryResults, ToMediaListKey};
+use crate::invalidation::stylesheets::RuleChangeKind;
 use crate::media_queries::Device;
 use crate::properties::{self, CascadeMode, ComputedValues};
 use crate::properties::{AnimationDeclarations, PropertyDeclarationBlock};
@@ -605,6 +606,18 @@ impl Stylist {
             .remove_stylesheet(Some(&self.device), sheet, guard)
     }
 
+    /// Notify of a change of a given rule.
+    pub fn rule_changed(
+        &mut self,
+        sheet: &StylistSheet,
+        rule: &CssRule,
+        guard: &SharedRwLockReadGuard,
+        change_kind: RuleChangeKind,
+    ) {
+        self.stylesheets
+            .rule_changed(Some(&self.device), sheet, rule, guard, change_kind)
+    }
+
     /// Appends a new stylesheet to the current set.
     #[inline]
     pub fn sheet_count(&self, origin: Origin) -> usize {

From 0d7922cb534122ba8c1d000dee5d5b472d873137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 11 Aug 2020 05:54:17 +0000
Subject: [PATCH 031/156] style: Remove layout.css.shadow-parts.enabled.

Shipped since 72 (bug 1559074).

Differential Revision: https://phabricator.services.mozilla.com/D86661
---
 components/style/gecko/selector_parser.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 64e62badf3b..7056cde10a5 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -350,7 +350,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
 
     #[inline]
     fn parse_part(&self) -> bool {
-        self.chrome_rules_enabled() || static_prefs::pref!("layout.css.shadow-parts.enabled")
+        true
     }
 
     fn parse_non_ts_pseudo_class(

From 5ba426ae6f785407ea38ed9d66dff43bd8501213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 11 Aug 2020 05:54:22 +0000
Subject: [PATCH 032/156] style: Remove layout.css.is-where-selectors.enabled.

Shipped since 78 (bug 1632646).

Differential Revision: https://phabricator.services.mozilla.com/D86662
---
 components/style/gecko/selector_parser.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 7056cde10a5..d0f5c57b567 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -344,8 +344,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
 
     #[inline]
     fn parse_is_and_where(&self) -> bool {
-        self.in_user_agent_stylesheet() ||
-            static_prefs::pref!("layout.css.is-where-selectors.enabled")
+        true
     }
 
     #[inline]

From 2167a0c0990c15b6e67f2b93171369355a9dc179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 11 Aug 2020 10:27:42 +0000
Subject: [PATCH 033/156] style: Remove
 layout.css.comparison-functions.enabled.

Shipped since FF75 (bug 1519519).

Differential Revision: https://phabricator.services.mozilla.com/D86693
---
 components/style/values/specified/calc.rs | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/components/style/values/specified/calc.rs b/components/style/values/specified/calc.rs
index 9947fc7a8cc..fa5415ee3b8 100644
--- a/components/style/values/specified/calc.rs
+++ b/components/style/values/specified/calc.rs
@@ -517,26 +517,8 @@ impl CalcNode {
         name: &CowRcStr<'i>,
         location: cssparser::SourceLocation,
     ) -> Result<MathFunction, ParseError<'i>> {
-        // TODO(emilio): Unify below when the pref for math functions is gone.
-        if name.eq_ignore_ascii_case("calc") {
-            return Ok(MathFunction::Calc);
-        }
-
-        #[cfg(feature = "gecko")]
-        fn comparison_functions_enabled() -> bool {
-            static_prefs::pref!("layout.css.comparison-functions.enabled")
-        }
-
-        #[cfg(feature = "servo")]
-        fn comparison_functions_enabled() -> bool {
-            false
-        }
-
-        if !comparison_functions_enabled() {
-            return Err(location.new_unexpected_token_error(Token::Function(name.clone())));
-        }
-
         Ok(match_ignore_ascii_case! { &*name,
+            "calc" => MathFunction::Calc,
             "min" => MathFunction::Min,
             "max" => MathFunction::Max,
             "clamp" => MathFunction::Clamp,

From 73a9c57c3b1cda7fcff806aec3c180aaea0d6195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 12 Aug 2020 04:26:07 +0000
Subject: [PATCH 034/156] style: Implement :-moz-any() as an alias of :is().

This is strictly better and more flexible, but can change specificity so
have a pref in case it causes trouble. I doubt it will though, the
specificity rules of :is() make more sense, and my gut feeling is that
:-moz-any is not very used on the wild.

Make it early-beta-or-earlier for now to minimize risk, once this is on
nightly for a bit we can enable it everywhere.

Differential Revision: https://phabricator.services.mozilla.com/D86696
---
 components/style/gecko/selector_parser.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index d0f5c57b567..844991a427b 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -352,6 +352,12 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         true
     }
 
+    #[inline]
+    fn is_is_alias(&self, function: &str) -> bool {
+        static_prefs::pref!("layout.css.moz-any-is-is.enabled") &&
+            function.eq_ignore_ascii_case("-moz-any")
+    }
+
     fn parse_non_ts_pseudo_class(
         &self,
         location: SourceLocation,

From 9d55296893feaf186af1906e3c8537af81fd8ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 16 Aug 2020 00:43:48 +0000
Subject: [PATCH 035/156] style: Fix two minor issues with scrollbar style
 caching.

Add -moz-inert and -moz-script-level to the set of internal properties
that aren't included in "all".

-moz-inert may need to be uncacheable in the future if we make it not
change the pointer-events computed value. Left a comment to that effect.

Differential Revision: https://phabricator.services.mozilla.com/D87115
---
 components/style/style_adjuster.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index c48d1bc011a..a23f97d578a 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -162,6 +162,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     ///        user-select: none;
     ///        pointer-events: none;
     ///        cursor: default;
+    ///
+    /// NOTE: If this or the pointer-events tweak is removed, then
+    /// minimal-xul.css and the scrollbar style caching need to be tweaked.
     fn adjust_for_inert(&mut self) {
         use properties::longhands::_moz_inert::computed_value::T as Inert;
         use properties::longhands::_moz_user_focus::computed_value::T as UserFocus;

From 25de2a406eaecf991e803d4728367055ed55105d Mon Sep 17 00:00:00 2001
From: Zeke Medley <zekemedley@gmail.com>
Date: Mon, 17 Aug 2020 01:41:16 +0000
Subject: [PATCH 036/156] style: Update the prefers-contrast media query to use
 the new more/less keywords.

Per the resolution here:
https://github.com/w3c/csswg-drafts/issues/2943#issuecomment-672994920

Differential Revision: https://phabricator.services.mozilla.com/D86848
---
 components/style/gecko/media_features.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 0a86980167c..ef08cafabe0 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -313,8 +313,8 @@ fn eval_prefers_reduced_motion(device: &Device, query_value: Option<PrefersReduc
 #[repr(u8)]
 #[allow(missing_docs)]
 enum PrefersContrast {
-    High,
-    Low,
+    More,
+    Less,
     NoPreference,
     Forced,
 }
@@ -326,12 +326,11 @@ enum PrefersContrast {
 #[derive(Clone, Copy, Debug, FromPrimitive, PartialEq)]
 #[repr(u8)]
 pub enum ContrastPref {
-    /// High contrast is prefered. Corresponds to an accessibility theme
+    /// More contrast is prefered. Corresponds to an accessibility theme
     /// being enabled or firefox forcing high contrast colors.
-    High,
-    /// Low contrast is prefered. Corresponds to the
-    /// browser.display.prefers_low_contrast pref being true.
-    Low,
+    More,
+    /// Low contrast is prefered.
+    Less,
     /// The default value if neither high or low contrast is enabled.
     NoPreference,
 }
@@ -344,8 +343,8 @@ fn eval_prefers_contrast(device: &Device, query_value: Option<PrefersContrast>)
     if let Some(query_value) = query_value {
         match query_value {
             PrefersContrast::Forced => forced_colors,
-            PrefersContrast::High => contrast_pref == ContrastPref::High,
-            PrefersContrast::Low => contrast_pref == ContrastPref::Low,
+            PrefersContrast::More => contrast_pref == ContrastPref::More,
+            PrefersContrast::Less => contrast_pref == ContrastPref::Less,
             PrefersContrast::NoPreference => contrast_pref == ContrastPref::NoPreference,
         }
     } else {

From 5d5d4f4429d837f8a6ae664ba7891e37e8a4fe31 Mon Sep 17 00:00:00 2001
From: Shinichi Morimoto <shnmorimoto@gmail.com>
Date: Mon, 17 Aug 2020 17:51:31 +0000
Subject: [PATCH 037/156] style: Remove
 layout.css.offset-logical-properties.enabled.

Differential Revision: https://phabricator.services.mozilla.com/D87297
---
 components/style/properties/longhands/position.mako.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs
index 48976a8f123..e5afe7b2883 100644
--- a/components/style/properties/longhands/position.mako.rs
+++ b/components/style/properties/longhands/position.mako.rs
@@ -30,7 +30,6 @@
         "computed::LengthPercentageOrAuto::auto()",
         engines="gecko servo-2013 servo-2020",
         spec="https://drafts.csswg.org/css-logical-props/#propdef-inset-%s" % side,
-        alias="offset-%s:layout.css.offset-logical-properties.enabled" % side,
         animation_value_type="ComputedValue",
         logical=True,
         logical_group="inset",

From cf496e47277b250938249549de876e19bc03d202 Mon Sep 17 00:00:00 2001
From: Sean Feng <sefeng@mozilla.com>
Date: Mon, 17 Aug 2020 15:41:19 +0000
Subject: [PATCH 038/156] style: Make the document blocked by the topmost
 element in the top layer.

Spec: https://html.spec.whatwg.org/multipage/#blocked-by-a-modal-dialog

Depends on D86392

Differential Revision: https://phabricator.services.mozilla.com/D86227
---
 components/style/element_state.rs                  | 2 ++
 components/style/gecko/non_ts_pseudo_class_list.rs | 1 +
 components/style/gecko/wrapper.rs                  | 1 +
 components/style/style_adjuster.rs                 | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index da44186b44b..a3d001a2fab 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -148,6 +148,8 @@ bitflags! {
 
         /// https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees
         const IN_MOZINERT_STATE = 1 << 54;
+        /// State for the topmost dialog element in top layer
+        const IN_TOPMOST_MODAL_DIALOG_STATE = 1 << 55;
     }
 }
 
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index bdd994c7095..fedbed331f0 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -53,6 +53,7 @@ macro_rules! apply_non_ts_list {
                 ("-moz-styleeditor-transitioning", MozStyleeditorTransitioning, IN_STYLEEDITOR_TRANSITIONING_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("fullscreen", Fullscreen, IN_FULLSCREEN_STATE, _),
                 ("-moz-modal-dialog", MozModalDialog, IN_MODAL_DIALOG_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
+                ("-moz-topmost-modal-dialog", MozTopmostModalDialog, IN_TOPMOST_MODAL_DIALOG_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 // TODO(emilio): This is inconsistently named (the capital R).
                 ("-moz-focusring", MozFocusRing, IN_FOCUSRING_STATE, _),
                 ("-moz-broken", MozBroken, IN_BROKEN_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 3d4f186fcc3..ef6ce3df4f3 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2063,6 +2063,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozDirAttrLikeAuto |
             NonTSPseudoClass::MozAutofill |
             NonTSPseudoClass::MozModalDialog |
+            NonTSPseudoClass::MozTopmostModalDialog |
             NonTSPseudoClass::Active |
             NonTSPseudoClass::Hover |
             NonTSPseudoClass::MozAutofillPreview => {
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index a23f97d578a..db950397c37 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -163,6 +163,9 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     ///        pointer-events: none;
     ///        cursor: default;
     ///
+    /// NOTE: dialog:-moz-topmost-modal-dialog is used to override above
+    /// rules to remove the inertness for the topmost modal dialog.
+    ///
     /// NOTE: If this or the pointer-events tweak is removed, then
     /// minimal-xul.css and the scrollbar style caching need to be tweaked.
     fn adjust_for_inert(&mut self) {

From 9fd3d9a5e96bb841a9c75e80df240530d31d5525 Mon Sep 17 00:00:00 2001
From: Zeke Medley <zekemedley@gmail.com>
Date: Mon, 17 Aug 2020 20:50:49 +0000
Subject: [PATCH 039/156] style: Support forced colors media feature.

Enabled behind layout.css.forced-colors.enabled pending finalization
of the spec:

<https://drafts.csswg.org/mediaqueries-5/#forced-colors>

Differential Revision: https://phabricator.services.mozilla.com/D87147
---
 components/style/gecko/media_features.rs      | 28 ++++++++++++++++++-
 .../media_queries/media_feature_expression.rs |  3 ++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index ef08cafabe0..321669ce1af 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -353,6 +353,26 @@ fn eval_prefers_contrast(device: &Device, query_value: Option<PrefersContrast>)
     }
 }
 
+/// Possible values for the forced-colors media query.
+/// https://drafts.csswg.org/mediaqueries-5/#forced-colors
+#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq, Parse, ToCss)]
+#[repr(u8)]
+pub enum ForcedColors {
+    /// Page colors are not being forced.
+    None,
+    /// Page colors are being forced.
+    Active,
+}
+
+/// https://drafts.csswg.org/mediaqueries-5/#forced-colors
+fn eval_forced_colors(device: &Device, query_value: Option<ForcedColors>) -> bool {
+    let forced = !device.use_document_colors();
+    match query_value {
+        Some(query_value) => forced == (query_value == ForcedColors::Active),
+        None => forced,
+    }
+}
+
 #[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)]
 #[repr(u8)]
 enum OverflowBlock {
@@ -593,7 +613,7 @@ macro_rules! system_metric_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 54] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -722,6 +742,12 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 54] = [
         // is done.
         ParsingRequirements::empty(),
     ),
+    feature!(
+        atom!("forced-colors"),
+        AllowsRanges::No,
+        keyword_evaluator!(eval_forced_colors, ForcedColors),
+        ParsingRequirements::empty(),
+    ),
     feature!(
         atom!("overflow-block"),
         AllowsRanges::No,
diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs
index 0d2262f1def..f4eb40d1afa 100644
--- a/components/style/media_queries/media_feature_expression.rs
+++ b/components/style/media_queries/media_feature_expression.rs
@@ -224,6 +224,9 @@ fn disabled_by_pref(feature: &Atom, context: &ParserContext) -> bool {
         if *feature == atom!("-moz-touch-enabled") {
             return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled");
         }
+        if *feature == atom!("forced-colors") {
+            return !static_prefs::pref!("layout.css.forced-colors.enabled");
+        }
         // prefers-contrast is always enabled in the ua and chrome. On
         // the web it is hidden behind a preference.
         if *feature == atom!("prefers-contrast") {

From c200b673951cdff7a20fa692aefb15f8e3dc6a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 19 Aug 2020 10:32:16 +0000
Subject: [PATCH 040/156] style: Make media queries and viewport units in print
 be evaluated against the default page size minus margins.

For that, move the default page margin computation to nsPresContext.

See https://github.com/w3c/csswg-drafts/issues/5437 as to why doing this
and other alternatives.

Differential Revision: https://phabricator.services.mozilla.com/D87311
---
 components/style/gecko/media_features.rs | 20 ++++---------------
 components/style/gecko/media_queries.rs  | 25 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 321669ce1af..ed0dac47795 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -17,18 +17,6 @@ use crate::Atom;
 use app_units::Au;
 use euclid::default::Size2D;
 
-fn viewport_size(device: &Device) -> Size2D<Au> {
-    if let Some(pc) = device.pres_context() {
-        if pc.mIsRootPaginatedDocument() != 0 {
-            // We want the page size, including unprintable areas and margins.
-            // FIXME(emilio, bug 1414600): Not quite!
-            let area = &pc.mPageSize;
-            return Size2D::new(Au(area.width), Au(area.height));
-        }
-    }
-    device.au_viewport_size()
-}
-
 fn device_size(device: &Device) -> Size2D<Au> {
     let mut width = 0;
     let mut height = 0;
@@ -47,7 +35,7 @@ fn eval_width(
     RangeOrOperator::evaluate(
         range_or_operator,
         value.map(Au::from),
-        viewport_size(device).width,
+        device.au_viewport_size().width,
     )
 }
 
@@ -73,7 +61,7 @@ fn eval_height(
     RangeOrOperator::evaluate(
         range_or_operator,
         value.map(Au::from),
-        viewport_size(device).height,
+        device.au_viewport_size().height,
     )
 }
 
@@ -115,7 +103,7 @@ fn eval_aspect_ratio(
     query_value: Option<Ratio>,
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
-    eval_aspect_ratio_for(device, query_value, range_or_operator, viewport_size)
+    eval_aspect_ratio_for(device, query_value, range_or_operator, Device::au_viewport_size)
 }
 
 /// https://drafts.csswg.org/mediaqueries-4/#device-aspect-ratio
@@ -168,7 +156,7 @@ where
 
 /// https://drafts.csswg.org/mediaqueries-4/#orientation
 fn eval_orientation(device: &Device, value: Option<Orientation>) -> bool {
-    eval_orientation_for(device, value, viewport_size)
+    eval_orientation_for(device, value, Device::au_viewport_size)
 }
 
 /// FIXME: There's no spec for `-moz-device-orientation`.
diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs
index 663acae7b6e..cf28002e621 100644
--- a/components/style/gecko/media_queries.rs
+++ b/components/style/gecko/media_queries.rs
@@ -19,7 +19,7 @@ use cssparser::RGBA;
 use euclid::default::Size2D;
 use euclid::{Scale, SideOffsets2D};
 use servo_arc::Arc;
-use std::fmt;
+use std::{cmp, fmt};
 use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel};
@@ -223,12 +223,29 @@ impl Device {
         MediaType(CustomIdent(unsafe { Atom::from_raw(medium_to_use) }))
     }
 
+    // It may make sense to account for @page rule margins here somehow, however
+    // it's not clear how that'd work, see:
+    // https://github.com/w3c/csswg-drafts/issues/5437
+    fn page_size_minus_default_margin(&self, pc: &structs::nsPresContext) -> Size2D<Au> {
+        debug_assert!(pc.mIsRootPaginatedDocument() != 0);
+        let area = &pc.mPageSize;
+        let margin = &pc.mDefaultPageMargin;
+        let width = area.width - margin.left - margin.right;
+        let height = area.height - margin.top - margin.bottom;
+        Size2D::new(Au(cmp::max(width, 0)), Au(cmp::max(height, 0)))
+    }
+
     /// Returns the current viewport size in app units.
     pub fn au_viewport_size(&self) -> Size2D<Au> {
         let pc = match self.pres_context() {
             Some(pc) => pc,
             None => return Size2D::new(Au(0), Au(0)),
         };
+
+        if pc.mIsRootPaginatedDocument() != 0 {
+            return self.page_size_minus_default_margin(pc);
+        }
+
         let area = &pc.mVisibleArea;
         Size2D::new(Au(area.width), Au(area.height))
     }
@@ -237,11 +254,15 @@ impl Device {
     /// used for viewport unit resolution.
     pub fn au_viewport_size_for_viewport_unit_resolution(&self) -> Size2D<Au> {
         self.used_viewport_size.store(true, Ordering::Relaxed);
-
         let pc = match self.pres_context() {
             Some(pc) => pc,
             None => return Size2D::new(Au(0), Au(0)),
         };
+
+        if pc.mIsRootPaginatedDocument() != 0 {
+            return self.page_size_minus_default_margin(pc)
+        }
+
         let size = &pc.mSizeForViewportUnits;
         Size2D::new(Au(size.width), Au(size.height))
     }

From f2dfe7f08c0230911e67b400297cc4f429639da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 20 Aug 2020 10:45:42 +0000
Subject: [PATCH 041/156] style: Bail out when collecting invalidations for
 nested rules if any of them make us fully invalid.

Differential Revision: https://phabricator.services.mozilla.com/D87446
---
 components/style/invalidation/stylesheets.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index b5868883248..b50e04b0f0b 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -564,7 +564,10 @@ impl StylesheetInvalidationSet {
                 let rules =
                     EffectiveRulesIterator::effective_children(device, quirks_mode, guard, rule);
                 for rule in rules {
-                    self.collect_invalidations_for_rule(rule, guard, device, quirks_mode)
+                    self.collect_invalidations_for_rule(rule, guard, device, quirks_mode);
+                    if self.fully_invalid {
+                        break;
+                    }
                 }
             },
         }

From 16e0fd3e1f28a1a0d80d0effa158ee5822a7b0a1 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 26 Aug 2020 11:45:35 +0000
Subject: [PATCH 042/156] style: Replace :-moz-native-anonymous-no-specificity
 with :where(:-moz-native-anonymous).

Differential Revision: https://phabricator.services.mozilla.com/D88255
---
 components/style/gecko/non_ts_pseudo_class_list.rs | 1 -
 components/style/gecko/selector_parser.rs          | 6 ------
 components/style/gecko/wrapper.rs                  | 5 +----
 components/style/servo/selector_parser.rs          | 5 -----
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index fedbed331f0..66851f1d46b 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -98,7 +98,6 @@ macro_rules! apply_non_ts_list {
                 ("-moz-last-node", MozLastNode, _, _),
                 ("-moz-only-whitespace", MozOnlyWhitespace, _, _),
                 ("-moz-native-anonymous", MozNativeAnonymous, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
-                ("-moz-native-anonymous-no-specificity", MozNativeAnonymousNoSpecificity, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-use-shadow-tree-root", MozUseShadowTreeRoot, _, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-is-html", MozIsHTML, _, _),
                 ("-moz-placeholder", MozPlaceholder, _, _),
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 844991a427b..f5662d6871d 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -216,7 +216,6 @@ impl NonTSPseudoClass {
                       NonTSPseudoClass::MozIsHTML |
                       // We prevent style sharing for NAC.
                       NonTSPseudoClass::MozNativeAnonymous |
-                      NonTSPseudoClass::MozNativeAnonymousNoSpecificity |
                       // :-moz-placeholder is parsed but never matches.
                       NonTSPseudoClass::MozPlaceholder |
                       // :-moz-locale-dir and :-moz-window-inactive depend only on
@@ -249,11 +248,6 @@ impl ::selectors::parser::NonTSPseudoClass for NonTSPseudoClass {
         )
     }
 
-    #[inline]
-    fn has_zero_specificity(&self) -> bool {
-        matches!(*self, NonTSPseudoClass::MozNativeAnonymousNoSpecificity)
-    }
-
     fn visit<V>(&self, visitor: &mut V) -> bool
     where
         V: SelectorVisitor<Impl = Self::Impl>,
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index ef6ce3df4f3..524a2372077 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2109,10 +2109,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
                 }
                 true
             },
-            NonTSPseudoClass::MozNativeAnonymous |
-            NonTSPseudoClass::MozNativeAnonymousNoSpecificity => {
-                self.is_in_native_anonymous_subtree()
-            },
+            NonTSPseudoClass::MozNativeAnonymous => self.is_in_native_anonymous_subtree(),
             NonTSPseudoClass::MozUseShadowTreeRoot => self.is_root_of_use_element_shadow_tree(),
             NonTSPseudoClass::MozTableBorderNonzero => unsafe {
                 bindings::Gecko_IsTableBorderNonzero(self.0)
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index b11751fbec0..82722571c85 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -313,11 +313,6 @@ impl ::selectors::parser::NonTSPseudoClass for NonTSPseudoClass {
         )
     }
 
-    #[inline]
-    fn has_zero_specificity(&self) -> bool {
-        false
-    }
-
     fn visit<V>(&self, _: &mut V) -> bool
     where
         V: SelectorVisitor<Impl = Self::Impl>,

From 35716fd514b7adfe11726d5bfea4b8f486050834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 27 Aug 2020 09:37:31 +0000
Subject: [PATCH 043/156] style: Only apply grayscale filter for printing on
 print preview.

Differential Revision: https://phabricator.services.mozilla.com/D88065
---
 components/style/gecko/media_features.rs | 20 +++++++++++++++++++-
 components/style/gecko/media_queries.rs  |  9 +++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index ed0dac47795..c96996a18ea 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -521,6 +521,18 @@ fn eval_moz_is_glyph(
     query_value.map_or(is_glyph, |v| v == is_glyph)
 }
 
+fn eval_moz_print_preview(
+    device: &Device,
+    query_value: Option<bool>,
+    _: Option<RangeOrOperator>,
+) -> bool {
+    let is_print_preview = device.is_print_preview();
+    if is_print_preview {
+        debug_assert_eq!(device.media_type(), MediaType::print());
+    }
+    query_value.map_or(is_print_preview, |v| v == is_print_preview)
+}
+
 fn eval_moz_is_resource_document(
     device: &Device,
     query_value: Option<bool>,
@@ -601,7 +613,7 @@ macro_rules! system_metric_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -799,6 +811,12 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
         Evaluator::Ident(eval_moz_os_version),
         ParsingRequirements::CHROME_AND_UA_ONLY,
     ),
+    feature!(
+        atom!("-moz-print-preview"),
+        AllowsRanges::No,
+        Evaluator::BoolInteger(eval_moz_print_preview),
+        ParsingRequirements::CHROME_AND_UA_ONLY,
+    ),
     system_metric_feature!(atom!("-moz-scrollbar-start-backward")),
     system_metric_feature!(atom!("-moz-scrollbar-start-forward")),
     system_metric_feature!(atom!("-moz-scrollbar-end-backward")),
diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs
index cf28002e621..e5ffccf11c1 100644
--- a/components/style/gecko/media_queries.rs
+++ b/components/style/gecko/media_queries.rs
@@ -206,6 +206,15 @@ impl Device {
         self.reset_computed_values();
     }
 
+    /// Returns whether this document is in print preview.
+    pub fn is_print_preview(&self) -> bool {
+        let pc = match self.pres_context() {
+            Some(pc) => pc,
+            None => return false,
+        };
+        pc.mType == structs::nsPresContext_nsPresContextType_eContext_PrintPreview
+    }
+
     /// Returns the current media type of the device.
     pub fn media_type(&self) -> MediaType {
         let pc = match self.pres_context() {

From 74c449c04c799cd8b8830ee35b0891a7618bbe1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 1 Sep 2020 22:58:10 +0000
Subject: [PATCH 044/156] style: Rename ::file-chooser-button to
 ::file-selector-button, and enable it in all channels.

See https://github.com/w3c/csswg-drafts/issues/5049

Differential Revision: https://phabricator.services.mozilla.com/D88995
---
 components/style/gecko/pseudo_element.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/style/gecko/pseudo_element.rs b/components/style/gecko/pseudo_element.rs
index 16e3ab312f4..ed312dc2d8f 100644
--- a/components/style/gecko/pseudo_element.rs
+++ b/components/style/gecko/pseudo_element.rs
@@ -38,7 +38,7 @@ impl ::selectors::parser::PseudoElement for PseudoElement {
                 PseudoElement::After |
                 PseudoElement::Marker |
                 PseudoElement::Placeholder |
-                PseudoElement::FileChooserButton
+                PseudoElement::FileSelectorButton
         )
     }
 
@@ -164,8 +164,8 @@ impl PseudoElement {
             PseudoElement::MozFocusOuter => {
                 static_prefs::pref!("layout.css.moz-focus-outer.enabled")
             },
-            PseudoElement::FileChooserButton => {
-                static_prefs::pref!("layout.css.file-chooser-button.enabled")
+            PseudoElement::FileSelectorButton => {
+                static_prefs::pref!("layout.css.file-selector-button.enabled")
             },
             _ => (self.flags() & structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS_AND_CHROME) == 0,
         }

From cd7619dbf64493bccbab28c1ea3cb50b74c81cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 5 Sep 2020 00:42:43 +0000
Subject: [PATCH 045/156] style: Make @font-face and @counter-style
 serialization closer other browsers and style rules.

Style rules serialize on one line and so should @font-face blocks.

Part of https://github.com/w3c/csswg-drafts/issues/4828.

Differential Revision: https://phabricator.services.mozilla.com/D89302
---
 components/style/counter_style/mod.rs |  6 +++---
 components/style/font_face.rs         | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs
index ecdc8828ec1..c7854b1ef1e 100644
--- a/components/style/counter_style/mod.rs
+++ b/components/style/counter_style/mod.rs
@@ -232,12 +232,12 @@ macro_rules! counter_style_descriptors {
             fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result {
                 dest.write_str("@counter-style ")?;
                 self.name.to_css(&mut CssWriter::new(dest))?;
-                dest.write_str(" {\n")?;
+                dest.write_str(" { ")?;
                 $(
                     if let Some(ref value) = self.$ident {
-                        dest.write_str(concat!("  ", $name, ": "))?;
+                        dest.write_str(concat!($name, ": "))?;
                         ToCss::to_css(value, &mut CssWriter::new(dest))?;
-                        dest.write_str(";\n")?;
+                        dest.write_str("; ")?;
                     }
                 )+
                 dest.write_str("}")
diff --git a/components/style/font_face.rs b/components/style/font_face.rs
index 3ddd6b69a85..24204efc131 100644
--- a/components/style/font_face.rs
+++ b/components/style/font_face.rs
@@ -456,9 +456,9 @@ macro_rules! font_face_descriptors_common {
             pub fn decl_to_css(&self, dest: &mut CssStringWriter) -> fmt::Result {
                 $(
                     if let Some(ref value) = self.$ident {
-                        dest.write_str(concat!("  ", $name, ": "))?;
+                        dest.write_str(concat!($name, ": "))?;
                         ToCss::to_css(value, &mut CssWriter::new(dest))?;
-                        dest.write_str(";\n")?;
+                        dest.write_str("; ")?;
                     }
                 )*
                 Ok(())
@@ -469,8 +469,11 @@ macro_rules! font_face_descriptors_common {
            type Declaration = ();
            type Error = StyleParseErrorKind<'i>;
 
-           fn parse_value<'t>(&mut self, name: CowRcStr<'i>, input: &mut Parser<'i, 't>)
-                              -> Result<(), ParseError<'i>> {
+           fn parse_value<'t>(
+               &mut self,
+               name: CowRcStr<'i>,
+               input: &mut Parser<'i, 't>,
+            ) -> Result<(), ParseError<'i>> {
                 match_ignore_ascii_case! { &*name,
                     $(
                         $name if is_descriptor_enabled!($name) => {
@@ -493,7 +496,7 @@ macro_rules! font_face_descriptors_common {
 impl ToCssWithGuard for FontFaceRuleData {
     // Serialization of FontFaceRule is not specced.
     fn to_css(&self, _guard: &SharedRwLockReadGuard, dest: &mut CssStringWriter) -> fmt::Result {
-        dest.write_str("@font-face {\n")?;
+        dest.write_str("@font-face { ")?;
         self.decl_to_css(dest)?;
         dest.write_str("}")
     }

From ad0f63769cbcd7e6b4860f0c9179f58c8c8a7485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 8 Sep 2020 10:33:03 +0000
Subject: [PATCH 046/156] style: Speed up custom property diffing.

When entering or leaving fullscreen in youtube, we spend most of the
restyle time diffing custom properties, under IndexMap::eq.

Turns out that IndexMap equality is not order-aware, and thus you
actually need to make a hashmap lookup for each entry in the map, which
is unnecessarily inefficient.

Instead, just compare the iterators.

See https://github.com/bluss/indexmap/issues/153.

Differential Revision: https://phabricator.services.mozilla.com/D89434
---
 components/style/gecko/restyle_damage.rs      |  2 +-
 .../style/properties/properties.mako.rs       | 21 +++++++++++++++++++
 components/style/servo/restyle_damage.rs      |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/style/gecko/restyle_damage.rs b/components/style/gecko/restyle_damage.rs
index a97098363cb..4749daea183 100644
--- a/components/style/gecko/restyle_damage.rs
+++ b/components/style/gecko/restyle_damage.rs
@@ -57,7 +57,7 @@ impl GeckoRestyleDamage {
                 &mut reset_only,
             )
         };
-        if reset_only && old_style.custom_properties() != new_style.custom_properties() {
+        if reset_only && !old_style.custom_properties_equal(new_style) {
             // The Gecko_CalcStyleDifference call only checks the non-custom
             // property structs, so we check the custom properties here. Since
             // they generate no damage themselves, we can skip this check if we
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index e0e0fe4cb03..9f204a3c36d 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -2975,6 +2975,27 @@ impl ComputedValues {
         self.custom_properties.as_ref()
     }
 
+    /// Returns whether we have the same custom properties as another style.
+    ///
+    /// This should effectively be just:
+    ///
+    ///   self.custom_properties() == other.custom_properties()
+    ///
+    /// But that's not really the case because IndexMap equality doesn't
+    /// consider ordering, which we have to account for. Also, for the same
+    /// reason, IndexMap equality comparisons are slower than needed.
+    ///
+    /// See https://github.com/bluss/indexmap/issues/153
+    pub fn custom_properties_equal(&self, other: &Self) -> bool {
+        match (self.custom_properties(), other.custom_properties()) {
+            (Some(l), Some(r)) => {
+                l.len() == r.len() && l.iter().zip(r.iter()).all(|((k1, v1), (k2, v2))| k1 == k2 && v1 == v2)
+            },
+            (None, None) => true,
+            _ => false,
+        }
+    }
+
 % for prop in data.longhands:
     /// Gets the computed value of a given property.
     #[inline(always)]
diff --git a/components/style/servo/restyle_damage.rs b/components/style/servo/restyle_damage.rs
index cee0e486f3f..fe17fa6198b 100644
--- a/components/style/servo/restyle_damage.rs
+++ b/components/style/servo/restyle_damage.rs
@@ -254,7 +254,7 @@ fn compute_damage(old: &ComputedValues, new: &ComputedValues) -> ServoRestyleDam
 
     // Paint worklets may depend on custom properties,
     // so if they have changed we should repaint.
-    if old.custom_properties() != new.custom_properties() {
+    if !old.custom_properties_equal(new) {
         damage.insert(ServoRestyleDamage::REPAINT);
     }
 

From 768db078ef2b1e2675e5ddc929f83e736ee31e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 10 Sep 2020 08:58:09 +0000
Subject: [PATCH 047/156] style: Make appearance: button behave like auto.

As per https://github.com/w3c/csswg-drafts/issues/5174.

Differential Revision: https://phabricator.services.mozilla.com/D89119
---
 components/style/properties/data.py           |  1 -
 .../style/properties/longhands/box.mako.rs    | 19 --------------
 components/style/values/computed/box.rs       |  2 +-
 components/style/values/computed/mod.rs       |  2 +-
 components/style/values/specified/box.rs      | 25 -------------------
 components/style/values/specified/mod.rs      |  2 +-
 6 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index f141160af1a..e2308d93781 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -334,7 +334,6 @@ class Longhand(object):
                 "BackgroundRepeat",
                 "BorderImageRepeat",
                 "BorderStyle",
-                "ButtonAppearance",
                 "Clear",
                 "ColumnCount",
                 "Contain",
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 32a541481e2..ca93fd916ea 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -639,25 +639,6 @@ ${helpers.predefined_type(
     gecko_ffi_name="mDefaultAppearance",
 )}
 
-// A UA-sheet only property that controls the effect of `appearance: button`
-// on the element: `-moz-button-appearance: allow` means the element is rendered
-// with button appearance, and `-moz-button-appearance: disallow` is treated
-// like `appearance: auto`.
-//
-// https://github.com/w3c/csswg-drafts/issues/5174 proposes to simplify `button`
-// to mean `auto` unconditionally, at which point this property can be removed.
-${helpers.predefined_type(
-    "-moz-button-appearance",
-    "ButtonAppearance",
-    "computed::ButtonAppearance::Allow",
-    engines="gecko",
-    animation_value_type="none",
-    needs_context=False,
-    spec="Internal (not web-exposed)",
-    enabled_in="ua",
-    gecko_ffi_name="mButtonAppearance",
-)}
-
 ${helpers.single_keyword(
     "-moz-orient",
     "inline block horizontal vertical",
diff --git a/components/style/values/computed/box.rs b/components/style/values/computed/box.rs
index 8054a9bda58..6dbdcf497de 100644
--- a/components/style/values/computed/box.rs
+++ b/components/style/values/computed/box.rs
@@ -12,7 +12,7 @@ use crate::values::generics::box_::VerticalAlign as GenericVerticalAlign;
 use crate::values::specified::box_ as specified;
 
 pub use crate::values::specified::box_::{AnimationName, Appearance, BreakBetween, BreakWithin};
-pub use crate::values::specified::box_::{ButtonAppearance, Clear as SpecifiedClear};
+pub use crate::values::specified::box_::{Clear as SpecifiedClear};
 pub use crate::values::specified::box_::{Float as SpecifiedFloat, Contain, Display, Overflow};
 pub use crate::values::specified::box_::{OverflowAnchor, OverflowClipBox, OverscrollBehavior};
 pub use crate::values::specified::box_::{
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 95fb405e4ba..aa13ff89d7c 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -43,7 +43,7 @@ pub use self::border::{BorderCornerRadius, BorderRadius, BorderSpacing};
 pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderImageSlice, BorderImageWidth};
 pub use self::box_::{AnimationIterationCount, AnimationName, Contain};
-pub use self::box_::{Appearance, BreakBetween, BreakWithin, ButtonAppearance, Clear, Float};
+pub use self::box_::{Appearance, BreakBetween, BreakWithin, Clear, Float};
 pub use self::box_::{Display, Overflow, OverflowAnchor, TransitionProperty};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize};
 pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType};
diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 82bb0ab9df0..b51634d5b3a 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1844,31 +1844,6 @@ pub enum Appearance {
     Count,
 }
 
-/// The effect of `appearance: button` on an element.
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    Eq,
-    Hash,
-    MallocSizeOf,
-    Parse,
-    PartialEq,
-    SpecifiedValueInfo,
-    ToCss,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-)]
-#[repr(u8)]
-pub enum ButtonAppearance {
-    /// `appearance: button` means the element is rendered with button
-    /// appearance.
-    Allow,
-    /// `appearance: button` is treated like `appearance: auto`.
-    Disallow,
-}
-
 /// A kind of break between two boxes.
 ///
 /// https://drafts.csswg.org/css-break/#break-between
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 8de81acf8ff..8ddca48d599 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -37,7 +37,7 @@ pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth};
 pub use self::border::{BorderImageRepeat, BorderImageSideWidth};
 pub use self::border::{BorderRadius, BorderSideWidth, BorderSpacing, BorderStyle};
 pub use self::box_::{AnimationIterationCount, AnimationName, Contain, Display};
-pub use self::box_::{Appearance, BreakBetween, BreakWithin, ButtonAppearance};
+pub use self::box_::{Appearance, BreakBetween, BreakWithin};
 pub use self::box_::{Clear, Float, Overflow, OverflowAnchor};
 pub use self::box_::{OverflowClipBox, OverscrollBehavior, Perspective, Resize};
 pub use self::box_::{ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType};

From 19c24075b46bacc2dbdf7d363aaba3779f8a7962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 11 Sep 2020 19:26:40 +0000
Subject: [PATCH 048/156] style: Remove -moz-user-disabled.

We treat it exactly the same as -moz-broken. The pseudo-class is not
exposed to content, so I don't think we have a reason to keep it around.

Differential Revision: https://phabricator.services.mozilla.com/D89904
---
 components/style/element_state.rs                  | 2 --
 components/style/gecko/non_ts_pseudo_class_list.rs | 2 --
 components/style/gecko/wrapper.rs                  | 1 -
 3 files changed, 5 deletions(-)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index a3d001a2fab..cdce4d3cc75 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -53,8 +53,6 @@ bitflags! {
         const IN_MOZ_UI_INVALID_STATE = 1 << 13;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-broken
         const IN_BROKEN_STATE = 1 << 14;
-        /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-user-disabled
-        const IN_USER_DISABLED_STATE = 1 << 15;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-suppressed
         const IN_SUPPRESSED_STATE = 1 << 16;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-loading
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 66851f1d46b..030452a6c0a 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -92,8 +92,6 @@ macro_rules! apply_non_ts_list {
                 ("-moz-meter-sub-optimum", MozMeterSubOptimum, IN_SUB_OPTIMUM_STATE, _),
                 ("-moz-meter-sub-sub-optimum", MozMeterSubSubOptimum, IN_SUB_SUB_OPTIMUM_STATE, _),
 
-                ("-moz-user-disabled", MozUserDisabled, IN_USER_DISABLED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-
                 ("-moz-first-node", MozFirstNode, _, _),
                 ("-moz-last-node", MozLastNode, _, _),
                 ("-moz-only-whitespace", MozOnlyWhitespace, _, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 524a2372077..8b93ed744c5 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2029,7 +2029,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::Invalid |
             NonTSPseudoClass::MozUIValid |
             NonTSPseudoClass::MozBroken |
-            NonTSPseudoClass::MozUserDisabled |
             NonTSPseudoClass::MozSuppressed |
             NonTSPseudoClass::MozLoading |
             NonTSPseudoClass::MozHandlerBlocked |

From 83448b68890fc625be6b4d6f13370fc3bbe58169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 13 Sep 2020 11:33:13 +0000
Subject: [PATCH 049/156] style: Remove -moz-suppressed.

Per spec we shouldn't behave differently depending on how we blocked the
image/object/etc.

This may have made sense in the past when ad blockers were implemented
via nsIContentPolicy, but I think nowadays it doesn't make sense, and
showing fallback is preferred.

There's a couple extra cleanups we can do after this lands, like
removing HTMLImageElement.imageBlockingStatus and simplifying a bit that
code. But I'll do that in a separate bug.

Differential Revision: https://phabricator.services.mozilla.com/D89912
---
 components/style/element_state.rs                  | 2 --
 components/style/gecko/non_ts_pseudo_class_list.rs | 1 -
 components/style/gecko/wrapper.rs                  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index cdce4d3cc75..ebf6aa42a69 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -53,8 +53,6 @@ bitflags! {
         const IN_MOZ_UI_INVALID_STATE = 1 << 13;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-broken
         const IN_BROKEN_STATE = 1 << 14;
-        /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-suppressed
-        const IN_SUPPRESSED_STATE = 1 << 16;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-loading
         const IN_LOADING_STATE = 1 << 17;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-handler-blocked
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 030452a6c0a..77ff53ed3a3 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -58,7 +58,6 @@ macro_rules! apply_non_ts_list {
                 ("-moz-focusring", MozFocusRing, IN_FOCUSRING_STATE, _),
                 ("-moz-broken", MozBroken, IN_BROKEN_STATE, _),
                 ("-moz-loading", MozLoading, IN_LOADING_STATE, _),
-                ("-moz-suppressed", MozSuppressed, IN_SUPPRESSED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-has-dir-attr", MozHasDirAttr, IN_HAS_DIR_ATTR_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-dir-attr-ltr", MozDirAttrLTR, IN_HAS_DIR_ATTR_LTR_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-dir-attr-rtl", MozDirAttrRTL, IN_HAS_DIR_ATTR_RTL_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 8b93ed744c5..932685ea3c1 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2029,7 +2029,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::Invalid |
             NonTSPseudoClass::MozUIValid |
             NonTSPseudoClass::MozBroken |
-            NonTSPseudoClass::MozSuppressed |
             NonTSPseudoClass::MozLoading |
             NonTSPseudoClass::MozHandlerBlocked |
             NonTSPseudoClass::MozHandlerDisabled |

From f2e765296a73c28c3583c04c2695075078f914ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Sep 2020 22:33:01 +0000
Subject: [PATCH 050/156] style: Allow :is() and :where() to have better error
 recovery.

Adjust is-where-parsing.html to work with both the new and old behavior,
and add a test for the new behavior.

Depends on D90049

Differential Revision: https://phabricator.services.mozilla.com/D90050
---
 components/style/gecko/selector_parser.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index f5662d6871d..3c25a43fe2e 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -14,7 +14,7 @@ use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
 use crate::values::serialize_atom_identifier;
 use cssparser::{BasicParseError, BasicParseErrorKind, Parser};
 use cssparser::{CowRcStr, SourceLocation, ToCss, Token};
-use selectors::parser::SelectorParseErrorKind;
+use selectors::parser::{SelectorParseErrorKind, ParseErrorRecovery};
 use selectors::parser::{self as selector_parser, Selector};
 use selectors::visitor::SelectorVisitor;
 use selectors::SelectorList;
@@ -341,6 +341,15 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         true
     }
 
+    #[inline]
+    fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
+        if static_prefs::pref!("layout.css.is-and-where-better-error-recovery.enabled") {
+            ParseErrorRecovery::IgnoreInvalidSelector
+        } else {
+            ParseErrorRecovery::DiscardList
+        }
+    }
+
     #[inline]
     fn parse_part(&self) -> bool {
         true

From 1f8c9aec88a5c595a12b6dbe9878e4cc946e6732 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Tue, 15 Sep 2020 23:22:26 +0000
Subject: [PATCH 051/156] style: [css-lists-3][css-pseudo-4] Add support for
 'text-transform' on ::marker.

Differential Revision: https://phabricator.services.mozilla.com/D90329
---
 components/style/properties/data.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index e2308d93781..6f53a344602 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -773,6 +773,7 @@ class PropertyRestrictions:
         return set([
             "color",
             "text-combine-upright",
+            "text-transform",
             "unicode-bidi",
             "direction",
             "content",

From c99d6adf01d7ccaf309a921e8da7b80cb0195f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 19 Sep 2020 14:28:51 +0000
Subject: [PATCH 052/156] style: Consider display: none elements as having
 current style for animation-only traversal.

This is mostly a band-aid, though it also serves sorta as an
optimization.

The issue here is basically bug 1393323. By re-cascading, right now we
can't come up with the right before-change style if CSSOM has mutated
the rules. We really need a better way to come up with the before-change
style, as the animation-only traversal is not really sustainable (nor
fast, for that matter...).

But this avoids crashing and prevents the regression easily, so let's do
that for now.

Differential Revision: https://phabricator.services.mozilla.com/D90700
---
 components/style/dom.rs | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/components/style/dom.rs b/components/style/dom.rs
index 60e1be054d6..351f54af6e3 100644
--- a/components/style/dom.rs
+++ b/components/style/dom.rs
@@ -584,14 +584,35 @@ pub trait TElement:
         traversal_flags: TraversalFlags,
     ) -> bool {
         if traversal_flags.for_animation_only() {
-            // In animation-only restyle we never touch snapshots and don't
-            // care about them. But we can't assert '!self.handled_snapshot()'
+            // In animation-only restyle we never touch snapshots and don't care
+            // about them. But we can't assert '!self.handled_snapshot()'
             // here since there are some cases that a second animation-only
             // restyle which is a result of normal restyle (e.g. setting
             // animation-name in normal restyle and creating a new CSS
             // animation in a SequentialTask) is processed after the normal
             // traversal in that we had elements that handled snapshot.
-            return data.has_styles() && !data.hint.has_animation_hint_or_recascade();
+            if !data.has_styles() {
+                return false;
+            }
+
+            if !data.hint.has_animation_hint_or_recascade() {
+                return true;
+            }
+
+            // FIXME: This should ideally always return false, but it is a hack
+            // to work around our weird animation-only traversal
+            // stuff: If we're display: none and the rules we could match could
+            // change, we consider our style up-to-date. This is because
+            // re-cascading with and old style doesn't guarantee returning the
+            // correct animation style (that's bug 1393323). So if our display
+            // changed, and it changed from display: none, we would incorrectly
+            // forget about it and wouldn't be able to correctly style our
+            // descendants later.
+            if data.styles.is_display_none() && data.hint.match_self() {
+                return true;
+            }
+
+            return false;
         }
 
         if self.has_snapshot() && !self.handled_snapshot() {

From 60d89cfbc0592ee5d95f023269a04b33c7e50215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 21 Sep 2020 09:57:46 +0000
Subject: [PATCH 053/156] style: CSSOM should respect rule-level property
 restrictions.

Differential Revision: https://phabricator.services.mozilla.com/D90729
---
 .../style/properties/declaration_block.rs     |  6 +++--
 .../style/properties/properties.mako.rs       | 24 +++++++++++--------
 components/style/stylesheets/mod.rs           |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index fe52e6059c7..7bae033c9d4 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -1263,11 +1263,12 @@ pub fn parse_style_attribute(
     url_data: &UrlExtraData,
     error_reporter: Option<&dyn ParseErrorReporter>,
     quirks_mode: QuirksMode,
+    rule_type: CssRuleType,
 ) -> PropertyDeclarationBlock {
     let context = ParserContext::new(
         Origin::Author,
         url_data,
-        Some(CssRuleType::Style),
+        Some(rule_type),
         ParsingMode::DEFAULT,
         quirks_mode,
         error_reporter,
@@ -1291,11 +1292,12 @@ pub fn parse_one_declaration_into(
     error_reporter: Option<&dyn ParseErrorReporter>,
     parsing_mode: ParsingMode,
     quirks_mode: QuirksMode,
+    rule_type: CssRuleType,
 ) -> Result<(), ()> {
     let context = ParserContext::new(
         Origin::Author,
         url_data,
-        Some(CssRuleType::Style),
+        Some(rule_type),
         parsing_mode,
         quirks_mode,
         error_reporter,
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 9f204a3c36d..f98df39a629 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -542,10 +542,12 @@ impl NonCustomPropertyId {
         false
     }
 
-    fn allowed_in(self, context: &ParserContext) -> bool {
+    /// Returns whether a given rule allows a given property.
+    #[inline]
+    pub fn allowed_in_rule(self, rule_type: CssRuleType) -> bool {
         debug_assert!(
             matches!(
-                context.rule_type(),
+                rule_type,
                 CssRuleType::Keyframe | CssRuleType::Page | CssRuleType::Style
             ),
             "Declarations are only expected inside a keyframe, page, or style rule."
@@ -559,14 +561,16 @@ impl NonCustomPropertyId {
             "DISALLOWED_IN_PAGE_RULE",
             lambda p: not p.allowed_in_page_rule
         )}
-        match context.rule_type() {
-            CssRuleType::Keyframe if DISALLOWED_IN_KEYFRAME_BLOCK.contains(self) => {
-                return false;
-            }
-            CssRuleType::Page if DISALLOWED_IN_PAGE_RULE.contains(self) => {
-                return false;
-            }
-            _ => {}
+        match rule_type {
+            CssRuleType::Keyframe => !DISALLOWED_IN_KEYFRAME_BLOCK.contains(self),
+            CssRuleType::Page => !DISALLOWED_IN_PAGE_RULE.contains(self),
+            _ => true
+        }
+    }
+
+    fn allowed_in(self, context: &ParserContext) -> bool {
+        if !self.allowed_in_rule(context.rule_type()) {
+            return false;
         }
 
         self.allowed_in_ignoring_rule_type(context)
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index f83595dacef..a5e71140742 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -299,7 +299,7 @@ impl CssRule {
 }
 
 #[allow(missing_docs)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, FromPrimitive, PartialEq)]
 pub enum CssRuleType {
     // https://drafts.csswg.org/cssom/#the-cssrule-interface
     Style = 1,

From 74a46d96ebe786ceaab0a6b2189a11e4e2632015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 21 Sep 2020 11:05:51 +0000
Subject: [PATCH 054/156] style: Don't optimize ::before/::after away if
 content/display have been specified via custom properties.

We need to treat them the same way as we treat content: inherit.

Differential Revision: https://phabricator.services.mozilla.com/D90222
---
 components/style/properties/cascade.rs        | 19 +++++++++++++++++++
 .../style/properties/computed_value_flags.rs  |  8 ++++----
 .../style/properties/properties.mako.rs       |  4 ++--
 components/style/style_resolver.rs            |  4 ++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 11f3beb2481..e161e2690d2 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -478,6 +478,25 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 .rule_cache_conditions
                 .borrow_mut()
                 .set_uncacheable();
+
+            // NOTE(emilio): We only really need to add the `display` /
+            // `content` flag if the CSS variable has not been specified on our
+            // declarations, but we don't have that information at this point,
+            // and it doesn't seem like an important enough optimization to
+            // warrant it.
+            match declaration.id {
+                LonghandId::Display => {
+                    self.context
+                        .builder
+                        .add_flags(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE);
+                },
+                LonghandId::Content => {
+                    self.context
+                        .builder
+                        .add_flags(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE);
+                },
+                _ => {},
+            }
         }
 
         Cow::Owned(declaration.value.substitute_variables(
diff --git a/components/style/properties/computed_value_flags.rs b/components/style/properties/computed_value_flags.rs
index 221363ba4b1..dc9597e087b 100644
--- a/components/style/properties/computed_value_flags.rs
+++ b/components/style/properties/computed_value_flags.rs
@@ -42,17 +42,17 @@ bitflags! {
         /// A flag used to mark styles which are a pseudo-element or under one.
         const IS_IN_PSEUDO_ELEMENT_SUBTREE = 1 << 4;
 
-        /// Whether this style inherits the `display` property.
+        /// Whether this style's `display` property depends on our parent style.
         ///
         /// This is important because it may affect our optimizations to avoid
         /// computing the style of pseudo-elements, given whether the
         /// pseudo-element is generated depends on the `display` value.
-        const INHERITS_DISPLAY = 1 << 6;
+        const DISPLAY_DEPENDS_ON_INHERITED_STYLE = 1 << 6;
 
-        /// Whether this style inherits the `content` property.
+        /// Whether this style's `content` depends on our parent style.
         ///
         /// Important because of the same reason.
-        const INHERITS_CONTENT = 1 << 7;
+        const CONTENT_DEPENDS_ON_INHERITED_STYLE = 1 << 7;
 
         /// Whether the child explicitly inherits any reset property.
         const INHERITS_RESET_STYLE = 1 << 8;
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index f98df39a629..0198d7cdb9b 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -3646,11 +3646,11 @@ impl<'a> StyleBuilder<'a> {
         self.add_flags(ComputedValueFlags::INHERITS_RESET_STYLE);
 
         % if property.ident == "content":
-        self.add_flags(ComputedValueFlags::INHERITS_CONTENT);
+        self.add_flags(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE);
         % endif
 
         % if property.ident == "display":
-        self.add_flags(ComputedValueFlags::INHERITS_DISPLAY);
+        self.add_flags(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE);
         % endif
 
         if self.${property.style_struct.ident}.ptr_eq(inherited_struct) {
diff --git a/components/style/style_resolver.rs b/components/style/style_resolver.rs
index 8caf3cec4c3..70ac1b3b4d3 100644
--- a/components/style/style_resolver.rs
+++ b/components/style/style_resolver.rs
@@ -139,13 +139,13 @@ fn eager_pseudo_is_definitely_not_generated(
         return false;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::INHERITS_DISPLAY) &&
+    if !style.flags.intersects(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE) &&
         style.get_box().clone_display() == Display::None
     {
         return true;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::INHERITS_CONTENT) &&
+    if !style.flags.intersects(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE) &&
         style.ineffective_content_property()
     {
         return true;

From ca03f4df6d2dd64bec30393fde7b88e2efd22b29 Mon Sep 17 00:00:00 2001
From: Frederic Wang <fred.wang@free.fr>
Date: Wed, 23 Sep 2020 13:04:48 +0000
Subject: [PATCH 055/156] style: Implement the math-style property.

This patch renames the internal -moz-math-display to math-style and
exposes it under the layout.css.math-style.enabled preference. The
initial value becomes "normal" but that does not affect the default
MathML behavior since the UA style sheet sets the math-style property
explicitly on <math> tags. WPT tests are updated to use the syntax
approved by the CSSWG.

Intent to prototype: https://groups.google.com/forum/#!msg/mozilla.dev.platform/1hQQ7ISudGo/_yLEckEeBQAJ

Differential Revision: https://phabricator.services.mozilla.com/D90731
---
 components/style/properties/longhands/font.mako.rs | 12 ++++++------
 components/style/values/computed/font.rs           |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/style/properties/longhands/font.mako.rs b/components/style/properties/longhands/font.mako.rs
index 2ed226f781d..f706ddad9de 100644
--- a/components/style/properties/longhands/font.mako.rs
+++ b/components/style/properties/longhands/font.mako.rs
@@ -239,14 +239,14 @@ ${helpers.predefined_type(
 )}
 
 ${helpers.single_keyword(
-    "-moz-math-display",
-    "inline block",
+    "math-style",
+    "normal compact",
     engines="gecko",
-    gecko_constant_prefix="NS_MATHML_DISPLAYSTYLE",
-    gecko_ffi_name="mMathDisplay",
-    enabled_in="ua",
-    spec="Internal (not web-exposed)",
+    gecko_pref="layout.css.math-style.enabled",
+    spec="https://mathml-refresh.github.io/mathml-core/#the-math-style-property",
+    has_effect_on_gecko_scrollbars=False,
     animation_value_type="none",
+    enabled_in="ua",
 )}
 
 ${helpers.single_keyword(
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index af56e59abd3..de97ea03303 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -819,14 +819,14 @@ impl ToComputedValue for specified::MozScriptLevel {
     type ComputedValue = MozScriptLevel;
 
     fn to_computed_value(&self, cx: &Context) -> i8 {
-        use crate::properties::longhands::_moz_math_display::SpecifiedValue as DisplayValue;
+        use crate::properties::longhands::math_style::SpecifiedValue as MathStyleValue;
         use std::{cmp, i8};
 
         let int = match *self {
             specified::MozScriptLevel::Auto => {
                 let parent = cx.builder.get_parent_font().clone__moz_script_level() as i32;
-                let display = cx.builder.get_parent_font().clone__moz_math_display();
-                if display == DisplayValue::Inline {
+                let style = cx.builder.get_parent_font().clone_math_style();
+                if style == MathStyleValue::Compact {
                     parent + 1
                 } else {
                     parent

From dab46fc958abde0103e229a87523369306a10082 Mon Sep 17 00:00:00 2001
From: Frederic Wang <fred.wang@free.fr>
Date: Thu, 24 Sep 2020 15:34:17 +0000
Subject: [PATCH 056/156] style: Implement displaystyle attribute on all MathML
 elements.

Gecko implements the displaystyle attribute as defined by MathML 3 i.e.
only on the math, mstyle and mtable elements. This commit follows MathML
Core and instead define it as a global attribute mapped to math-style.
See https://mathml-refresh.github.io/mathml-core/#the-displaystyle-and-scriptlevel-attributes

Differential Revision: https://phabricator.services.mozilla.com/D90786
---
 components/style/properties/longhands/font.mako.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/properties/longhands/font.mako.rs b/components/style/properties/longhands/font.mako.rs
index f706ddad9de..32c034c7508 100644
--- a/components/style/properties/longhands/font.mako.rs
+++ b/components/style/properties/longhands/font.mako.rs
@@ -247,6 +247,7 @@ ${helpers.single_keyword(
     has_effect_on_gecko_scrollbars=False,
     animation_value_type="none",
     enabled_in="ua",
+    needs_conversion=True,
 )}
 
 ${helpers.single_keyword(

From 4a625be8add8f77246577e0ec0164d94f58586b6 Mon Sep 17 00:00:00 2001
From: tobar2018 <akshay1992kalbhor@gmail.com>
Date: Fri, 25 Sep 2020 10:29:08 +0000
Subject: [PATCH 057/156] style: Remove all references to the preference
 'layout.css.moz-touch-enabled.enabled'.

Differential Revision: https://phabricator.services.mozilla.com/D91401
---
 components/style/gecko/media_features.rs      | 24 +------------------
 .../media_queries/media_feature_expression.rs |  3 ---
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index c96996a18ea..4fea1030dbc 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -559,19 +559,6 @@ fn eval_system_metric(
     query_value.map_or(supports_metric, |v| v == supports_metric)
 }
 
-fn eval_moz_touch_enabled(
-    device: &Device,
-    query_value: Option<bool>,
-    _: Option<RangeOrOperator>,
-) -> bool {
-    eval_system_metric(
-        device,
-        query_value,
-        atom!("-moz-touch-enabled"),
-        /* accessible_from_content = */ true,
-    )
-}
-
 fn eval_moz_os_version(
     device: &Device,
     query_value: Option<Atom>,
@@ -613,7 +600,7 @@ macro_rules! system_metric_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -840,13 +827,4 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [
     system_metric_feature!(atom!("-moz-gtk-csd-close-button")),
     system_metric_feature!(atom!("-moz-gtk-csd-reversed-placement")),
     system_metric_feature!(atom!("-moz-system-dark-theme")),
-    // This is the only system-metric media feature that's accessible to
-    // content as of today.
-    // FIXME(emilio): Restrict (or remove?) when bug 1035774 lands.
-    feature!(
-        atom!("-moz-touch-enabled"),
-        AllowsRanges::No,
-        Evaluator::BoolInteger(eval_moz_touch_enabled),
-        ParsingRequirements::empty(),
-    ),
 ];
diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs
index f4eb40d1afa..08b13136ef9 100644
--- a/components/style/media_queries/media_feature_expression.rs
+++ b/components/style/media_queries/media_feature_expression.rs
@@ -221,9 +221,6 @@ fn consume_operation_or_colon(input: &mut Parser) -> Result<Option<Operator>, ()
 fn disabled_by_pref(feature: &Atom, context: &ParserContext) -> bool {
     #[cfg(feature = "gecko")]
     {
-        if *feature == atom!("-moz-touch-enabled") {
-            return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled");
-        }
         if *feature == atom!("forced-colors") {
             return !static_prefs::pref!("layout.css.forced-colors.enabled");
         }

From 4dfcf583cf14553cb59d0a43dd35c186d1c38028 Mon Sep 17 00:00:00 2001
From: Frederic Wang <fred.wang@free.fr>
Date: Sat, 26 Sep 2020 03:04:56 +0000
Subject: [PATCH 058/156] style: Rename -moz-math-script-level to math-depth.

This renames the internal -moz-math-script-level property in order to
prepare for full math-depth support. Currently, the property is guarded
under a disabled-by-default flag, so there should be no observable
behavior change.

Differential Revision: https://phabricator.services.mozilla.com/D91285
---
 components/style/properties/cascade.rs        |  4 ++--
 components/style/properties/data.py           |  2 +-
 .../style/properties/longhands/font.mako.rs   |  9 +++++----
 .../style/properties/properties.mako.rs       |  4 ++--
 components/style/values/computed/font.rs      | 20 +++++++++----------
 components/style/values/computed/mod.rs       |  2 +-
 components/style/values/specified/font.rs     | 10 +++++-----
 components/style/values/specified/mod.rs      |  2 +-
 8 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index e161e2690d2..0a84f7e894d 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -963,7 +963,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
     fn handle_mathml_scriptlevel_if_needed(&mut self) {
         use crate::values::generics::NonNegative;
 
-        if !self.seen.contains(LonghandId::MozScriptLevel) &&
+        if !self.seen.contains(LonghandId::MathDepth) &&
            !self.seen.contains(LonghandId::MozScriptMinSize) &&
            !self.seen.contains(LonghandId::MozScriptSizeMultiplier) {
             return;
@@ -980,7 +980,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             let parent_font = builder.get_parent_font().gecko();
 
             let delta =
-                font.mScriptLevel.saturating_sub(parent_font.mScriptLevel);
+                font.mMathDepth.saturating_sub(parent_font.mMathDepth);
 
             if delta == 0 {
                 return;
diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 6f53a344602..6589627027b 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -360,7 +360,7 @@ class Longhand(object):
                 "MasonryAutoFlow",
                 "MozForceBrokenImageIcon",
                 "MozListReversed",
-                "MozScriptLevel",
+                "MathDepth",
                 "MozScriptMinSize",
                 "MozScriptSizeMultiplier",
                 "TextDecorationSkipInk",
diff --git a/components/style/properties/longhands/font.mako.rs b/components/style/properties/longhands/font.mako.rs
index 32c034c7508..1fb52a01c77 100644
--- a/components/style/properties/longhands/font.mako.rs
+++ b/components/style/properties/longhands/font.mako.rs
@@ -228,14 +228,15 @@ ${helpers.predefined_type(
 )}
 
 ${helpers.predefined_type(
-    "-moz-script-level",
-    "MozScriptLevel",
+    "math-depth",
+    "MathDepth",
     "0",
     engines="gecko",
+    gecko_pref="layout.css.math-depth.enabled",
+    has_effect_on_gecko_scrollbars=False,
     animation_value_type="none",
     enabled_in="ua",
-    gecko_ffi_name="mScriptLevel",
-    spec="Internal (not web-exposed)",
+    spec="https://mathml-refresh.github.io/mathml-core/#the-math-script-level-property",
 )}
 
 ${helpers.single_keyword(
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 0198d7cdb9b..1278ce9c5bb 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -1342,8 +1342,8 @@ impl LonghandId {
             // preferences properly, see bug 1165538.
             LonghandId::MozMinFontSizeRatio |
 
-            // Needed to do font-size for MathML. :(
-            LonghandId::MozScriptLevel |
+            // font-size depends on math-depth's computed value.
+            LonghandId::MathDepth |
             % endif
 
             // Needed to compute the first available font, in order to
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index de97ea03303..a04a74abf4f 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -811,20 +811,20 @@ impl ToComputedValue for specified::MozScriptMinSize {
     }
 }
 
-/// The computed value of the -moz-script-level property.
-pub type MozScriptLevel = i8;
+/// The computed value of the math-depth property.
+pub type MathDepth = i8;
 
 #[cfg(feature = "gecko")]
-impl ToComputedValue for specified::MozScriptLevel {
-    type ComputedValue = MozScriptLevel;
+impl ToComputedValue for specified::MathDepth {
+    type ComputedValue = MathDepth;
 
     fn to_computed_value(&self, cx: &Context) -> i8 {
         use crate::properties::longhands::math_style::SpecifiedValue as MathStyleValue;
         use std::{cmp, i8};
 
         let int = match *self {
-            specified::MozScriptLevel::Auto => {
-                let parent = cx.builder.get_parent_font().clone__moz_script_level() as i32;
+            specified::MathDepth::Auto => {
+                let parent = cx.builder.get_parent_font().clone_math_depth() as i32;
                 let style = cx.builder.get_parent_font().clone_math_style();
                 if style == MathStyleValue::Compact {
                     parent + 1
@@ -832,17 +832,17 @@ impl ToComputedValue for specified::MozScriptLevel {
                     parent
                 }
             },
-            specified::MozScriptLevel::Relative(rel) => {
-                let parent = cx.builder.get_parent_font().clone__moz_script_level();
+            specified::MathDepth::Relative(rel) => {
+                let parent = cx.builder.get_parent_font().clone_math_depth();
                 parent as i32 + rel
             },
-            specified::MozScriptLevel::MozAbsolute(abs) => abs,
+            specified::MathDepth::MozAbsolute(abs) => abs,
         };
         cmp::min(int, i8::MAX as i32) as i8
     }
 
     fn from_computed_value(other: &i8) -> Self {
-        specified::MozScriptLevel::MozAbsolute(*other as i32)
+        specified::MathDepth::MozAbsolute(*other as i32)
     }
 }
 
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index aa13ff89d7c..4d9d553bdb9 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -59,7 +59,7 @@ pub use self::font::{FontFeatureSettings, FontVariantLigatures, FontVariantNumer
 pub use self::font::{FontSize, FontSizeAdjust, FontStretch, FontSynthesis};
 pub use self::font::{FontVariantAlternates, FontWeight};
 pub use self::font::{FontVariantEastAsian, FontVariationSettings};
-pub use self::font::{MozScriptLevel, MozScriptMinSize, MozScriptSizeMultiplier, XLang, XTextZoom};
+pub use self::font::{MathDepth, MozScriptMinSize, MozScriptSizeMultiplier, XLang, XTextZoom};
 pub use self::image::{Gradient, Image, LineDirection, MozImageRect};
 pub use self::length::{CSSPixelLength, ExtremumLength, NonNegativeLength};
 pub use self::length::{Length, LengthOrNumber, LengthPercentage, NonNegativeLengthOrNumber};
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 05862f6aba7..825c05da0ce 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -2311,7 +2311,7 @@ impl Parse for MozScriptMinSize {
 ///
 /// The main effect of scriptlevel is to control the font size.
 /// https://www.w3.org/TR/MathML3/chapter3.html#presm.scriptlevel
-pub enum MozScriptLevel {
+pub enum MathDepth {
     /// Change `font-size` relatively.
     Relative(i32),
     /// Change `font-size` absolutely.
@@ -2325,17 +2325,17 @@ pub enum MozScriptLevel {
     Auto,
 }
 
-impl Parse for MozScriptLevel {
+impl Parse for MathDepth {
     fn parse<'i, 't>(
         _: &ParserContext,
         input: &mut Parser<'i, 't>,
-    ) -> Result<MozScriptLevel, ParseError<'i>> {
+    ) -> Result<MathDepth, ParseError<'i>> {
         // We don't bother to handle calc here.
         if let Ok(i) = input.try_parse(|i| i.expect_integer()) {
-            return Ok(MozScriptLevel::Relative(i));
+            return Ok(MathDepth::Relative(i));
         }
         input.expect_ident_matching("auto")?;
-        Ok(MozScriptLevel::Auto)
+        Ok(MathDepth::Auto)
     }
 }
 
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 8ddca48d599..d6d763686e7 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -53,7 +53,7 @@ pub use self::font::{FontFeatureSettings, FontVariantLigatures, FontVariantNumer
 pub use self::font::{FontSize, FontSizeAdjust, FontSizeKeyword, FontStretch, FontSynthesis};
 pub use self::font::{FontVariantAlternates, FontWeight};
 pub use self::font::{FontVariantEastAsian, FontVariationSettings};
-pub use self::font::{MozScriptLevel, MozScriptMinSize, MozScriptSizeMultiplier, XLang, XTextZoom};
+pub use self::font::{MathDepth, MozScriptMinSize, MozScriptSizeMultiplier, XLang, XTextZoom};
 pub use self::image::{EndingShape as GradientEndingShape, Gradient};
 pub use self::image::{Image, MozImageRect};
 pub use self::length::{AbsoluteLength, CalcLengthPercentage, CharacterWidth};

From 1a5f48ba433655fe06077cd69df2746a5ef9d88d Mon Sep 17 00:00:00 2001
From: Frederic Wang <fred.wang@free.fr>
Date: Mon, 28 Sep 2020 10:42:49 +0000
Subject: [PATCH 059/156] style: Implement CSS parsing for the math-depth
 property.

Differential Revision: https://phabricator.services.mozilla.com/D91500
---
 components/style/values/computed/font.rs  | 12 ++++---
 components/style/values/specified/font.rs | 40 +++++++++++------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index a04a74abf4f..e0d6f689c31 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -35,6 +35,7 @@ use style_traits::{CssWriter, ParseError, ToCss};
 use to_shmem::{self, SharedMemoryBuilder, ToShmem};
 
 pub use crate::values::computed::Length as MozScriptMinSize;
+pub use crate::values::specified::Integer as SpecifiedInteger;
 pub use crate::values::specified::font::{FontSynthesis, MozScriptSizeMultiplier};
 pub use crate::values::specified::font::{XLang, XTextZoom};
 
@@ -823,7 +824,7 @@ impl ToComputedValue for specified::MathDepth {
         use std::{cmp, i8};
 
         let int = match *self {
-            specified::MathDepth::Auto => {
+            specified::MathDepth::AutoAdd => {
                 let parent = cx.builder.get_parent_font().clone_math_depth() as i32;
                 let style = cx.builder.get_parent_font().clone_math_style();
                 if style == MathStyleValue::Compact {
@@ -832,17 +833,18 @@ impl ToComputedValue for specified::MathDepth {
                     parent
                 }
             },
-            specified::MathDepth::Relative(rel) => {
+            specified::MathDepth::Add(rel) => {
                 let parent = cx.builder.get_parent_font().clone_math_depth();
-                parent as i32 + rel
+                parent as i32 + rel.to_computed_value(cx)
             },
-            specified::MathDepth::MozAbsolute(abs) => abs,
+            specified::MathDepth::Absolute(abs) => abs.to_computed_value(cx),
         };
         cmp::min(int, i8::MAX as i32) as i8
     }
 
     fn from_computed_value(other: &i8) -> Self {
-        specified::MathDepth::MozAbsolute(*other as i32)
+        let computed_value = *other as i32;
+        specified::MathDepth::Absolute(SpecifiedInteger::from_computed_value(&computed_value))
     }
 }
 
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 825c05da0ce..175b0681750 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -2304,38 +2304,36 @@ impl Parse for MozScriptMinSize {
     }
 }
 
+/// A value for the `math-depth` property.
+/// https://mathml-refresh.github.io/mathml-core/#the-math-script-level-property
 #[cfg_attr(feature = "gecko", derive(MallocSizeOf))]
 #[derive(Clone, Copy, Debug, PartialEq, SpecifiedValueInfo, ToCss, ToShmem)]
-/// Changes the scriptlevel in effect for the children.
-/// Ref: https://wiki.mozilla.org/MathML:mstyle
-///
-/// The main effect of scriptlevel is to control the font size.
-/// https://www.w3.org/TR/MathML3/chapter3.html#presm.scriptlevel
 pub enum MathDepth {
-    /// Change `font-size` relatively.
-    Relative(i32),
-    /// Change `font-size` absolutely.
-    ///
-    /// Should only be serialized by presentation attributes, so even though
-    /// serialization for this would look the same as for the `Relative`
-    /// variant, it is unexposed, so no big deal.
+    /// Increment math-depth if math-style is compact.
+    AutoAdd,
+
+    /// Add the function's argument to math-depth.
     #[css(function)]
-    MozAbsolute(i32),
-    /// Change `font-size` automatically.
-    Auto,
+    Add(Integer),
+
+    /// Set math-depth to the specified value.
+    Absolute(Integer),
 }
 
 impl Parse for MathDepth {
     fn parse<'i, 't>(
-        _: &ParserContext,
+        context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<MathDepth, ParseError<'i>> {
-        // We don't bother to handle calc here.
-        if let Ok(i) = input.try_parse(|i| i.expect_integer()) {
-            return Ok(MathDepth::Relative(i));
+        if input.try_parse(|i| i.expect_ident_matching("auto-add")).is_ok() {
+            return Ok(MathDepth::AutoAdd);
         }
-        input.expect_ident_matching("auto")?;
-        Ok(MathDepth::Auto)
+        if let Ok(math_depth_value) = input.try_parse(|input| Integer::parse(context, input)) {
+            return Ok(MathDepth::Absolute(math_depth_value));
+        }
+        input.expect_function_matching("add")?;
+        let math_depth_delta_value = input.parse_nested_block(|input| Integer::parse(context, input))?;
+        Ok(MathDepth::Add(math_depth_delta_value))
     }
 }
 

From 379fb984f13500ed0e60b3ab75c00de92e8c5224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 29 Sep 2020 22:04:56 +0000
Subject: [PATCH 060/156] style: When resetting background color for high
 contrast, preserve alpha channel appropriately.

But discard it when backplating behind text, so that text is readable.

This should be uncontroversial... Dealing with widgets is a bit harder
so TBD.

Differential Revision: https://phabricator.services.mozilla.com/D91779
---
 components/style/properties/cascade.rs     | 46 +++++++++++++++++++---
 components/style/values/specified/color.rs |  9 -----
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 0a84f7e894d..8fbccd1d97f 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -385,6 +385,8 @@ fn tweak_when_ignoring_colors(
     declaration: &mut Cow<PropertyDeclaration>,
     declarations_to_apply_unless_overriden: &mut DeclarationsToApplyUnlessOverriden,
 ) {
+    use crate::values::specified::Color;
+
     if !longhand_id.ignored_when_document_colors_disabled() {
         return;
     }
@@ -401,21 +403,53 @@ fn tweak_when_ignoring_colors(
         return;
     }
 
+    fn alpha_channel(color: &Color) -> u8 {
+        match *color {
+            // Seems safe enough to assume that the default color and system
+            // colors are opaque in HCM, though maybe we shouldn't asume the
+            // later?
+            #[cfg(feature = "gecko")]
+            Color::InheritFromBodyQuirk | Color::System(..) => 255,
+            // We don't have the actual color here, but since except for color:
+            // transparent we force opaque text colors, it seems sane to do
+            // this. You can technically fool this bit of code with:
+            //
+            //   color: transparent; background-color: currentcolor;
+            //
+            // but this is best-effort, and that seems unlikely to happen in
+            // practice.
+            Color::CurrentColor => 255,
+            // Complex colors are results of interpolation only and probably
+            // shouldn't show up around here in HCM, but we've always treated
+            // them as opaque effectively so keep doing it.
+            Color::Complex { .. } => 255,
+            Color::Numeric { ref parsed, .. } => parsed.alpha,
+        }
+    }
+
     // A few special-cases ahead.
     match **declaration {
-        // We honor color and background-color: transparent, and
-        // "revert-or-initial" otherwise.
         PropertyDeclaration::BackgroundColor(ref color) => {
-            if !color.is_transparent() {
-                let color = builder.device.default_background_color();
+            // For background-color, we revert or initial-with-preserved-alpha
+            // otherwise, this is needed to preserve semi-transparent
+            // backgrounds.
+            //
+            // FIXME(emilio, bug 1666059): We revert for alpha == 0, but maybe
+            // should consider not doing that even if it causes some issues like
+            // bug 1625036, or finding a performant way to preserve the original
+            // widget background color's rgb channels but not alpha...
+            let alpha = alpha_channel(color);
+            if alpha != 0 {
+                let mut color = builder.device.default_background_color();
+                color.alpha = alpha;
                 declarations_to_apply_unless_overriden.push(
                     PropertyDeclaration::BackgroundColor(color.into())
                 )
             }
         }
         PropertyDeclaration::Color(ref color) => {
-            // otherwise.
-            if color.0.is_transparent() {
+            // We honor color: transparent, and "revert-or-initial" otherwise.
+            if alpha_channel(&color.0) == 0 {
                 return;
             }
             // If the inherited color would be transparent, but we would
diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs
index 59184775c84..675e1b9a131 100644
--- a/components/style/values/specified/color.rs
+++ b/components/style/values/specified/color.rs
@@ -529,15 +529,6 @@ impl Color {
         parse_hash_color(&serialization)
             .map_err(|()| location.new_custom_error(StyleParseErrorKind::UnspecifiedError))
     }
-
-    /// Returns true if the color is completely transparent, and false
-    /// otherwise.
-    pub fn is_transparent(&self) -> bool {
-        match *self {
-            Color::Numeric { ref parsed, .. } => parsed.alpha == 0,
-            _ => false,
-        }
-    }
 }
 
 #[cfg(feature = "gecko")]

From 384fd59ad0047fc0130478585f2c22bf274ac5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Oct 2020 09:42:49 +0000
Subject: [PATCH 061/156] style: Use Option::as_deref() in style code.

And drive-by simplify another function that was only doing
Option::clone().

Differential Revision: https://phabricator.services.mozilla.com/D92839
---
 components/style/gecko/selector_parser.rs      |  2 +-
 components/style/matching.rs                   | 12 ++++++------
 components/style/properties/properties.mako.rs |  2 +-
 components/style/traversal.rs                  | 10 ++--------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 3c25a43fe2e..6f8ac010e11 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -472,7 +472,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
     }
 
     fn default_namespace(&self) -> Option<Namespace> {
-        self.namespaces.default.as_ref().map(|ns| ns.clone())
+        self.namespaces.default.clone()
     }
 
     fn namespace_for_prefix(&self, prefix: &Atom) -> Option<Namespace> {
diff --git a/components/style/matching.rs b/components/style/matching.rs
index c74d4feda3c..f81f9c3a233 100644
--- a/components/style/matching.rs
+++ b/components/style/matching.rs
@@ -395,7 +395,7 @@ trait PrivateMatchMethods: TElement {
         if context.shared.traversal_flags.for_animation_only() {
             self.handle_display_change_for_smil_if_needed(
                 context,
-                old_values.as_ref().map(|v| &**v),
+                old_values.as_deref(),
                 new_values,
                 restyle_hint,
             );
@@ -408,7 +408,7 @@ trait PrivateMatchMethods: TElement {
         let mut tasks = UpdateAnimationsTasks::empty();
         if self.needs_animations_update(
             context,
-            old_values.as_ref().map(|s| &**s),
+            old_values.as_deref(),
             new_values,
             /* pseudo_element = */ None,
         ) {
@@ -417,7 +417,7 @@ trait PrivateMatchMethods: TElement {
 
         let before_change_style = if self.might_need_transitions_update(
             context,
-            old_values.as_ref().map(|s| &**s),
+            old_values.as_deref(),
             new_values,
             /* pseudo_element = */ None,
         ) {
@@ -460,7 +460,7 @@ trait PrivateMatchMethods: TElement {
             if important_rules_changed {
                 tasks.insert(UpdateAnimationsTasks::CASCADE_RESULTS);
             }
-            if new_values.is_display_property_changed_from_none(old_values.as_ref().map(|s| &**s)) {
+            if new_values.is_display_property_changed_from_none(old_values.as_deref()) {
                 tasks.insert(UpdateAnimationsTasks::DISPLAY_CHANGED_FROM_NONE);
             }
         }
@@ -638,14 +638,14 @@ trait PrivateMatchMethods: TElement {
         // map because this call will do a RwLock::read().
         let needs_animations_update = self.needs_animations_update(
             context,
-            old_values.as_ref().map(|s| &**s),
+            old_values.as_deref(),
             new_values,
             pseudo_element,
         );
 
         let might_need_transitions_update = self.might_need_transitions_update(
             context,
-            old_values.as_ref().map(|s| &**s),
+            old_values.as_deref(),
             new_values,
             pseudo_element,
         );
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 1278ce9c5bb..24d396cdf0f 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -2966,7 +2966,7 @@ impl ComputedValues {
 
     /// Returns the visited style, if any.
     pub fn visited_style(&self) -> Option<<&ComputedValues> {
-        self.visited_style.as_ref().map(|s| &**s)
+        self.visited_style.as_deref()
     }
 
     /// Returns the visited rules, if applicable.
diff --git a/components/style/traversal.rs b/components/style/traversal.rs
index a60faaa446e..30d8ae29038 100644
--- a/components/style/traversal.rs
+++ b/components/style/traversal.rs
@@ -351,10 +351,7 @@ where
             rule_inclusion,
             PseudoElementResolution::IfApplicable,
         )
-        .resolve_primary_style(
-            style.as_ref().map(|s| &**s),
-            layout_parent_style.as_ref().map(|s| &**s),
-        );
+        .resolve_primary_style(style.as_deref(), layout_parent_style.as_deref());
 
         let is_display_contents = primary_style.style().is_display_contents();
 
@@ -373,10 +370,7 @@ where
         rule_inclusion,
         PseudoElementResolution::Force,
     )
-    .resolve_style(
-        style.as_ref().map(|s| &**s),
-        layout_parent_style.as_ref().map(|s| &**s),
-    )
+    .resolve_style(style.as_deref(), layout_parent_style.as_deref())
     .into()
 }
 

From 2b55918be6907f5535398321e6eff18f4d0cbb1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Oct 2020 05:39:33 +0000
Subject: [PATCH 062/156] style: Properly distinguish between empty children
 and no children in rule iterator.

So that skip_children(), which just pops the stack and is used by the
dynamic media query evaluation code, works as it should.

Differential Revision: https://phabricator.services.mozilla.com/D92717
---
 .../style/stylesheets/rules_iterator.rs       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/style/stylesheets/rules_iterator.rs b/components/style/stylesheets/rules_iterator.rs
index 1fa25837a8c..ad3aa97590d 100644
--- a/components/style/stylesheets/rules_iterator.rs
+++ b/components/style/stylesheets/rules_iterator.rs
@@ -60,7 +60,7 @@ fn children_of_rule<'a, C>(
     quirks_mode: QuirksMode,
     guard: &'a SharedRwLockReadGuard<'_>,
     effective: &mut bool,
-) -> slice::Iter<'a, CssRule>
+) -> Option<slice::Iter<'a, CssRule>>
 where
     C: NestedRuleIterationCondition + 'static,
 {
@@ -73,38 +73,38 @@ where
         CssRule::Viewport(_) |
         CssRule::Keyframes(_) |
         CssRule::Page(_) |
-        CssRule::FontFeatureValues(_) => [].iter(),
+        CssRule::FontFeatureValues(_) => None,
         CssRule::Import(ref import_rule) => {
             let import_rule = import_rule.read_with(guard);
             if !C::process_import(guard, device, quirks_mode, import_rule) {
                 *effective = false;
-                return [].iter();
+                return None;
             }
-            import_rule.stylesheet.rules(guard).iter()
+            Some(import_rule.stylesheet.rules(guard).iter())
         },
         CssRule::Document(ref doc_rule) => {
             let doc_rule = doc_rule.read_with(guard);
             if !C::process_document(guard, device, quirks_mode, doc_rule) {
                 *effective = false;
-                return [].iter();
+                return None;
             }
-            doc_rule.rules.read_with(guard).0.iter()
+            Some(doc_rule.rules.read_with(guard).0.iter())
         },
         CssRule::Media(ref lock) => {
             let media_rule = lock.read_with(guard);
             if !C::process_media(guard, device, quirks_mode, media_rule) {
                 *effective = false;
-                return [].iter();
+                return None;
             }
-            media_rule.rules.read_with(guard).0.iter()
+            Some(media_rule.rules.read_with(guard).0.iter())
         },
         CssRule::Supports(ref lock) => {
             let supports_rule = lock.read_with(guard);
             if !C::process_supports(guard, device, quirks_mode, supports_rule) {
                 *effective = false;
-                return [].iter();
+                return None;
             }
-            supports_rule.rules.read_with(guard).0.iter()
+            Some(supports_rule.rules.read_with(guard).0.iter())
         },
     }
 }
@@ -135,7 +135,9 @@ where
                 continue;
             }
 
-            if !children.as_slice().is_empty() {
+            if let Some(children) = children {
+                // NOTE: It's important that `children` gets pushed even if
+                // empty, so that `skip_children()` works as expected.
                 self.stack.push(children);
             }
 
@@ -306,6 +308,6 @@ impl<'a, 'b> EffectiveRulesIterator<'a, 'b> {
         rule: &'a CssRule,
     ) -> Self {
         let children = children_of_rule::<AllRules>(rule, device, quirks_mode, guard, &mut false);
-        EffectiveRulesIterator::new(device, quirks_mode, guard, children)
+        EffectiveRulesIterator::new(device, quirks_mode, guard, children.unwrap_or([].iter()))
     }
 }

From 436632f378a6752cc9dec93ca5b09af54dcc9b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 9 Oct 2020 03:20:34 +0000
Subject: [PATCH 063/156] style: Introduce InspectorUtils.supports().

Which allows to run CSS.supports in chrome/user-agent context. We should
probably add a couple more tweaks for stuff like quirks or what not (the
`ParsingMode` enum), but that seem lower priority.

I only added the one-value version of CSS.supports because it should be enough
and supporting the two value version required a bit of awkward code due to when
we parse the CSS property name right now.

Differential Revision: https://phabricator.services.mozilla.com/D92585
---
 components/style/parser.rs                    | 21 -------------------
 .../style/properties/declaration_block.rs     |  3 ++-
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/components/style/parser.rs b/components/style/parser.rs
index 81effece0a6..e38602144ef 100644
--- a/components/style/parser.rs
+++ b/components/style/parser.rs
@@ -82,27 +82,6 @@ impl<'a> ParserContext<'a> {
         }
     }
 
-    /// Create a parser context for on-the-fly parsing in CSSOM
-    #[inline]
-    pub fn new_for_cssom(
-        url_data: &'a UrlExtraData,
-        rule_type: Option<CssRuleType>,
-        parsing_mode: ParsingMode,
-        quirks_mode: QuirksMode,
-        error_reporter: Option<&'a dyn ParseErrorReporter>,
-        use_counters: Option<&'a UseCounters>,
-    ) -> Self {
-        Self::new(
-            Origin::Author,
-            url_data,
-            rule_type,
-            parsing_mode,
-            quirks_mode,
-            error_reporter,
-            use_counters,
-        )
-    }
-
     /// Create a parser context based on a previous context, but with a modified
     /// rule type.
     #[inline]
diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index 7bae033c9d4..eef63d2d29e 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -1288,6 +1288,7 @@ pub fn parse_one_declaration_into(
     declarations: &mut SourcePropertyDeclaration,
     id: PropertyId,
     input: &str,
+    origin: Origin,
     url_data: &UrlExtraData,
     error_reporter: Option<&dyn ParseErrorReporter>,
     parsing_mode: ParsingMode,
@@ -1295,7 +1296,7 @@ pub fn parse_one_declaration_into(
     rule_type: CssRuleType,
 ) -> Result<(), ()> {
     let context = ParserContext::new(
-        Origin::Author,
+        origin,
         url_data,
         Some(rule_type),
         parsing_mode,

From 61685ca9b31caa0c6b4aeee0f5f6ec96804b49f7 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Mon, 12 Oct 2020 15:05:46 +0000
Subject: [PATCH 064/156] style: Serialize a 0/0 ratio as 0/0 in all value
 stages.

Based on the update of github.com/w3c/csswg-drafts/issues/5084,
a 0/0 ratio will serialize as 0/0 in all value stages.

Differential Revision: https://phabricator.services.mozilla.com/D93182
---
 components/style/gecko/media_features.rs      |  6 +++++-
 components/style/values/computed/position.rs  | 12 +++++++++++-
 components/style/values/specified/position.rs |  9 +--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 4fea1030dbc..4fd6e622ac6 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -87,8 +87,12 @@ fn eval_aspect_ratio_for<F>(
 where
     F: FnOnce(&Device) -> Size2D<Au>,
 {
+    // A ratio of 0/0 behaves as the ratio 1/0, so we need to call used_value()
+    // to convert it if necessary.
+    // FIXME: we may need to update here once
+    // https://github.com/w3c/csswg-drafts/issues/4954 got resolved.
     let query_value = match query_value {
-        Some(v) => v,
+        Some(v) => v.used_value(),
         None => return true,
     };
 
diff --git a/components/style/values/computed/position.rs b/components/style/values/computed/position.rs
index 9e5fe3be1d2..f5e586fdfa4 100644
--- a/components/style/values/computed/position.rs
+++ b/components/style/values/computed/position.rs
@@ -15,7 +15,7 @@ use crate::values::generics::position::PositionOrAuto as GenericPositionOrAuto;
 use crate::values::generics::position::Ratio as GenericRatio;
 use crate::values::generics::position::ZIndex as GenericZIndex;
 pub use crate::values::specified::position::{GridAutoFlow, GridTemplateAreas, MasonryAutoFlow};
-use crate::Zero;
+use crate::{One, Zero};
 use std::cmp::{Ordering, PartialOrd};
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
@@ -89,6 +89,16 @@ impl Ratio {
     pub fn new(a: f32, b: f32) -> Self {
         GenericRatio(a.into(), b.into())
     }
+
+    /// Returns the used value. A ratio of 0/0 behaves as the ratio 1/0.
+    /// https://drafts.csswg.org/css-values-4/#ratios
+    pub fn used_value(self) -> Self {
+        if self.0.is_zero() && self.1.is_zero() {
+            Ratio::new(One::one(), Zero::zero())
+        } else {
+            self
+        }
+    }
 }
 
 /// A computed value for the `aspect-ratio` property.
diff --git a/components/style/values/specified/position.rs b/components/style/values/specified/position.rs
index 1b55e010878..9810959f3a6 100644
--- a/components/style/values/specified/position.rs
+++ b/components/style/values/specified/position.rs
@@ -951,13 +951,6 @@ impl Parse for Ratio {
             _ => One::one(),
         };
 
-        // The computed value of a <ratio> is the pair of numbers provided, unless
-        // both numbers are zero, in which case the computed value is the pair (1, 0)
-        // (same as 1 / 0).
-        // https://drafts.csswg.org/css-values-4/#ratios
-        if a.is_zero() && b.is_zero() {
-            return Ok(GenericRatio(One::one(), Zero::zero()));
-        }
-        return Ok(GenericRatio(a, b));
+        Ok(GenericRatio(a, b))
     }
 }

From a1fa0c610f29a24e38e13af13b4381dfcfb0d21a Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Thu, 15 Oct 2020 04:54:41 +0000
Subject: [PATCH 065/156] style: Use LookAndFeelCache to pass Gtk theme-derived
 scrollbar colors to content processes.

Differential Revision: https://phabricator.services.mozilla.com/D93467
---
 components/style/values/specified/color.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs
index 675e1b9a131..d1f27eeb503 100644
--- a/components/style/values/specified/color.rs
+++ b/components/style/values/specified/color.rs
@@ -107,6 +107,16 @@ pub enum SystemColor {
     IMESelectedConvertedTextUnderline,
     #[css(skip)]
     SpellCheckerUnderline,
+    #[css(skip)]
+    ScrollbarInactive,
+    #[css(skip)]
+    ScrollbarThumb,
+    #[css(skip)]
+    ScrollbarThumbHover,
+    #[css(skip)]
+    ScrollbarThumbActive,
+    #[css(skip)]
+    ScrollbarThumbInactive,
     Activeborder,
     Activecaption,
     Appworkspace,

From a4f82712ae886ffb075737d182c483c8e812c96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 15 Oct 2020 16:12:16 +0000
Subject: [PATCH 066/156] style: Always serialize ratio with both components.

Differential Revision: https://phabricator.services.mozilla.com/D93639
---
 components/style/values/generics/position.rs | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/style/values/generics/position.rs b/components/style/values/generics/position.rs
index 2b4448f0335..76e5c94e056 100644
--- a/components/style/values/generics/position.rs
+++ b/components/style/values/generics/position.rs
@@ -5,7 +5,6 @@
 //! Generic types for CSS handling of specified and computed values of
 //! [`position`](https://drafts.csswg.org/css-backgrounds-3/#position)
 
-use crate::One;
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
 
@@ -175,18 +174,26 @@ pub struct Ratio<N>(pub N, pub N);
 
 impl<N> ToCss for Ratio<N>
 where
-    N: ToCss + One + std::cmp::PartialEq,
+    N: ToCss
 {
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
     where
         W: Write,
     {
         self.0.to_css(dest)?;
-        // The second defaults to 1. So if it is one, we omit it in serialization.
-        if !self.1.is_one() {
-            dest.write_str(" / ")?;
-            self.1.to_css(dest)?;
-        }
+        // Even though 1 could be omitted, we don't per
+        // https://drafts.csswg.org/css-values-4/#ratio-value:
+        //
+        //     The second <number> is optional, defaulting to 1. However,
+        //     <ratio> is always serialized with both components.
+        //
+        // And for compat reasons, see bug 1669742.
+        //
+        // We serialize with spaces for consistency with all other
+        // slash-delimited things, see
+        // https://github.com/w3c/csswg-drafts/issues/4282
+        dest.write_str(" / ")?;
+        self.1.to_css(dest)?;
         Ok(())
     }
 }

From a497b033dcfe5210e36aa360a60834ad6af8e434 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 16 Oct 2020 12:49:47 +0000
Subject: [PATCH 067/156] style: Use separate Scrollbar and ThemedScrollbar
 ColorIDs.

Otherwise on Windows, we have a ColorID::Scrollbar but not any of the other scrollbar part
colors, and the Windows-provided value for Scrollbar doesn't work well
with the default values for the other scrollbar parts that come from the
non-native theme.

Differential Revision: https://phabricator.services.mozilla.com/D93728
---
 components/style/values/specified/color.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs
index d1f27eeb503..e44568fb5bf 100644
--- a/components/style/values/specified/color.rs
+++ b/components/style/values/specified/color.rs
@@ -108,15 +108,17 @@ pub enum SystemColor {
     #[css(skip)]
     SpellCheckerUnderline,
     #[css(skip)]
-    ScrollbarInactive,
+    ThemedScrollbar,
     #[css(skip)]
-    ScrollbarThumb,
+    ThemedScrollbarInactive,
     #[css(skip)]
-    ScrollbarThumbHover,
+    ThemedScrollbarThumb,
     #[css(skip)]
-    ScrollbarThumbActive,
+    ThemedScrollbarThumbHover,
     #[css(skip)]
-    ScrollbarThumbInactive,
+    ThemedScrollbarThumbActive,
+    #[css(skip)]
+    ThemedScrollbarThumbInactive,
     Activeborder,
     Activecaption,
     Appworkspace,

From 8a723d48d50728ee1116305982f084de72889733 Mon Sep 17 00:00:00 2001
From: Ricky Stewart <rstewart@mozilla.com>
Date: Wed, 21 Oct 2020 21:27:27 +0000
Subject: [PATCH 068/156] Standardize on Black for Python code in
 `mozilla-central`.

Allow-list all Python code in tree for use with the black linter, and re-format all code in-tree accordingly.

To produce this patch I did all of the following:

1. Make changes to tools/lint/black.yml to remove include: stanza and update list of source extensions.

2. Run ./mach lint --linter black --fix

3. Make some ad-hoc manual updates to python/mozbuild/mozbuild/test/configure/test_configure.py -- it has some hard-coded line numbers that the reformat breaks.

4. Add a set of exclusions to black.yml. These will be deleted in a follow-up bug (1672023).


Differential Revision: https://phabricator.services.mozilla.com/D94045
---
 .../style/counter_style/update_predefined.py  |   8 +-
 components/style/gecko/regen_atoms.py         |  80 ++--
 components/style/properties/build.py          |  47 ++-
 components/style/properties/data.py           | 374 +++++++++++-------
 4 files changed, 318 insertions(+), 191 deletions(-)

diff --git a/components/style/counter_style/update_predefined.py b/components/style/counter_style/update_predefined.py
index 2820ccaea68..1523958ff3e 100755
--- a/components/style/counter_style/update_predefined.py
+++ b/components/style/counter_style/update_predefined.py
@@ -17,16 +17,18 @@ def main(filename):
         or 'data-dfn-for="<counter-style>"' in line
     ]
     with open(filename, "wb") as f:
-        f.write("""\
+        f.write(
+            """\
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 predefined! {
-""")
+"""
+        )
         for name in names:
             f.write('    "%s",\n' % name)
-        f.write('}\n')
+        f.write("}\n")
 
 
 if __name__ == "__main__":
diff --git a/components/style/gecko/regen_atoms.py b/components/style/gecko/regen_atoms.py
index 5c59a5c566c..f05ddb8d644 100755
--- a/components/style/gecko/regen_atoms.py
+++ b/components/style/gecko/regen_atoms.py
@@ -10,21 +10,33 @@ import sys
 
 from io import BytesIO
 
-GECKO_DIR = os.path.dirname(__file__.replace('\\', '/'))
+GECKO_DIR = os.path.dirname(__file__.replace("\\", "/"))
 sys.path.insert(0, os.path.join(os.path.dirname(GECKO_DIR), "properties"))
 
 import build
 
 
 # Matches lines like `GK_ATOM(foo, "foo", 0x12345678, true, nsStaticAtom, PseudoElementAtom)`.
-PATTERN = re.compile('^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*[^,]*,\s*([^,]*),\s*([^)]*)\)',
-                     re.MULTILINE)
+PATTERN = re.compile(
+    '^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*[^,]*,\s*([^,]*),\s*([^)]*)\)',
+    re.MULTILINE,
+)
 FILE = "include/nsGkAtomList.h"
 
 
 def map_atom(ident):
-    if ident in {"box", "loop", "match", "mod", "ref",
-                 "self", "type", "use", "where", "in"}:
+    if ident in {
+        "box",
+        "loop",
+        "match",
+        "mod",
+        "ref",
+        "self",
+        "type",
+        "use",
+        "where",
+        "in",
+    }:
         return ident + "_"
     return ident
 
@@ -42,7 +54,11 @@ class Atom:
         # or "InheritingAnonBox".
         self.atom_type = atom_type
 
-        if self.is_pseudo_element() or self.is_anon_box() or self.is_tree_pseudo_element():
+        if (
+            self.is_pseudo_element()
+            or self.is_anon_box()
+            or self.is_tree_pseudo_element()
+        ):
             self.pseudo_ident = (ident.split("_", 1))[1]
 
         if self.is_anon_box():
@@ -82,34 +98,42 @@ def collect_atoms(objdir):
     with open(path) as f:
         content = f.read()
         for result in PATTERN.finditer(content):
-            atoms.append(Atom(result.group(1), result.group(2), result.group(3),
-                              result.group(4), result.group(5)))
+            atoms.append(
+                Atom(
+                    result.group(1),
+                    result.group(2),
+                    result.group(3),
+                    result.group(4),
+                    result.group(5),
+                )
+            )
     return atoms
 
 
 class FileAvoidWrite(BytesIO):
     """File-like object that buffers output and only writes if content changed."""
+
     def __init__(self, filename):
         BytesIO.__init__(self)
         self.name = filename
 
     def write(self, buf):
         if isinstance(buf, str):
-            buf = buf.encode('utf-8')
+            buf = buf.encode("utf-8")
         BytesIO.write(self, buf)
 
     def close(self):
         buf = self.getvalue()
         BytesIO.close(self)
         try:
-            with open(self.name, 'rb') as f:
+            with open(self.name, "rb") as f:
                 old_content = f.read()
                 if old_content == buf:
                     print("{} is not changed, skip".format(self.name))
                     return
         except IOError:
             pass
-        with open(self.name, 'wb') as f:
+        with open(self.name, "wb") as f:
             f.write(buf)
 
     def __enter__(self):
@@ -120,45 +144,57 @@ class FileAvoidWrite(BytesIO):
             self.close()
 
 
-PRELUDE = '''
+PRELUDE = """
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 // Autogenerated file created by components/style/gecko/regen_atoms.py.
 // DO NOT EDIT DIRECTLY
-'''[1:]
+"""[
+    1:
+]
 
-RULE_TEMPLATE = '''
+RULE_TEMPLATE = """
     ("{atom}") => {{{{
         #[allow(unsafe_code)] #[allow(unused_unsafe)]
         unsafe {{ $crate::string_cache::Atom::from_index_unchecked({index}) }}
     }}}};
-'''[1:]
+"""[
+    1:
+]
 
-MACRO_TEMPLATE = '''
+MACRO_TEMPLATE = """
 /// Returns a static atom by passing the literal string it represents.
 #[macro_export]
 macro_rules! atom {{
 {body}\
 }}
-'''
+"""
+
 
 def write_atom_macro(atoms, file_name):
     with FileAvoidWrite(file_name) as f:
         f.write(PRELUDE)
-        macro_rules = [RULE_TEMPLATE.format(atom=atom.value, name=atom.ident, index=i)
-                       for (i, atom) in enumerate(atoms)]
-        f.write(MACRO_TEMPLATE.format(body=''.join(macro_rules)))
+        macro_rules = [
+            RULE_TEMPLATE.format(atom=atom.value, name=atom.ident, index=i)
+            for (i, atom) in enumerate(atoms)
+        ]
+        f.write(MACRO_TEMPLATE.format(body="".join(macro_rules)))
 
 
 def write_pseudo_elements(atoms, target_filename):
     pseudos = []
     for atom in atoms:
-        if atom.type() == "nsCSSPseudoElementStaticAtom" or atom.type() == "nsCSSAnonBoxPseudoStaticAtom":
+        if (
+            atom.type() == "nsCSSPseudoElementStaticAtom"
+            or atom.type() == "nsCSSAnonBoxPseudoStaticAtom"
+        ):
             pseudos.append(atom)
 
-    pseudo_definition_template = os.path.join(GECKO_DIR, "pseudo_element_definition.mako.rs")
+    pseudo_definition_template = os.path.join(
+        GECKO_DIR, "pseudo_element_definition.mako.rs"
+    )
     print("cargo:rerun-if-changed={}".format(pseudo_definition_template))
     contents = build.render(pseudo_definition_template, PSEUDOS=pseudos)
 
diff --git a/components/style/properties/build.py b/components/style/properties/build.py
index 92966ce1b2d..e74c9b9795f 100644
--- a/components/style/properties/build.py
+++ b/components/style/properties/build.py
@@ -7,7 +7,7 @@ import os.path
 import re
 import sys
 
-BASE = os.path.dirname(__file__.replace('\\', '/'))
+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`
 
@@ -17,7 +17,7 @@ from mako.template import Template
 
 import data
 
-RE_PYTHON_ADDR = re.compile(r'<.+? object at 0x[0-9a-fA-F]+>')
+RE_PYTHON_ADDR = re.compile(r"<.+? object at 0x[0-9a-fA-F]+>")
 
 OUT_DIR = os.environ.get("OUT_DIR", "")
 
@@ -48,15 +48,20 @@ STYLE_STRUCT_LIST = [
 
 
 def main():
-    usage = ("Usage: %s [ servo-2013 | servo-2020 | gecko ] [ style-crate | geckolib <template> | html ]" %
-             sys.argv[0])
+    usage = (
+        "Usage: %s [ servo-2013 | servo-2020 | gecko ] [ style-crate | geckolib <template> | html ]"
+        % sys.argv[0]
+    )
     if len(sys.argv) < 3:
         abort(usage)
     engine = sys.argv[1]
     output = sys.argv[2]
 
-    if engine not in ["servo-2013", "servo-2020", "gecko"] \
-            or output not in ["style-crate", "geckolib", "html"]:
+    if engine not in ["servo-2013", "servo-2020", "gecko"] or output not in [
+        "style-crate",
+        "geckolib",
+        "html",
+    ]:
         abort(usage)
 
     properties = data.PropertiesData(engine=engine)
@@ -103,19 +108,19 @@ def main():
                 pref_attr = "servo_2020_pref"
             properties_dict = {
                 kind: {
-                    p.name: {
-                        "pref": getattr(p, pref_attr)
-                    }
+                    p.name: {"pref": getattr(p, pref_attr)}
                     for prop in properties_list
                     if prop.enabled_in_content()
                     for p in [prop] + prop.alias
                 }
                 for kind, properties_list in [
                     ("longhands", properties.longhands),
-                    ("shorthands", properties.shorthands)
+                    ("shorthands", properties.shorthands),
                 ]
             }
-            as_html = render(os.path.join(BASE, "properties.html.mako"), properties=properties_dict)
+            as_html = render(
+                os.path.join(BASE, "properties.html.mako"), properties=properties_dict
+            )
             as_json = json.dumps(properties_dict, indent=4, sort_keys=True)
             doc_servo = os.path.join(BASE, "..", "..", "..", "target", "doc", "servo")
             write(doc_servo, "css-properties.html", as_html)
@@ -136,14 +141,16 @@ def abort(message):
 
 def render(filename, **context):
     try:
-        lookup = TemplateLookup(directories=[BASE],
-                                input_encoding="utf8",
-                                strict_undefined=True)
-        template = Template(open(filename, "rb").read(),
-                            filename=filename,
-                            input_encoding="utf8",
-                            lookup=lookup,
-                            strict_undefined=True)
+        lookup = TemplateLookup(
+            directories=[BASE], input_encoding="utf8", strict_undefined=True
+        )
+        template = Template(
+            open(filename, "rb").read(),
+            filename=filename,
+            input_encoding="utf8",
+            lookup=lookup,
+            strict_undefined=True,
+        )
         # Uncomment to debug generated Python code:
         # write("/tmp", "mako_%s.py" % os.path.basename(filename), template.code)
         return template.render(**context)
@@ -161,7 +168,7 @@ def write(directory, filename, content):
 
     python_addr = RE_PYTHON_ADDR.search(content)
     if python_addr:
-        abort("Found \"{}\" in {} ({})".format(python_addr.group(0), filename, full_path))
+        abort('Found "{}" in {} ({})'.format(python_addr.group(0), filename, full_path))
 
 
 if __name__ == "__main__":
diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 6589627027b..77444f971d7 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -15,10 +15,18 @@ PHYSICAL_AXES = ["x", "y"]
 LOGICAL_AXES = ["inline", "block"]
 
 # bool is True when logical
-ALL_SIDES = [(side, False) for side in PHYSICAL_SIDES] + [(side, True) for side in LOGICAL_SIDES]
-ALL_SIZES = [(size, False) for size in PHYSICAL_SIZES] + [(size, True) for size in LOGICAL_SIZES]
-ALL_CORNERS = [(corner, False) for corner in PHYSICAL_CORNERS] + [(corner, True) for corner in LOGICAL_CORNERS]
-ALL_AXES = [(axis, False) for axis in PHYSICAL_AXES] + [(axis, True) for axis in LOGICAL_AXES]
+ALL_SIDES = [(side, False) for side in PHYSICAL_SIDES] + [
+    (side, True) for side in LOGICAL_SIDES
+]
+ALL_SIZES = [(size, False) for size in PHYSICAL_SIZES] + [
+    (size, True) for size in LOGICAL_SIZES
+]
+ALL_CORNERS = [(corner, False) for corner in PHYSICAL_CORNERS] + [
+    (corner, True) for corner in LOGICAL_CORNERS
+]
+ALL_AXES = [(axis, False) for axis in PHYSICAL_AXES] + [
+    (axis, True) for axis in LOGICAL_AXES
+]
 
 SYSTEM_FONT_LONGHANDS = """font_family font_size font_style
                            font_variant_caps font_stretch font_kerning
@@ -50,7 +58,9 @@ def to_snake_case(ident):
 
 
 def to_camel_case(ident):
-    return re.sub("(^|_|-)([a-z0-9])", lambda m: m.group(2).upper(), ident.strip("_").strip("-"))
+    return re.sub(
+        "(^|_|-)([a-z0-9])", lambda m: m.group(2).upper(), ident.strip("_").strip("-")
+    )
 
 
 def to_camel_case_lower(ident):
@@ -72,23 +82,32 @@ def parse_aliases(value):
 
 
 class Keyword(object):
-    def __init__(self, name, values, gecko_constant_prefix=None,
-                 gecko_enum_prefix=None, custom_consts=None,
-                 extra_gecko_values=None,
-                 extra_servo_2013_values=None,
-                 extra_servo_2020_values=None,
-                 gecko_aliases=None,
-                 servo_2013_aliases=None,
-                 servo_2020_aliases=None,
-                 gecko_strip_moz_prefix=None,
-                 gecko_inexhaustive=None):
+    def __init__(
+        self,
+        name,
+        values,
+        gecko_constant_prefix=None,
+        gecko_enum_prefix=None,
+        custom_consts=None,
+        extra_gecko_values=None,
+        extra_servo_2013_values=None,
+        extra_servo_2020_values=None,
+        gecko_aliases=None,
+        servo_2013_aliases=None,
+        servo_2020_aliases=None,
+        gecko_strip_moz_prefix=None,
+        gecko_inexhaustive=None,
+    ):
         self.name = name
         self.values = values.split()
         if gecko_constant_prefix and gecko_enum_prefix:
-            raise TypeError("Only one of gecko_constant_prefix and gecko_enum_prefix "
-                            "can be specified")
-        self.gecko_constant_prefix = gecko_constant_prefix or \
-            "NS_STYLE_" + self.name.upper().replace("-", "_")
+            raise TypeError(
+                "Only one of gecko_constant_prefix and gecko_enum_prefix "
+                "can be specified"
+            )
+        self.gecko_constant_prefix = (
+            gecko_constant_prefix or "NS_STYLE_" + self.name.upper().replace("-", "_")
+        )
         self.gecko_enum_prefix = gecko_enum_prefix
         self.extra_gecko_values = (extra_gecko_values or "").split()
         self.extra_servo_2013_values = (extra_servo_2013_values or "").split()
@@ -97,8 +116,9 @@ class Keyword(object):
         self.servo_2013_aliases = parse_aliases(servo_2013_aliases or "")
         self.servo_2020_aliases = parse_aliases(servo_2020_aliases or "")
         self.consts_map = {} if custom_consts is None else custom_consts
-        self.gecko_strip_moz_prefix = True \
-            if gecko_strip_moz_prefix is None else gecko_strip_moz_prefix
+        self.gecko_strip_moz_prefix = (
+            True if gecko_strip_moz_prefix is None else gecko_strip_moz_prefix
+        )
         self.gecko_inexhaustive = gecko_inexhaustive or (gecko_enum_prefix is None)
 
     def values_for(self, engine):
@@ -122,11 +142,14 @@ class Keyword(object):
             raise Exception("Bad engine: " + engine)
 
     def gecko_constant(self, value):
-        moz_stripped = (value.replace("-moz-", '')
-                        if self.gecko_strip_moz_prefix else value.replace("-moz-", 'moz-'))
+        moz_stripped = (
+            value.replace("-moz-", "")
+            if self.gecko_strip_moz_prefix
+            else value.replace("-moz-", "moz-")
+        )
         mapped = self.consts_map.get(value)
         if self.gecko_enum_prefix:
-            parts = moz_stripped.replace('-', '_').split('_')
+            parts = moz_stripped.replace("-", "_").split("_")
             parts = mapped if mapped else [p.title() for p in parts]
             return self.gecko_enum_prefix + "::" + "".join(parts)
         else:
@@ -146,13 +169,19 @@ class Keyword(object):
         if self.gecko_enum_prefix is None:
             return cast_type.upper() + "_" + self.gecko_constant(value)
         else:
-            return cast_type.upper() + "_" + self.gecko_constant(value).upper().replace("::", "_")
+            return (
+                cast_type.upper()
+                + "_"
+                + self.gecko_constant(value).upper().replace("::", "_")
+            )
 
 
 def arg_to_bool(arg):
     if isinstance(arg, bool):
         return arg
-    assert arg in ["True", "False"], "Unexpected value for boolean arguement: " + repr(arg)
+    assert arg in ["True", "False"], "Unexpected value for boolean arguement: " + repr(
+        arg
+    )
     return arg == "True"
 
 
@@ -170,20 +199,36 @@ def to_phys(name, logical, physical):
 
 
 class Longhand(object):
-    def __init__(self, style_struct, name, spec=None, animation_value_type=None, keyword=None,
-                 predefined_type=None,
-                 servo_2013_pref=None,
-                 servo_2020_pref=None,
-                 gecko_pref=None,
-                 enabled_in="content", need_index=False,
-                 gecko_ffi_name=None,
-                 has_effect_on_gecko_scrollbars=None,
-                 allowed_in_keyframe_block=True, cast_type='u8',
-                 logical=False, logical_group=None, alias=None, extra_prefixes=None, boxed=False,
-                 flags=None, allowed_in_page_rule=False, allow_quirks="No",
-                 ignored_when_colors_disabled=False,
-                 simple_vector_bindings=False,
-                 vector=False, servo_restyle_damage="repaint"):
+    def __init__(
+        self,
+        style_struct,
+        name,
+        spec=None,
+        animation_value_type=None,
+        keyword=None,
+        predefined_type=None,
+        servo_2013_pref=None,
+        servo_2020_pref=None,
+        gecko_pref=None,
+        enabled_in="content",
+        need_index=False,
+        gecko_ffi_name=None,
+        has_effect_on_gecko_scrollbars=None,
+        allowed_in_keyframe_block=True,
+        cast_type="u8",
+        logical=False,
+        logical_group=None,
+        alias=None,
+        extra_prefixes=None,
+        boxed=False,
+        flags=None,
+        allowed_in_page_rule=False,
+        allow_quirks="No",
+        ignored_when_colors_disabled=False,
+        simple_vector_bindings=False,
+        vector=False,
+        servo_restyle_damage="repaint",
+    ):
         self.name = name
         if not spec:
             raise TypeError("Spec should be specified for %s" % name)
@@ -235,20 +280,26 @@ class Longhand(object):
         # > The <declaration-list> inside of <keyframe-block> accepts any CSS property
         # > except those defined in this specification,
         # > but does accept the `animation-play-state` property and interprets it specially.
-        self.allowed_in_keyframe_block = allowed_in_keyframe_block \
-            and allowed_in_keyframe_block != "False"
+        self.allowed_in_keyframe_block = (
+            allowed_in_keyframe_block and allowed_in_keyframe_block != "False"
+        )
 
         # This is done like this since just a plain bool argument seemed like
         # really random.
         if animation_value_type is None:
-            raise TypeError("animation_value_type should be specified for (" + name + ")")
+            raise TypeError(
+                "animation_value_type should be specified for (" + name + ")"
+            )
         self.animation_value_type = animation_value_type
 
         self.animatable = animation_value_type != "none"
-        self.transitionable = animation_value_type != "none" \
-            and animation_value_type != "discrete"
-        self.is_animatable_with_computed_value = animation_value_type == "ComputedValue" \
+        self.transitionable = (
+            animation_value_type != "none" and animation_value_type != "discrete"
+        )
+        self.is_animatable_with_computed_value = (
+            animation_value_type == "ComputedValue"
             or animation_value_type == "discrete"
+        )
 
         # See compute_damage for the various values this can take
         self.servo_restyle_damage = servo_restyle_damage
@@ -263,17 +314,25 @@ class Longhand(object):
         if not self.logical:
             return []
 
-        candidates = [s for s in LOGICAL_SIDES + LOGICAL_SIZES + LOGICAL_CORNERS
-                      if s in self.name] + [s for s in LOGICAL_AXES if self.name.endswith(s)]
-        assert(len(candidates) == 1)
+        candidates = [
+            s for s in LOGICAL_SIDES + LOGICAL_SIZES + LOGICAL_CORNERS if s in self.name
+        ] + [s for s in LOGICAL_AXES if self.name.endswith(s)]
+        assert len(candidates) == 1
         logical_side = candidates[0]
 
-        physical = PHYSICAL_SIDES if logical_side in LOGICAL_SIDES \
-            else PHYSICAL_SIZES if logical_side in LOGICAL_SIZES \
-            else PHYSICAL_AXES if logical_side in LOGICAL_AXES \
+        physical = (
+            PHYSICAL_SIDES
+            if logical_side in LOGICAL_SIDES
+            else PHYSICAL_SIZES
+            if logical_side in LOGICAL_SIZES
+            else PHYSICAL_AXES
+            if logical_side in LOGICAL_AXES
             else LOGICAL_CORNERS
-        return [data.longhands_by_name[to_phys(self.name, logical_side, physical_side)]
-                for physical_side in physical]
+        )
+        return [
+            data.longhands_by_name[to_phys(self.name, logical_side, physical_side)]
+            for physical_side in physical
+        ]
 
     def experimental(self, engine):
         if engine == "gecko":
@@ -299,9 +358,15 @@ class Longhand(object):
         if engine == "gecko":
             return self.gecko_pref and self.gecko_pref != shorthand.gecko_pref
         elif engine == "servo-2013":
-            return self.servo_2013_pref and self.servo_2013_pref != shorthand.servo_2013_pref
+            return (
+                self.servo_2013_pref
+                and self.servo_2013_pref != shorthand.servo_2013_pref
+            )
         elif engine == "servo-2020":
-            return self.servo_2020_pref and self.servo_2020_pref != shorthand.servo_2020_pref
+            return (
+                self.servo_2020_pref
+                and self.servo_2020_pref != shorthand.servo_2020_pref
+            )
         else:
             raise Exception("Bad engine: " + engine)
 
@@ -412,13 +477,21 @@ class Longhand(object):
 
 
 class Shorthand(object):
-    def __init__(self, name, sub_properties, spec=None,
-                 servo_2013_pref=None,
-                 servo_2020_pref=None,
-                 gecko_pref=None,
-                 enabled_in="content",
-                 allowed_in_keyframe_block=True, alias=None, extra_prefixes=None,
-                 allowed_in_page_rule=False, flags=None):
+    def __init__(
+        self,
+        name,
+        sub_properties,
+        spec=None,
+        servo_2013_pref=None,
+        servo_2020_pref=None,
+        gecko_pref=None,
+        enabled_in="content",
+        allowed_in_keyframe_block=True,
+        alias=None,
+        extra_prefixes=None,
+        allowed_in_page_rule=False,
+        flags=None,
+    ):
         self.name = name
         if not spec:
             raise TypeError("Spec should be specified for %s" % name)
@@ -440,8 +513,9 @@ class Shorthand(object):
         # > The <declaration-list> inside of <keyframe-block> accepts any CSS property
         # > except those defined in this specification,
         # > but does accept the `animation-play-state` property and interprets it specially.
-        self.allowed_in_keyframe_block = allowed_in_keyframe_block \
-            and allowed_in_keyframe_block != "False"
+        self.allowed_in_keyframe_block = (
+            allowed_in_keyframe_block and allowed_in_keyframe_block != "False"
+        )
 
     def get_animatable(self):
         for sub in self.sub_properties:
@@ -580,7 +654,9 @@ class PropertiesData(object):
         self.shorthands = []
         self.shorthands_by_name = {}
         self.shorthand_aliases = []
-        self.counted_unknown_properties = [CountedUnknownProperty(p) for p in COUNTED_UNKNOWN_PROPERTIES]
+        self.counted_unknown_properties = [
+            CountedUnknownProperty(p) for p in COUNTED_UNKNOWN_PROPERTIES
+        ]
 
     def new_style_struct(self, *args, **kwargs):
         style_struct = StyleStruct(*args, **kwargs)
@@ -595,7 +671,7 @@ class PropertiesData(object):
         #       See servo/servo#14941.
         if self.engine == "gecko":
             for (prefix, pref) in property.extra_prefixes:
-                property.alias.append(('-%s-%s' % (prefix, property.name), pref))
+                property.alias.append(("-%s-%s" % (prefix, property.name), pref))
 
     def declare_longhand(self, name, engines=None, **kwargs):
         engines = engines.split()
@@ -610,7 +686,9 @@ class PropertiesData(object):
         self.longhands.append(longhand)
         self.longhands_by_name[name] = longhand
         if longhand.logical_group:
-            self.longhands_by_logical_group.setdefault(longhand.logical_group, []).append(longhand)
+            self.longhands_by_logical_group.setdefault(
+                longhand.logical_group, []
+            ).append(longhand)
 
         return longhand
 
@@ -686,31 +764,31 @@ class PropertyRestrictions:
     # https://drafts.csswg.org/css-pseudo/#first-letter-styling
     @staticmethod
     def first_letter(data):
-        props = set([
-            "color",
-            "opacity",
-            "float",
-            "initial-letter",
-
-            # Kinda like css-fonts?
-            "-moz-osx-font-smoothing",
-
-            # Kinda like css-text?
-            "-webkit-text-stroke-width",
-            "-webkit-text-fill-color",
-            "-webkit-text-stroke-color",
-            "vertical-align",
-            "line-height",
-
-            # Kinda like css-backgrounds?
-            "background-blend-mode",
-        ] + PropertyRestrictions.shorthand(data, "padding")
-          + PropertyRestrictions.shorthand(data, "margin")
-          + PropertyRestrictions.spec(data, "css-fonts")
-          + PropertyRestrictions.spec(data, "css-backgrounds")
-          + PropertyRestrictions.spec(data, "css-text")
-          + PropertyRestrictions.spec(data, "css-shapes")
-          + PropertyRestrictions.spec(data, "css-text-decor"))
+        props = set(
+            [
+                "color",
+                "opacity",
+                "float",
+                "initial-letter",
+                # Kinda like css-fonts?
+                "-moz-osx-font-smoothing",
+                # Kinda like css-text?
+                "-webkit-text-stroke-width",
+                "-webkit-text-fill-color",
+                "-webkit-text-stroke-color",
+                "vertical-align",
+                "line-height",
+                # Kinda like css-backgrounds?
+                "background-blend-mode",
+            ]
+            + PropertyRestrictions.shorthand(data, "padding")
+            + PropertyRestrictions.shorthand(data, "margin")
+            + PropertyRestrictions.spec(data, "css-fonts")
+            + PropertyRestrictions.spec(data, "css-backgrounds")
+            + PropertyRestrictions.spec(data, "css-text")
+            + PropertyRestrictions.spec(data, "css-shapes")
+            + PropertyRestrictions.spec(data, "css-text-decor")
+        )
 
         _add_logical_props(data, props)
 
@@ -720,27 +798,27 @@ class PropertyRestrictions:
     # https://drafts.csswg.org/css-pseudo/#first-line-styling
     @staticmethod
     def first_line(data):
-        props = set([
-            # Per spec.
-            "color",
-            "opacity",
-
-            # Kinda like css-fonts?
-            "-moz-osx-font-smoothing",
-
-            # Kinda like css-text?
-            "-webkit-text-stroke-width",
-            "-webkit-text-fill-color",
-            "-webkit-text-stroke-color",
-            "vertical-align",
-            "line-height",
-
-            # Kinda like css-backgrounds?
-            "background-blend-mode",
-        ] + PropertyRestrictions.spec(data, "css-fonts")
-          + PropertyRestrictions.spec(data, "css-backgrounds")
-          + PropertyRestrictions.spec(data, "css-text")
-          + PropertyRestrictions.spec(data, "css-text-decor"))
+        props = set(
+            [
+                # Per spec.
+                "color",
+                "opacity",
+                # Kinda like css-fonts?
+                "-moz-osx-font-smoothing",
+                # Kinda like css-text?
+                "-webkit-text-stroke-width",
+                "-webkit-text-fill-color",
+                "-webkit-text-stroke-color",
+                "vertical-align",
+                "line-height",
+                # Kinda like css-backgrounds?
+                "background-blend-mode",
+            ]
+            + PropertyRestrictions.spec(data, "css-fonts")
+            + PropertyRestrictions.spec(data, "css-backgrounds")
+            + PropertyRestrictions.spec(data, "css-text")
+            + PropertyRestrictions.spec(data, "css-text-decor")
+        )
 
         # These are probably Gecko bugs and should be supported per spec.
         for prop in PropertyRestrictions.shorthand(data, "border"):
@@ -770,42 +848,46 @@ class PropertyRestrictions:
     # https://drafts.csswg.org/css-pseudo/#marker-pseudo
     @staticmethod
     def marker(data):
-        return set([
-            "color",
-            "text-combine-upright",
-            "text-transform",
-            "unicode-bidi",
-            "direction",
-            "content",
-            "-moz-osx-font-smoothing",
-        ] + PropertyRestrictions.spec(data, "css-fonts")
-          + PropertyRestrictions.spec(data, "css-animations")
-          + PropertyRestrictions.spec(data, "css-transitions"))
+        return set(
+            [
+                "color",
+                "text-combine-upright",
+                "text-transform",
+                "unicode-bidi",
+                "direction",
+                "content",
+                "-moz-osx-font-smoothing",
+            ]
+            + PropertyRestrictions.spec(data, "css-fonts")
+            + PropertyRestrictions.spec(data, "css-animations")
+            + PropertyRestrictions.spec(data, "css-transitions")
+        )
 
     # https://www.w3.org/TR/webvtt1/#the-cue-pseudo-element
     @staticmethod
     def cue(data):
-        return set([
-            "color",
-            "opacity",
-            "visibility",
-            "text-shadow",
-            "white-space",
-            "text-combine-upright",
-            "ruby-position",
-
-            # XXX Should these really apply to cue?
-            "font-synthesis",
-            "-moz-osx-font-smoothing",
-
-            # FIXME(emilio): background-blend-mode should be part of the
-            # background shorthand, and get reset, per
-            # https://drafts.fxtf.org/compositing/#background-blend-mode
-            "background-blend-mode",
-        ] + PropertyRestrictions.shorthand(data, "text-decoration")
-          + PropertyRestrictions.shorthand(data, "background")
-          + PropertyRestrictions.shorthand(data, "outline")
-          + PropertyRestrictions.shorthand(data, "font"))
+        return set(
+            [
+                "color",
+                "opacity",
+                "visibility",
+                "text-shadow",
+                "white-space",
+                "text-combine-upright",
+                "ruby-position",
+                # XXX Should these really apply to cue?
+                "font-synthesis",
+                "-moz-osx-font-smoothing",
+                # FIXME(emilio): background-blend-mode should be part of the
+                # background shorthand, and get reset, per
+                # https://drafts.fxtf.org/compositing/#background-blend-mode
+                "background-blend-mode",
+            ]
+            + PropertyRestrictions.shorthand(data, "text-decoration")
+            + PropertyRestrictions.shorthand(data, "background")
+            + PropertyRestrictions.shorthand(data, "outline")
+            + PropertyRestrictions.shorthand(data, "font")
+        )
 
 
 class CountedUnknownProperty:

From 5b42605b79353b450346e03ab73af1fd17008f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 26 Oct 2020 09:58:31 +0000
Subject: [PATCH 069/156] style: Remove unused
 DeclarationBlock::get_at_importance.

Differential Revision: https://phabricator.services.mozilla.com/D94693
---
 components/style/properties/declaration_block.rs | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index eef63d2d29e..d8ac84a8ec5 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -348,21 +348,6 @@ impl PropertyDeclarationBlock {
             .find(|(declaration, _)| declaration.id() == property)
     }
 
-    /// Get a declaration for a given property with the specified importance.
-    #[inline]
-    pub fn get_at_importance(
-        &self,
-        property: PropertyDeclarationId,
-        importance: Importance,
-    ) -> Option<&PropertyDeclaration> {
-        let (declaration, i) = self.get(property)?;
-        if i == importance {
-            Some(declaration)
-        } else {
-            None
-        }
-    }
-
     /// Tries to serialize a given shorthand from the declarations in this
     /// block.
     pub fn shorthand_to_css(

From d246b9e4c36669c4b337cc2abe7d94987b413f8f Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Tue, 27 Oct 2020 12:37:44 +0000
Subject: [PATCH 070/156] style: Remove "scrollbar-small"
 -moz-default-appearance value and replace its single use with
 scrollbar-width: thin.

Differential Revision: https://phabricator.services.mozilla.com/D94673
---
 components/style/values/specified/box.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index b51634d5b3a..82a2186a0de 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1643,9 +1643,6 @@ pub enum Appearance {
     /// A scrollbar.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Scrollbar,
-    /// A small scrollbar.
-    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
-    ScrollbarSmall,
     /// The scrollbar slider
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarHorizontal,

From e2545ee95d55966a189d474e06a8cf074ae997e9 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Tue, 27 Oct 2020 12:37:44 +0000
Subject: [PATCH 071/156] style: Use the -moz-default-appearance values
 "scrollbar-horizontal" and "scrollbar-vertical" on macOS and remove the
 now-unused value "scrollbar".

Other platforms were already converted to scrollbar-horizontal and scrollbar-vertical in bug 1205643.

Differential Revision: https://phabricator.services.mozilla.com/D94674
---
 components/style/values/specified/box.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 82a2186a0de..ed81eba40e6 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1640,9 +1640,6 @@ pub enum Appearance {
     /// The resizer itself.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     Resizer,
-    /// A scrollbar.
-    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
-    Scrollbar,
     /// The scrollbar slider
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     ScrollbarHorizontal,

From 20d2a06967c71e36b32789a6cb3dcf4ff2fe0f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 30 Oct 2020 19:47:19 +0000
Subject: [PATCH 072/156] style: Use document quirks mode rather than sheet
 quirks mode for stylesheet invalidation.

In order to determine whether classes or ids are case insensitive we
need the document quirks mode. The sheet quirks mode almost always
matches, but may not match when sheets are added by privileged APIs.

Differential Revision: https://phabricator.services.mozilla.com/D95061
---
 components/style/gecko/media_queries.rs      | 6 ++++++
 components/style/invalidation/stylesheets.rs | 2 +-
 components/style/stylesheet_set.rs           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs
index e5ffccf11c1..08425f22059 100644
--- a/components/style/gecko/media_queries.rs
+++ b/components/style/gecko/media_queries.rs
@@ -9,6 +9,7 @@ use crate::gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor};
 use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs;
 use crate::media_queries::MediaType;
+use crate::context::QuirksMode;
 use crate::properties::ComputedValues;
 use crate::string_cache::Atom;
 use crate::values::computed::Length;
@@ -143,6 +144,11 @@ impl Device {
             .store(size.px().to_bits(), Ordering::Relaxed)
     }
 
+    /// The quirks mode of the document.
+    pub fn quirks_mode(&self) -> QuirksMode {
+        self.document().mCompatMode.into()
+    }
+
     /// Sets the body text color for the "inherit color from body" quirk.
     ///
     /// <https://quirks.spec.whatwg.org/#the-tables-inherit-color-from-body-quirk>
diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index b50e04b0f0b..8ac2b57b34e 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -140,7 +140,7 @@ impl StylesheetInvalidationSet {
             return; // Nothing to do here.
         }
 
-        let quirks_mode = stylesheet.quirks_mode(guard);
+        let quirks_mode = device.quirks_mode();
         for rule in stylesheet.effective_rules(device, guard) {
             self.collect_invalidations_for_rule(rule, guard, device, quirks_mode);
             if self.fully_invalid {
diff --git a/components/style/stylesheet_set.rs b/components/style/stylesheet_set.rs
index 93f4b986052..fe743025419 100644
--- a/components/style/stylesheet_set.rs
+++ b/components/style/stylesheet_set.rs
@@ -450,7 +450,7 @@ macro_rules! sheet_set_methods {
             change_kind: RuleChangeKind,
         ) {
             if let Some(device) = device {
-                let quirks_mode = sheet.quirks_mode(guard);
+                let quirks_mode = device.quirks_mode();
                 self.invalidations.rule_changed(
                     sheet,
                     rule,

From 5d388745d8943a96cb213cc10ffffd40f544ab5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Nov 2020 02:37:44 +0000
Subject: [PATCH 073/156] style: Don't waste string space before making values
 immutable.

Differential Revision: https://phabricator.services.mozilla.com/D96130
---
 components/style/custom_properties.rs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs
index 23e25b5a155..4943fd1a74a 100644
--- a/components/style/custom_properties.rs
+++ b/components/style/custom_properties.rs
@@ -247,8 +247,11 @@ impl VariableValue {
             .collect::<Vec<_>>()
             .into_boxed_slice();
 
+        let mut css = css.into_owned();
+        css.shrink_to_fit();
+
         Ok(Arc::new(VariableValue {
-            css: css.into_owned(),
+            css,
             first_token_type,
             last_token_type,
             references: custom_property_references,
@@ -268,9 +271,11 @@ impl VariableValue {
             unit: CowRcStr::from("px"),
         };
         let token_type = token.serialization_type();
+        let mut css = token.to_css_string();
+        css.shrink_to_fit();
 
         VariableValue {
-            css: token.to_css_string(),
+            css,
             first_token_type: token_type,
             last_token_type: token_type,
             references: Default::default(),
@@ -577,7 +582,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
                 let value = if !has_references && unparsed_value.references_environment {
                     let result = substitute_references_in_value(unparsed_value, &map, &self.device);
                     match result {
-                        Ok(new_value) => Arc::new(new_value),
+                        Ok(new_value) => new_value,
                         Err(..) => {
                             // Don't touch the map, this has the same effect as
                             // making it compute to the inherited one.
@@ -847,7 +852,7 @@ fn substitute_all(
         let result = substitute_references_in_value(&value, &context.map, &context.device);
         match result {
             Ok(computed_value) => {
-                context.map.insert(name, Arc::new(computed_value));
+                context.map.insert(name, computed_value);
             },
             Err(..) => {
                 // This is invalid, reset it to the unset (inherited) value.
@@ -889,7 +894,7 @@ fn substitute_references_in_value<'i>(
     value: &'i VariableValue,
     custom_properties: &CustomPropertiesMap,
     device: &Device,
-) -> Result<ComputedValue, ParseError<'i>> {
+) -> Result<Arc<ComputedValue>, ParseError<'i>> {
     debug_assert!(!value.references.is_empty() || value.references_environment);
 
     let mut input = ParserInput::new(&value.css);
@@ -906,7 +911,8 @@ fn substitute_references_in_value<'i>(
     )?;
 
     computed_value.push_from(&input, position, last_token_type)?;
-    Ok(computed_value)
+    computed_value.css.shrink_to_fit();
+    Ok(Arc::new(computed_value))
 }
 
 /// Replace `var()` functions in an arbitrary bit of input.

From bdbe8fde42373987c9845200e4ac9801f039e28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Nov 2020 02:37:44 +0000
Subject: [PATCH 074/156] style: Shrink custom property maps before making them
 immutable.

Differential Revision: https://phabricator.services.mozilla.com/D96132
---
 components/style/custom_properties.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs
index 4943fd1a74a..4a0bf5bed7a 100644
--- a/components/style/custom_properties.rs
+++ b/components/style/custom_properties.rs
@@ -662,6 +662,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
             let inherited = self.inherited.as_ref().map(|m| &***m);
             substitute_all(&mut map, inherited, self.device);
         }
+        map.shrink_to_fit();
         Some(Arc::new(map))
     }
 }

From 42abdb99c44727de33fb141486e47dcdf83301aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 6 Nov 2020 22:30:28 +0000
Subject: [PATCH 075/156] style: Fix font loading invalidation to account for
 metrics coming from the parent style.

We were only looking at the given frame's style, which is not
sufficient for this case.

Differential Revision: https://phabricator.services.mozilla.com/D96237
---
 .../style/properties/computed_value_flags.rs  | 19 ++++++++++++-------
 components/style/values/specified/length.rs   | 12 ++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/components/style/properties/computed_value_flags.rs b/components/style/properties/computed_value_flags.rs
index dc9597e087b..cc7d9c94fb9 100644
--- a/components/style/properties/computed_value_flags.rs
+++ b/components/style/properties/computed_value_flags.rs
@@ -57,19 +57,24 @@ bitflags! {
         /// Whether the child explicitly inherits any reset property.
         const INHERITS_RESET_STYLE = 1 << 8;
 
-        /// Whether any value on our style is font-metric-dependent.
-        const DEPENDS_ON_FONT_METRICS = 1 << 9;
+        /// Whether any value on our style is font-metric-dependent on our
+        /// primary font.
+        const DEPENDS_ON_SELF_FONT_METRICS = 1 << 9;
+
+        /// Whether any value on our style is font-metric-dependent on the
+        /// primary font of our parent.
+        const DEPENDS_ON_INHERITED_FONT_METRICS = 1 << 10;
 
         /// Whether the style or any of the ancestors has a multicol style.
         ///
         /// Only used in Servo.
-        const CAN_BE_FRAGMENTED = 1 << 10;
+        const CAN_BE_FRAGMENTED = 1 << 11;
 
         /// Whether this style is the style of the document element.
-        const IS_ROOT_ELEMENT_STYLE = 1 << 11;
+        const IS_ROOT_ELEMENT_STYLE = 1 << 12;
 
         /// Whether this element is inside an `opacity: 0` subtree.
-        const IS_IN_OPACITY_ZERO_SUBTREE = 1 << 12;
+        const IS_IN_OPACITY_ZERO_SUBTREE = 1 << 13;
 
         /// Whether there are author-specified rules for border-* properties
         /// (except border-image-*), background-color, or background-image.
@@ -77,13 +82,13 @@ bitflags! {
         /// TODO(emilio): Maybe do include border-image, see:
         ///
         /// https://github.com/w3c/csswg-drafts/issues/4777#issuecomment-604424845
-        const HAS_AUTHOR_SPECIFIED_BORDER_BACKGROUND = 1 << 13;
+        const HAS_AUTHOR_SPECIFIED_BORDER_BACKGROUND = 1 << 14;
 
         /// Whether there are author-specified rules for padding-* properties.
         ///
         /// FIXME(emilio): Try to merge this with BORDER_BACKGROUND, see
         /// https://github.com/w3c/csswg-drafts/issues/4777
-        const HAS_AUTHOR_SPECIFIED_PADDING = 1 << 14;
+        const HAS_AUTHOR_SPECIFIED_PADDING = 1 << 15;
     }
 }
 
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
index 64a2e8cf5db..4fc841aea93 100644
--- a/components/style/values/specified/length.rs
+++ b/components/style/values/specified/length.rs
@@ -161,6 +161,10 @@ impl FontRelativeLength {
         }
 
         let reference_font_size = base_size.resolve(context);
+        let font_metrics_flag = match base_size {
+            FontBaseSize::CurrentStyle => ComputedValueFlags::DEPENDS_ON_SELF_FONT_METRICS,
+            FontBaseSize::InheritedStyle => ComputedValueFlags::DEPENDS_ON_INHERITED_FONT_METRICS,
+        };
         match *self {
             FontRelativeLength::Em(length) => {
                 if context.for_non_inherited_property.is_some() {
@@ -178,9 +182,7 @@ impl FontRelativeLength {
                 if context.for_non_inherited_property.is_some() {
                     context.rule_cache_conditions.borrow_mut().set_uncacheable();
                 }
-                context
-                    .builder
-                    .add_flags(ComputedValueFlags::DEPENDS_ON_FONT_METRICS);
+                context.builder.add_flags(font_metrics_flag);
                 // The x-height is an intrinsically horizontal metric.
                 let metrics =
                     query_font_metrics(context, base_size, FontMetricsOrientation::Horizontal);
@@ -199,9 +201,7 @@ impl FontRelativeLength {
                 if context.for_non_inherited_property.is_some() {
                     context.rule_cache_conditions.borrow_mut().set_uncacheable();
                 }
-                context
-                    .builder
-                    .add_flags(ComputedValueFlags::DEPENDS_ON_FONT_METRICS);
+                context.builder.add_flags(font_metrics_flag);
                 // https://drafts.csswg.org/css-values/#ch:
                 //
                 //     Equal to the used advance measure of the “0” (ZERO,

From e1bf1648c7d7f327a7f5652805c318812b8c4ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 8 Nov 2020 14:01:50 +0000
Subject: [PATCH 076/156] style: Fix declaration block serialization and
 logical properties.

As per https://github.com/w3c/csswg-drafts/issues/3030.

Also remove a system font special-case. It's generally handled in
shorthands/font.mako.rs, and when it's not, it's really the same issue
as https://github.com/w3c/csswg-drafts/issues/2515.

Browsers are all over the place for the system font case, so I think
it's fine.

Differential Revision: https://phabricator.services.mozilla.com/D96045
---
 .../style/properties/declaration_block.rs     | 217 ++++++++++--------
 .../style/properties/properties.mako.rs       |  34 ++-
 2 files changed, 151 insertions(+), 100 deletions(-)

diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index d8ac84a8ec5..bd0a87f0b0a 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -930,7 +930,7 @@ impl PropertyDeclarationBlock {
         let mut already_serialized = NonCustomPropertyIdSet::new();
 
         // Step 3
-        for (declaration, importance) in self.declaration_importance_iter() {
+        'declaration_loop: for (declaration, importance) in self.declaration_importance_iter() {
             // Step 3.1
             let property = declaration.id();
             let longhand_id = match property {
@@ -956,11 +956,7 @@ impl PropertyDeclarationBlock {
                 continue;
             }
 
-            // Step 3.3
-            // Step 3.3.1 is done by checking already_serialized while
-            // iterating below.
-
-            // Step 3.3.2
+            // Steps 3.3 & 3.4
             for shorthand in longhand_id.shorthands() {
                 // We already attempted to serialize this shorthand before.
                 if already_serialized.contains(shorthand.into()) {
@@ -972,74 +968,105 @@ impl PropertyDeclarationBlock {
                     continue;
                 }
 
-                // Substep 2 & 3
-                let mut current_longhands = SmallVec::<[_; 10]>::new();
-                let mut important_count = 0;
-                let mut found_system = None;
-
-                let is_system_font = shorthand == ShorthandId::Font &&
-                    self.declarations.iter().any(|l| match l.id() {
-                        PropertyDeclarationId::Longhand(id) => {
-                            if already_serialized.contains(id.into()) {
-                                return false;
-                            }
-
-                            l.get_system().is_some()
-                        },
-                        PropertyDeclarationId::Custom(..) => {
-                            debug_assert!(l.get_system().is_none());
-                            false
-                        },
-                    });
-
-                if is_system_font {
-                    for (longhand, importance) in self.declaration_importance_iter() {
-                        if longhand.get_system().is_some() || longhand.is_default_line_height() {
-                            current_longhands.push(longhand);
-                            if found_system.is_none() {
-                                found_system = longhand.get_system();
-                            }
-                            if importance.important() {
-                                important_count += 1;
-                            }
-                        }
-                    }
-                } else {
-                    let mut contains_all_longhands = true;
+                // Step 3.3.1:
+                //     Let longhands be an array consisting of all CSS
+                //     declarations in declaration block’s declarations that
+                //     that are not in already serialized and have a property
+                //     name that maps to one of the shorthand properties in
+                //     shorthands.
+                let longhands = {
+                    // TODO(emilio): This could just index in an array if we
+                    // remove pref-controlled longhands.
+                    let mut ids = LonghandIdSet::new();
                     for longhand in shorthand.longhands() {
-                        match self.get(PropertyDeclarationId::Longhand(longhand)) {
-                            Some((declaration, importance)) => {
-                                current_longhands.push(declaration);
-                                if importance.important() {
-                                    important_count += 1;
-                                }
-                            },
-                            None => {
-                                contains_all_longhands = false;
-                                break;
-                            },
-                        }
+                        ids.insert(longhand);
                     }
+                    ids
+                };
 
-                    // Substep 1:
-                    if !contains_all_longhands {
-                        continue;
+                // Step 3.4.2
+                //     If all properties that map to shorthand are not present
+                //     in longhands, continue with the steps labeled shorthand
+                //     loop.
+                if !self.longhands.contains_all(&longhands) {
+                    continue;
+                }
+
+                // Step 3.4.3:
+                //     Let current longhands be an empty array.
+                let mut current_longhands = SmallVec::<[_; 10]>::new();
+                let mut logical_groups = LogicalGroupSet::new();
+                let mut saw_one = false;
+                let mut logical_mismatch = false;
+                let mut seen = LonghandIdSet::new();
+                let mut important_count = 0;
+
+                // Step 3.4.4:
+                //    Append all CSS declarations in longhands that have a
+                //    property name that maps to shorthand to current longhands.
+                for (declaration, importance) in self.declaration_importance_iter() {
+                    let longhand = match declaration.id() {
+                        PropertyDeclarationId::Longhand(id) => id,
+                        PropertyDeclarationId::Custom(..) => continue,
+                    };
+
+                    if longhands.contains(longhand) {
+                        saw_one = true;
+                        if importance.important() {
+                            important_count += 1;
+                        }
+                        current_longhands.push(declaration);
+                        if shorthand != ShorthandId::All {
+                            // All is special because it contains both physical
+                            // and logical longhands.
+                            if let Some(g) = longhand.logical_group() {
+                                logical_groups.insert(g);
+                            }
+                            seen.insert(longhand);
+                            if seen == longhands {
+                                break;
+                            }
+                        }
+                    } else if saw_one {
+                        if let Some(g) = longhand.logical_group() {
+                            if logical_groups.contains(g) {
+                                logical_mismatch = true;
+                                break;
+                            }
+                        }
                     }
                 }
 
-                // Substep 4
+                // 3.4.5:
+                //     If there is one or more CSS declarations in current
+                //     longhands have their important flag set and one or more
+                //     with it unset, continue with the steps labeled shorthand
+                //     loop.
                 let is_important = important_count > 0;
                 if is_important && important_count != current_longhands.len() {
                     continue;
                 }
+
+                // 3.4.6:
+                //    If there’s any declaration in declaration block in between
+                //    the first and the last longhand in current longhands which
+                //    belongs to the same logical property group, but has a
+                //    different mapping logic as any of the longhands in current
+                //    longhands, and is not in current longhands, continue with
+                //    the steps labeled shorthand loop.
+                if logical_mismatch {
+                    continue;
+                }
+
                 let importance = if is_important {
                     Importance::Important
                 } else {
                     Importance::Normal
                 };
 
-                // Substep 5 - Let value be the result of invoking serialize
-                // a CSS value of current longhands.
+                // 3.4.7:
+                //    Let value be the result of invoking serialize a CSS value
+                //    of current longhands.
                 let appendable_value = match shorthand
                     .get_shorthand_appendable_value(current_longhands.iter().cloned())
                 {
@@ -1050,32 +1077,17 @@ impl PropertyDeclarationBlock {
                 // We avoid re-serializing if we're already an
                 // AppendableValue::Css.
                 let mut v = CssString::new();
-                let value = match (appendable_value, found_system) {
-                    (
-                        AppendableValue::Css {
-                            css,
-                            with_variables,
-                        },
-                        _,
-                    ) => {
+                let value = match appendable_value {
+                    AppendableValue::Css { css, with_variables } => {
                         debug_assert!(!css.is_empty());
-                        AppendableValue::Css {
-                            css: css,
-                            with_variables: with_variables,
-                        }
+                        AppendableValue::Css { css, with_variables }
                     },
-                    #[cfg(feature = "gecko")]
-                    (_, Some(sys)) => {
-                        sys.to_css(&mut CssWriter::new(&mut v))?;
-                        AppendableValue::Css {
-                            css: CssStringBorrow::from(&v),
-                            with_variables: false,
-                        }
-                    },
-                    (other, _) => {
+                    other => {
                         append_declaration_value(&mut v, other)?;
 
-                        // Substep 6
+                        // 3.4.8:
+                        //     If value is the empty string, continue with the
+                        //     steps labeled shorthand loop.
                         if v.is_empty() {
                             continue;
                         }
@@ -1087,7 +1099,15 @@ impl PropertyDeclarationBlock {
                     },
                 };
 
-                // Substeps 7 and 8
+                // 3.4.9:
+                //     Let serialized declaration be the result of invoking
+                //     serialize a CSS declaration with property name shorthand,
+                //     value value, and the important flag set if the CSS
+                //     declarations in current longhands have their important
+                //     flag set.
+                //
+                // 3.4.10:
+                //     Append serialized declaration to list.
                 append_serialization::<Cloned<slice::Iter<_>>, _>(
                     dest,
                     &shorthand,
@@ -1096,6 +1116,9 @@ impl PropertyDeclarationBlock {
                     &mut is_first_serialization,
                 )?;
 
+                // 3.4.11:
+                //     Append the property names of all items of current
+                //     longhands to already serialized.
                 for current_longhand in &current_longhands {
                     let longhand_id = match current_longhand.id() {
                         PropertyDeclarationId::Longhand(id) => id,
@@ -1106,24 +1129,21 @@ impl PropertyDeclarationBlock {
                     already_serialized.insert(longhand_id.into());
                 }
 
-                // FIXME(https://github.com/w3c/csswg-drafts/issues/1774)
-                // The specification does not include an instruction to abort
-                // the shorthand loop at this point, but doing so both matches
-                // Gecko and makes sense since shorthands are checked in
-                // preferred order.
-                break;
+                // 3.4.12:
+                //     Continue with the steps labeled declaration loop.
+                continue 'declaration_loop;
             }
 
-            // Step 3.3.4
-            if already_serialized.contains(longhand_id.into()) {
-                continue;
-            }
-
-            // Steps 3.3.5, 3.3.6 & 3.3.7
-            // Need to specify an iterator type here even though it’s unused to work around
-            // "error: unable to infer enough type information about `_`;
-            //  type annotations or generic parameter binding required [E0282]"
-            // Use the same type as earlier call to reuse generated code.
+            // Steps 3.5, 3.6 & 3.7:
+            //     Let value be the result of invoking serialize a CSS value of
+            //     declaration.
+            //
+            //     Let serialized declaration be the result of invoking
+            //     serialize a CSS declaration with property name property,
+            //     value value, and the important flag set if declaration has
+            //     its important flag set.
+            //
+            //     Append serialized declaration to list.
             append_serialization::<Cloned<slice::Iter<_>>, _>(
                 dest,
                 &property,
@@ -1132,7 +1152,8 @@ impl PropertyDeclarationBlock {
                 &mut is_first_serialization,
             )?;
 
-            // Step 3.3.8
+            // Step 3.8:
+            //     Append property to already serialized.
             already_serialized.insert(longhand_id.into());
         }
 
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 24d396cdf0f..a4316a501ad 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -792,14 +792,44 @@ static ${name}: LonghandIdSet = LonghandIdSet {
 /// A group for properties which may override each other
 /// via logical resolution.
 #[derive(Clone, Copy, Eq, Hash, PartialEq)]
+#[repr(u8)]
 pub enum LogicalGroup {
-    % for group in sorted(logical_groups.keys()):
+    % for i, group in enumerate(logical_groups.keys()):
     /// ${group}
-    ${to_camel_case(group)},
+    ${to_camel_case(group)} = ${i},
     % endfor
 }
 
 
+/// A set of logical groups.
+#[derive(Clone, Copy, Debug, Default, MallocSizeOf, PartialEq)]
+pub struct LogicalGroupSet {
+    storage: [u32; (${len(logical_groups)} - 1 + 32) / 32]
+}
+
+impl LogicalGroupSet {
+    /// Creates an empty `NonCustomPropertyIdSet`.
+    pub fn new() -> Self {
+        Self {
+            storage: Default::default(),
+        }
+    }
+
+    /// Return whether the given group is in the set
+    #[inline]
+    pub fn contains(&self, g: LogicalGroup) -> bool {
+        let bit = g as usize;
+        (self.storage[bit / 32] & (1 << (bit % 32))) != 0
+    }
+
+    /// Insert a group the set.
+    #[inline]
+    pub fn insert(&mut self, g: LogicalGroup) {
+        let bit = g as usize;
+        self.storage[bit / 32] |= 1 << (bit % 32);
+    }
+}
+
 /// A set of longhand properties
 #[derive(Clone, Copy, Debug, Default, MallocSizeOf, PartialEq)]
 pub struct LonghandIdSet {

From 4771d7ddf0a43835f6466856afcf3596e815a340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 13 Nov 2020 12:53:45 +0000
Subject: [PATCH 077/156] style: Make focus-visible match the spec more
 closely.

The spec text has been improved a while ago, so I think we should do
this. This keeps the current moz-focusring behavior when the pref is
disabled, but when enabled it becomes effectively an alias of
focus-visible.

Differential Revision: https://phabricator.services.mozilla.com/D96697
---
 components/style/element_state.rs                  | 6 ++----
 components/style/gecko/non_ts_pseudo_class_list.rs | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index ebf6aa42a69..2e3ccb3b31b 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -103,6 +103,8 @@ bitflags! {
         /// Non-standard & undocumented.
         const IN_INCREMENT_SCRIPT_LEVEL_STATE = 1 << 38;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-focusring
+        ///
+        /// But also https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo
         const IN_FOCUSRING_STATE = 1 << 39;
         /// Non-standard & undocumented.
         const IN_HANDLER_CLICK_TO_PLAY_STATE = 1 << 40;
@@ -133,10 +135,6 @@ bitflags! {
         const IN_AUTOFILL_STATE = 1 << 50;
         /// Non-standard & undocumented.
         const IN_AUTOFILL_PREVIEW_STATE = 1 << 51;
-        /// :focus-visible
-        ///
-        /// https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo
-        const IN_FOCUS_VISIBLE_STATE = 1 << 52;
         /// State that dialog element is modal, for centered alignment
         ///
         /// https://html.spec.whatwg.org/multipage/#centered-alignment
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 77ff53ed3a3..0b34cd8d966 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -43,7 +43,7 @@ macro_rules! apply_non_ts_list {
                 ("enabled", Enabled, IN_ENABLED_STATE, _),
                 ("focus", Focus, IN_FOCUS_STATE, _),
                 ("focus-within", FocusWithin, IN_FOCUS_WITHIN_STATE, _),
-                ("focus-visible", FocusVisible, IN_FOCUS_VISIBLE_STATE, _),
+                ("focus-visible", FocusVisible, IN_FOCUSRING_STATE, _),
                 ("hover", Hover, IN_HOVER_STATE, _),
                 ("-moz-drag-over", MozDragOver, IN_DRAGOVER_STATE, _),
                 ("target", Target, IN_TARGET_STATE, _),

From 1e815ab3c34e4cc5580f69e1db6df06d6e9a618c Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Mon, 16 Nov 2020 20:43:35 +0000
Subject: [PATCH 078/156] style: Replace obsolete -moz-mac-yosemite-theme media
 query with a new -moz-mac-big-sur-theme media query.

Differential Revision: https://phabricator.services.mozilla.com/D97089
---
 components/style/gecko/media_features.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 4fd6e622ac6..d8a7f67157e 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -816,7 +816,7 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
     system_metric_feature!(atom!("-moz-overlay-scrollbars")),
     system_metric_feature!(atom!("-moz-windows-default-theme")),
     system_metric_feature!(atom!("-moz-mac-graphite-theme")),
-    system_metric_feature!(atom!("-moz-mac-yosemite-theme")),
+    system_metric_feature!(atom!("-moz-mac-big-sur-theme")),
     system_metric_feature!(atom!("-moz-windows-accent-color-in-titlebar")),
     system_metric_feature!(atom!("-moz-windows-compositor")),
     system_metric_feature!(atom!("-moz-windows-classic")),

From 178e627500b8050b4ca574d4dd3d9233b142791d Mon Sep 17 00:00:00 2001
From: David Parks <daparks@mozilla.com>
Date: Wed, 18 Nov 2020 15:55:34 +0000
Subject: [PATCH 079/156] style: Replace plugin behavior with a basic fallback

The browser currently only enables plugin behavior for Flash and our internal test plugins.  This patch replaces support for those plugins with a simple fallback that shows a transparent region where the plugin would have been.  It removes the file system search(es) for the plugin dynamic libraries and short-circuits the logic to determine if plugins should do something special -- all implementations now behave the same in the presence of plugin elements.

The new behavior is:
1. If the <object> or <embed> element lists a type of something other than "x-shockwave-flash" or "x-test" then the behavior is unchanged.  This means that non-plugin types behave properly and unknown types (for example, typos) are also unaffected (they reduce to 0x0 elements).
2. If the <object> element has an HTML fallback in the DOM (see spec for <object> elements) then the fallback is always shown.
3. Otherwise, the element is shown as a transparent region with the size specified in attributes.

Differential Revision: https://phabricator.services.mozilla.com/D95902
---
 components/style/element_state.rs                  | 2 ++
 components/style/gecko/non_ts_pseudo_class_list.rs | 2 ++
 components/style/gecko/wrapper.rs                  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index 2e3ccb3b31b..5dc3cc0c25d 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -144,6 +144,8 @@ bitflags! {
         const IN_MOZINERT_STATE = 1 << 54;
         /// State for the topmost dialog element in top layer
         const IN_TOPMOST_MODAL_DIALOG_STATE = 1 << 55;
+        /// Non-standard & undocumented.
+        const IN_HANDLER_NOPLUGINS = 1 << 56;
     }
 }
 
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 0b34cd8d966..d1e49036d90 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -72,6 +72,8 @@ macro_rules! apply_non_ts_list {
                 ("-moz-handler-disabled", MozHandlerDisabled, IN_HANDLER_DISABLED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-handler-blocked", MozHandlerBlocked, IN_HANDLER_BLOCKED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-handler-crashed", MozHandlerCrashed, IN_HANDLER_CRASHED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+                ("-moz-handler-noplugins", MozHandlerNoPlugins, IN_HANDLER_NOPLUGINS, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+
                 ("-moz-math-increment-script-level", MozMathIncrementScriptLevel, IN_INCREMENT_SCRIPT_LEVEL_STATE, _),
 
                 ("required", Required, IN_REQUIRED_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 932685ea3c1..847b822b28d 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2046,6 +2046,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozHandlerClickToPlay |
             NonTSPseudoClass::MozHandlerVulnerableUpdatable |
             NonTSPseudoClass::MozHandlerVulnerableNoUpdate |
+            NonTSPseudoClass::MozHandlerNoPlugins |
             NonTSPseudoClass::MozMathIncrementScriptLevel |
             NonTSPseudoClass::InRange |
             NonTSPseudoClass::OutOfRange |

From 4ea378a6ae232af09135b2037c527466ef5454de Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Tue, 17 Nov 2020 01:20:33 +0000
Subject: [PATCH 080/156] style: Remove support for XUL grid display values.

Differential Revision: https://phabricator.services.mozilla.com/D53297
---
 components/style/values/specified/box.rs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index ed81eba40e6..77eada92ed4 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -110,12 +110,6 @@ pub enum DisplayInside {
     #[cfg(feature = "gecko")]
     MozBox,
     #[cfg(feature = "gecko")]
-    MozGrid,
-    #[cfg(feature = "gecko")]
-    MozGridGroup,
-    #[cfg(feature = "gecko")]
-    MozGridLine,
-    #[cfg(feature = "gecko")]
     MozStack,
     #[cfg(feature = "gecko")]
     MozDeck,
@@ -233,12 +227,6 @@ impl Display {
     #[cfg(feature = "gecko")]
     pub const MozInlineBox: Self = Self::new(DisplayOutside::Inline, DisplayInside::MozBox);
     #[cfg(feature = "gecko")]
-    pub const MozGrid: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGrid);
-    #[cfg(feature = "gecko")]
-    pub const MozGridGroup: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridGroup);
-    #[cfg(feature = "gecko")]
-    pub const MozGridLine: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridLine);
-    #[cfg(feature = "gecko")]
     pub const MozStack: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozStack);
     #[cfg(feature = "gecko")]
     pub const MozDeck: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozDeck);
@@ -615,12 +603,6 @@ impl Parse for Display {
             #[cfg(feature = "gecko")]
             "-moz-inline-box" if moz_box_display_values_enabled(context) => Display::MozInlineBox,
             #[cfg(feature = "gecko")]
-            "-moz-grid" if moz_display_values_enabled(context) => Display::MozGrid,
-            #[cfg(feature = "gecko")]
-            "-moz-grid-group" if moz_display_values_enabled(context) => Display::MozGridGroup,
-            #[cfg(feature = "gecko")]
-            "-moz-grid-line" if moz_display_values_enabled(context) => Display::MozGridLine,
-            #[cfg(feature = "gecko")]
             "-moz-stack" if moz_display_values_enabled(context) => Display::MozStack,
             #[cfg(feature = "gecko")]
             "-moz-deck" if moz_display_values_enabled(context) => Display::MozDeck,

From 9f40b9ba38a531088c2117b955f40af6ea0d09c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 22 Nov 2020 01:02:22 +0000
Subject: [PATCH 081/156] style: Avoid some allocations in selector
 serialization.

The allocations in display_to_css_identifier show up in the profiles of
bug 1675628.

Differential Revision: https://phabricator.services.mozilla.com/D97856
---
 components/style/dom.rs                       |  15 +--
 components/style/dom_apis.rs                  |   8 +-
 components/style/gecko/selector_parser.rs     |  20 ++--
 components/style/gecko/snapshot.rs            |  23 ++--
 components/style/gecko/snapshot_helpers.rs    |  24 ++--
 components/style/gecko/wrapper.rs             |  38 ++++---
 components/style/gecko_string_cache/mod.rs    |   6 -
 .../style/gecko_string_cache/namespace.rs     |  11 +-
 .../invalidation/element/element_wrapper.rs   |  19 ++--
 .../invalidation/element/invalidation_map.rs  |   2 +-
 .../element/state_and_attributes.rs           |   4 +-
 components/style/invalidation/stylesheets.rs  |   9 +-
 components/style/lib.rs                       |   4 +-
 components/style/macros.rs                    |   7 ++
 components/style/rule_collector.rs            |   9 +-
 components/style/sharing/mod.rs               |  22 ++--
 components/style/style_adjuster.rs            |   2 +-
 components/style/stylist.rs                   |   4 +-
 components/style/values/mod.rs                | 107 ++++++++++++++++++
 19 files changed, 220 insertions(+), 114 deletions(-)

diff --git a/components/style/dom.rs b/components/style/dom.rs
index 351f54af6e3..2edf5ae7dab 100644
--- a/components/style/dom.rs
+++ b/components/style/dom.rs
@@ -20,7 +20,8 @@ use crate::selector_parser::{AttrValue, Lang, PseudoElement, SelectorImpl};
 use crate::shared_lock::{Locked, SharedRwLock};
 use crate::stylist::CascadeData;
 use crate::traversal_flags::TraversalFlags;
-use crate::{Atom, LocalName, Namespace, WeakAtom};
+use crate::values::AtomIdent;
+use crate::{LocalName, Namespace, WeakAtom};
 use atomic_refcell::{AtomicRef, AtomicRefMut};
 use selectors::matching::{ElementSelectorFlags, QuirksMode, VisitedHandlingMode};
 use selectors::sink::Push;
@@ -121,7 +122,7 @@ pub trait TDocument: Sized + Copy + Clone {
     /// return an empty slice.
     fn elements_with_id<'a>(
         &self,
-        _id: &Atom,
+        _id: &AtomIdent,
     ) -> Result<&'a [<Self::ConcreteNode as TNode>::ConcreteElement], ()>
     where
         Self: 'a,
@@ -344,7 +345,7 @@ pub trait TShadowRoot: Sized + Copy + Clone + Debug + PartialEq {
     /// return an empty slice.
     fn elements_with_id<'a>(
         &self,
-        _id: &Atom,
+        _id: &AtomIdent,
     ) -> Result<&'a [<Self::ConcreteNode as TNode>::ConcreteElement], ()>
     where
         Self: 'a,
@@ -520,20 +521,20 @@ pub trait TElement:
     /// Internal iterator for the classes of this element.
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom);
+        F: FnMut(&AtomIdent);
 
     /// Internal iterator for the part names of this element.
     fn each_part<F>(&self, _callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
     }
 
     /// Internal iterator for the part names that this element exports for a
     /// given part name.
-    fn each_exported_part<F>(&self, _name: &Atom, _callback: F)
+    fn each_exported_part<F>(&self, _name: &AtomIdent, _callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
     }
 
diff --git a/components/style/dom_apis.rs b/components/style/dom_apis.rs
index f4e814acd11..a6c50805cbb 100644
--- a/components/style/dom_apis.rs
+++ b/components/style/dom_apis.rs
@@ -10,7 +10,7 @@ use crate::dom::{TDocument, TElement, TNode, TShadowRoot};
 use crate::invalidation::element::invalidation_map::Dependency;
 use crate::invalidation::element::invalidator::{DescendantInvalidationLists, Invalidation};
 use crate::invalidation::element::invalidator::{InvalidationProcessor, InvalidationVector};
-use crate::Atom;
+use crate::values::AtomIdent;
 use selectors::attr::CaseSensitivity;
 use selectors::matching::{self, MatchingContext, MatchingMode};
 use selectors::parser::{Combinator, Component, LocalName, SelectorImpl};
@@ -276,7 +276,7 @@ where
 /// or shadow root that `root` is connected to.
 fn fast_connected_elements_with_id<'a, N>(
     root: N,
-    id: &Atom,
+    id: &AtomIdent,
     quirks_mode: QuirksMode,
 ) -> Result<&'a [N::ConcreteElement], ()>
 where
@@ -305,7 +305,7 @@ where
 /// Collects elements with a given id under `root`, that pass `filter`.
 fn collect_elements_with_id<E, Q, F>(
     root: E::ConcreteNode,
-    id: &Atom,
+    id: &AtomIdent,
     results: &mut Q::Output,
     quirks_mode: QuirksMode,
     mut filter: F,
@@ -398,7 +398,7 @@ where
 }
 
 enum SimpleFilter<'a, Impl: SelectorImpl> {
-    Class(&'a Atom),
+    Class(&'a AtomIdent),
     LocalName(&'a LocalName<Impl>),
 }
 
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 6f8ac010e11..c63bc81c95b 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -11,7 +11,7 @@ use crate::invalidation::element::document_state::InvalidationMatchingData;
 use crate::selector_parser::{Direction, SelectorParser};
 use crate::str::starts_with_ignore_ascii_case;
 use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
-use crate::values::serialize_atom_identifier;
+use crate::values::{AtomIdent, AtomString};
 use cssparser::{BasicParseError, BasicParseErrorKind, Parser};
 use cssparser::{CowRcStr, SourceLocation, ToCss, Token};
 use selectors::parser::{SelectorParseErrorKind, ParseErrorRecovery};
@@ -39,7 +39,7 @@ bitflags! {
 }
 
 /// The type used to store the language argument to the `:lang` pseudo-class.
-pub type Lang = Atom;
+pub type Lang = AtomIdent;
 
 macro_rules! pseudo_class_name {
     ([$(($css:expr, $name:ident, $state:tt, $flags:tt),)*]) => {
@@ -77,7 +77,7 @@ impl ToCss for NonTSPseudoClass {
                     $(NonTSPseudoClass::$name => concat!(":", $css),)*
                     NonTSPseudoClass::Lang(ref s) => {
                         dest.write_str(":lang(")?;
-                        serialize_atom_identifier(s, dest)?;
+                        s.to_css(dest)?;
                         return dest.write_char(')');
                     },
                     NonTSPseudoClass::MozLocaleDir(ref dir) => {
@@ -270,12 +270,10 @@ pub struct SelectorImpl;
 
 impl ::selectors::SelectorImpl for SelectorImpl {
     type ExtraMatchingData = InvalidationMatchingData;
-    type AttrValue = Atom;
-    type Identifier = Atom;
-    type ClassName = Atom;
-    type PartName = Atom;
-    type LocalName = Atom;
-    type NamespacePrefix = Atom;
+    type AttrValue = AtomString;
+    type Identifier = AtomIdent;
+    type LocalName = AtomIdent;
+    type NamespacePrefix = AtomIdent;
     type NamespaceUrl = Namespace;
     type BorrowedNamespaceUrl = WeakNamespace;
     type BorrowedLocalName = WeakAtom;
@@ -386,7 +384,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         let pseudo_class = match_ignore_ascii_case! { &name,
             "lang" => {
                 let name = parser.expect_ident_or_string()?;
-                NonTSPseudoClass::Lang(Atom::from(name.as_ref()))
+                NonTSPseudoClass::Lang(Lang::from(name.as_ref()))
             },
             "-moz-locale-dir" => {
                 NonTSPseudoClass::MozLocaleDir(Direction::parse(parser)?)
@@ -475,7 +473,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
         self.namespaces.default.clone()
     }
 
-    fn namespace_for_prefix(&self, prefix: &Atom) -> Option<Namespace> {
+    fn namespace_for_prefix(&self, prefix: &AtomIdent) -> Option<Namespace> {
         self.namespaces.prefixes.get(prefix).cloned()
     }
 }
diff --git a/components/style/gecko/snapshot.rs b/components/style/gecko/snapshot.rs
index 26b3e1393dd..8ff794a4d8c 100644
--- a/components/style/gecko/snapshot.rs
+++ b/components/style/gecko/snapshot.rs
@@ -14,7 +14,10 @@ use crate::gecko_bindings::structs::ServoElementSnapshot;
 use crate::gecko_bindings::structs::ServoElementSnapshotFlags as Flags;
 use crate::gecko_bindings::structs::ServoElementSnapshotTable;
 use crate::invalidation::element::element_wrapper::ElementSnapshot;
+use crate::selector_parser::AttrValue;
 use crate::string_cache::{Atom, Namespace};
+use crate::values::{AtomIdent, AtomString};
+use crate::LocalName;
 use crate::WeakAtom;
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -74,10 +77,10 @@ impl GeckoElementSnapshot {
     #[inline]
     pub fn each_attr_changed<F>(&self, mut callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         for attr in self.mChangedAttrNames.iter() {
-            unsafe { Atom::with(attr.mRawPtr, &mut callback) }
+            unsafe { AtomIdent::with(attr.mRawPtr, &mut callback) }
         }
     }
 
@@ -85,8 +88,8 @@ impl GeckoElementSnapshot {
     pub fn attr_matches(
         &self,
         ns: &NamespaceConstraint<&Namespace>,
-        local_name: &Atom,
-        operation: &AttrSelectorOperation<&Atom>,
+        local_name: &LocalName,
+        operation: &AttrSelectorOperation<&AttrValue>,
     ) -> bool {
         unsafe {
             match *operation {
@@ -188,7 +191,7 @@ impl ElementSnapshot for GeckoElementSnapshot {
     }
 
     #[inline]
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         let attr = match snapshot_helpers::find_attr(&*self.mAttrs, &atom!("part")) {
             Some(attr) => attr,
             None => return false,
@@ -198,12 +201,12 @@ impl ElementSnapshot for GeckoElementSnapshot {
     }
 
     #[inline]
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         snapshot_helpers::imported_part(&*self.mAttrs, name)
     }
 
     #[inline]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         if !self.has_any(Flags::MaybeClass) {
             return false;
         }
@@ -214,7 +217,7 @@ impl ElementSnapshot for GeckoElementSnapshot {
     #[inline]
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         if !self.has_any(Flags::MaybeClass) {
             return;
@@ -224,12 +227,12 @@ impl ElementSnapshot for GeckoElementSnapshot {
     }
 
     #[inline]
-    fn lang_attr(&self) -> Option<Atom> {
+    fn lang_attr(&self) -> Option<AtomString> {
         let ptr = unsafe { bindings::Gecko_SnapshotLangValue(self) };
         if ptr.is_null() {
             None
         } else {
-            Some(unsafe { Atom::from_addrefed(ptr) })
+            Some(AtomString(unsafe { Atom::from_addrefed(ptr) }))
         }
     }
 }
diff --git a/components/style/gecko/snapshot_helpers.rs b/components/style/gecko/snapshot_helpers.rs
index bd905870353..ee8d7dfd704 100644
--- a/components/style/gecko/snapshot_helpers.rs
+++ b/components/style/gecko/snapshot_helpers.rs
@@ -6,7 +6,9 @@
 
 use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs::{self, nsAtom};
-use crate::string_cache::{Atom, WeakAtom};
+use crate::string_cache::WeakAtom;
+use crate::values::AtomIdent;
+use crate::Atom;
 use crate::CaseSensitivityExt;
 use selectors::attr::CaseSensitivity;
 
@@ -85,8 +87,8 @@ pub fn get_id(attrs: &[structs::AttrArray_InternalAttr]) -> Option<&WeakAtom> {
 #[inline(always)]
 pub(super) fn each_exported_part(
     attrs: &[structs::AttrArray_InternalAttr],
-    name: &Atom,
-    mut callback: impl FnMut(&Atom),
+    name: &AtomIdent,
+    mut callback: impl FnMut(&AtomIdent),
 ) {
     let attr = match find_attr(attrs, &atom!("exportparts")) {
         Some(attr) => attr,
@@ -100,7 +102,7 @@ pub(super) fn each_exported_part(
 
     unsafe {
         for atom in std::slice::from_raw_parts(atoms, length) {
-            Atom::with(*atom, &mut callback)
+            AtomIdent::with(*atom, &mut callback)
         }
     }
 }
@@ -108,21 +110,21 @@ pub(super) fn each_exported_part(
 #[inline(always)]
 pub(super) fn imported_part(
     attrs: &[structs::AttrArray_InternalAttr],
-    name: &Atom,
-) -> Option<Atom> {
+    name: &AtomIdent,
+) -> Option<AtomIdent> {
     let attr = find_attr(attrs, &atom!("exportparts"))?;
     let atom = unsafe { bindings::Gecko_Element_ImportedPart(attr, name.as_ptr()) };
     if atom.is_null() {
         return None;
     }
-    Some(unsafe { Atom::from_raw(atom) })
+    Some(AtomIdent(unsafe { Atom::from_raw(atom) }))
 }
 
 /// Given a class or part name, a case sensitivity, and an array of attributes,
 /// returns whether the attribute has that name.
 #[inline(always)]
 pub fn has_class_or_part(
-    name: &Atom,
+    name: &AtomIdent,
     case_sensitivity: CaseSensitivity,
     attr: &structs::nsAttrValue,
 ) -> bool {
@@ -147,15 +149,15 @@ pub fn has_class_or_part(
 #[inline(always)]
 pub fn each_class_or_part<F>(attr: &structs::nsAttrValue, mut callback: F)
 where
-    F: FnMut(&Atom),
+    F: FnMut(&AtomIdent),
 {
     unsafe {
         match get_class_or_part_from_attr(attr) {
             Class::None => {},
-            Class::One(atom) => Atom::with(atom, callback),
+            Class::One(atom) => AtomIdent::with(atom, callback),
             Class::More(atoms) => {
                 for atom in atoms {
-                    Atom::with(atom.mRawPtr, &mut callback)
+                    AtomIdent::with(atom.mRawPtr, &mut callback)
                 }
             },
         }
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 847b822b28d..4773bd89997 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -70,7 +70,9 @@ use crate::stylist::CascadeData;
 use crate::values::computed::font::GenericFontFamily;
 use crate::values::computed::Length;
 use crate::values::specified::length::FontBaseSize;
+use crate::values::{AtomIdent, AtomString};
 use crate::CaseSensitivityExt;
+use crate::LocalName;
 use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -130,7 +132,7 @@ impl<'ld> TDocument for GeckoDocument<'ld> {
     }
 
     #[inline]
-    fn elements_with_id<'a>(&self, id: &Atom) -> Result<&'a [GeckoElement<'ld>], ()>
+    fn elements_with_id<'a>(&self, id: &AtomIdent) -> Result<&'a [GeckoElement<'ld>], ()>
     where
         Self: 'a,
     {
@@ -186,7 +188,7 @@ impl<'lr> TShadowRoot for GeckoShadowRoot<'lr> {
     }
 
     #[inline]
-    fn elements_with_id<'a>(&self, id: &Atom) -> Result<&'a [GeckoElement<'lr>], ()>
+    fn elements_with_id<'a>(&self, id: &AtomIdent) -> Result<&'a [GeckoElement<'lr>], ()>
     where
         Self: 'a,
     {
@@ -801,7 +803,7 @@ impl<'le> GeckoElement<'le> {
             return false;
         }
         let host = self.containing_shadow_host().unwrap();
-        host.is_svg_element() && host.local_name() == &*local_name!("use")
+        host.is_svg_element() && host.local_name() == &**local_name!("use")
     }
 
     fn css_transitions_info(&self) -> FxHashMap<LonghandId, Arc<AnimationValue>> {
@@ -1270,7 +1272,7 @@ impl<'le> TElement for GeckoElement<'le> {
     }
 
     #[inline]
-    fn has_attr(&self, namespace: &Namespace, attr: &Atom) -> bool {
+    fn has_attr(&self, namespace: &Namespace, attr: &AtomIdent) -> bool {
         unsafe { bindings::Gecko_HasAttr(self.0, namespace.0.as_ptr(), attr.as_ptr()) }
     }
 
@@ -1297,7 +1299,7 @@ impl<'le> TElement for GeckoElement<'le> {
 
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         let attr = match self.get_class_attr() {
             Some(c) => c,
@@ -1308,16 +1310,16 @@ impl<'le> TElement for GeckoElement<'le> {
     }
 
     #[inline]
-    fn each_exported_part<F>(&self, name: &Atom, callback: F)
+    fn each_exported_part<F>(&self, name: &AtomIdent, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         snapshot_helpers::each_exported_part(self.attrs(), name, callback)
     }
 
     fn each_part<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         let attr = match self.get_part_attr() {
             Some(c) => c,
@@ -1615,7 +1617,7 @@ impl<'le> TElement for GeckoElement<'le> {
         if ptr.is_null() {
             None
         } else {
-            Some(unsafe { Atom::from_addrefed(ptr) })
+            Some(AtomString(unsafe { Atom::from_addrefed(ptr) }))
         }
     }
 
@@ -1623,8 +1625,8 @@ impl<'le> TElement for GeckoElement<'le> {
         // Gecko supports :lang() from CSS Selectors 3, which only accepts a
         // single language tag, and which performs simple dash-prefix matching
         // on it.
-        let override_lang_ptr = match &override_lang {
-            &Some(Some(ref atom)) => atom.as_ptr(),
+        let override_lang_ptr = match override_lang {
+            Some(Some(ref atom)) => atom.as_ptr(),
             _ => ptr::null_mut(),
         };
         unsafe {
@@ -1638,7 +1640,7 @@ impl<'le> TElement for GeckoElement<'le> {
     }
 
     fn is_html_document_body_element(&self) -> bool {
-        if self.local_name() != &*local_name!("body") {
+        if self.local_name() != &**local_name!("body") {
             return false;
         }
 
@@ -1895,8 +1897,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
     fn attr_matches(
         &self,
         ns: &NamespaceConstraint<&Namespace>,
-        local_name: &Atom,
-        operation: &AttrSelectorOperation<&Atom>,
+        local_name: &LocalName,
+        operation: &AttrSelectorOperation<&AttrValue>,
     ) -> bool {
         unsafe {
             match *operation {
@@ -2180,7 +2182,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
     }
 
     #[inline]
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         if !self.has_id() {
             return false;
         }
@@ -2194,7 +2196,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
     }
 
     #[inline]
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         let attr = match self.get_part_attr() {
             Some(c) => c,
             None => return false,
@@ -2204,12 +2206,12 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
     }
 
     #[inline]
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         snapshot_helpers::imported_part(self.attrs(), name)
     }
 
     #[inline(always)]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         let attr = match self.get_class_attr() {
             Some(c) => c,
             None => return false,
diff --git a/components/style/gecko_string_cache/mod.rs b/components/style/gecko_string_cache/mod.rs
index e9208a5e32e..a6cf017877d 100644
--- a/components/style/gecko_string_cache/mod.rs
+++ b/components/style/gecko_string_cache/mod.rs
@@ -42,12 +42,6 @@ pub mod namespace;
 
 pub use self::namespace::{Namespace, WeakNamespace};
 
-macro_rules! local_name {
-    ($s:tt) => {
-        atom!($s)
-    };
-}
-
 /// A handle to a Gecko atom. This is a type that can represent either:
 ///
 ///  * A strong reference to a dynamic atom (an `nsAtom` pointer), in which case
diff --git a/components/style/gecko_string_cache/namespace.rs b/components/style/gecko_string_cache/namespace.rs
index 72de229f1d7..1acf04c93ff 100644
--- a/components/style/gecko_string_cache/namespace.rs
+++ b/components/style/gecko_string_cache/namespace.rs
@@ -47,18 +47,9 @@ impl PrecomputedHash for Namespace {
 }
 
 /// A Gecko WeakNamespace is a wrapped WeakAtom.
-#[derive(Hash)]
+#[derive(Hash, Deref)]
 pub struct WeakNamespace(WeakAtom);
 
-impl Deref for WeakNamespace {
-    type Target = WeakAtom;
-
-    #[inline]
-    fn deref(&self) -> &WeakAtom {
-        &self.0
-    }
-}
-
 impl Deref for Namespace {
     type Target = WeakNamespace;
 
diff --git a/components/style/invalidation/element/element_wrapper.rs b/components/style/invalidation/element/element_wrapper.rs
index 2b6f934c8b7..953c07f46c7 100644
--- a/components/style/invalidation/element/element_wrapper.rs
+++ b/components/style/invalidation/element/element_wrapper.rs
@@ -9,7 +9,8 @@ use crate::dom::TElement;
 use crate::element_state::ElementState;
 use crate::selector_parser::{AttrValue, NonTSPseudoClass, PseudoElement, SelectorImpl};
 use crate::selector_parser::{Snapshot, SnapshotMap};
-use crate::{Atom, CaseSensitivityExt, LocalName, Namespace, WeakAtom};
+use crate::values::AtomIdent;
+use crate::{CaseSensitivityExt, LocalName, Namespace, WeakAtom};
 use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint};
 use selectors::matching::{ElementSelectorFlags, MatchingContext};
 use selectors::{Element, OpaqueElement};
@@ -56,20 +57,20 @@ pub trait ElementSnapshot: Sized {
 
     /// Whether this snapshot contains the class `name`. Should only be called
     /// if `has_attrs()` returns true.
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool;
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool;
 
     /// Whether this snapshot represents the part named `name`. Should only be
     /// called if `has_attrs()` returns true.
-    fn is_part(&self, name: &Atom) -> bool;
+    fn is_part(&self, name: &AtomIdent) -> bool;
 
     /// See Element::imported_part.
-    fn imported_part(&self, name: &Atom) -> Option<Atom>;
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent>;
 
     /// A callback that should be called for each class of the snapshot. Should
     /// only be called if `has_attrs()` returns true.
     fn each_class<F>(&self, _: F)
     where
-        F: FnMut(&Atom);
+        F: FnMut(&AtomIdent);
 
     /// The `xml:lang=""` or `lang=""` attribute value per this snapshot.
     fn lang_attr(&self) -> Option<AttrValue>;
@@ -361,7 +362,7 @@ where
         }
     }
 
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot
                 .id_attr()
@@ -370,21 +371,21 @@ where
         }
     }
 
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.is_part(name),
             _ => self.element.is_part(name),
         }
     }
 
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.imported_part(name),
             _ => self.element.imported_part(name),
         }
     }
 
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.has_class(name, case_sensitivity),
             _ => self.element.has_class(name, case_sensitivity),
diff --git a/components/style/invalidation/element/invalidation_map.rs b/components/style/invalidation/element/invalidation_map.rs
index ea08bb4f4fb..29e0962a897 100644
--- a/components/style/invalidation/element/invalidation_map.rs
+++ b/components/style/invalidation/element/invalidation_map.rs
@@ -478,7 +478,7 @@ impl<'a> SelectorVisitor for SelectorDependencyCollector<'a> {
                     Component::Class(..) => &mut self.map.class_to_selector,
                     _ => unreachable!(),
                 };
-                let entry = match map.try_entry(atom.clone(), self.quirks_mode) {
+                let entry = match map.try_entry(atom.0.clone(), self.quirks_mode) {
                     Ok(entry) => entry,
                     Err(err) => {
                         *self.alloc_error = Some(err);
diff --git a/components/style/invalidation/element/state_and_attributes.rs b/components/style/invalidation/element/state_and_attributes.rs
index 79f1b53ada7..128feae76be 100644
--- a/components/style/invalidation/element/state_and_attributes.rs
+++ b/components/style/invalidation/element/state_and_attributes.rs
@@ -216,13 +216,13 @@ where
             // TODO(emilio): Do this more efficiently!
             snapshot.each_class(|c| {
                 if !element.has_class(c, CaseSensitivity::CaseSensitive) {
-                    classes_removed.push(c.clone())
+                    classes_removed.push(c.0.clone())
                 }
             });
 
             element.each_class(|c| {
                 if !snapshot.has_class(c, CaseSensitivity::CaseSensitive) {
-                    classes_added.push(c.clone())
+                    classes_added.push(c.0.clone())
                 }
             })
         }
diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index 8ac2b57b34e..9854387ccad 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -17,6 +17,7 @@ use crate::selector_parser::{SelectorImpl, Snapshot, SnapshotMap};
 use crate::shared_lock::SharedRwLockReadGuard;
 use crate::stylesheets::{CssRule, StylesheetInDocument};
 use crate::stylesheets::{EffectiveRules, EffectiveRulesIterator};
+use crate::values::AtomIdent;
 use crate::Atom;
 use crate::LocalName as SelectorLocalName;
 use selectors::parser::{Component, LocalName, Selector};
@@ -43,9 +44,9 @@ pub enum RuleChangeKind {
 #[derive(Debug, Eq, Hash, MallocSizeOf, PartialEq)]
 enum Invalidation {
     /// An element with a given id.
-    ID(Atom),
+    ID(AtomIdent),
     /// An element with a given class name.
-    Class(Atom),
+    Class(AtomIdent),
     /// An element with a given local name.
     LocalName {
         name: SelectorLocalName,
@@ -468,14 +469,14 @@ impl StylesheetInvalidationSet {
     ) -> bool {
         match invalidation {
             Invalidation::Class(c) => {
-                let entry = match self.classes.try_entry(c, quirks_mode) {
+                let entry = match self.classes.try_entry(c.0, quirks_mode) {
                     Ok(e) => e,
                     Err(..) => return false,
                 };
                 *entry.or_insert(InvalidationKind::None) |= kind;
             },
             Invalidation::ID(i) => {
-                let entry = match self.ids.try_entry(i, quirks_mode) {
+                let entry = match self.ids.try_entry(i.0, quirks_mode) {
                     Ok(e) => e,
                     Err(..) => return false,
                 };
diff --git a/components/style/lib.rs b/components/style/lib.rs
index 8b8af1073ae..f1d36b2722c 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -131,10 +131,10 @@ pub use crate::gecko_string_cache as string_cache;
 pub use crate::gecko_string_cache::Atom;
 /// The namespace prefix type for Gecko, which is just an atom.
 #[cfg(feature = "gecko")]
-pub type Prefix = crate::gecko_string_cache::Atom;
+pub type Prefix = crate::values::AtomIdent;
 /// The local name of an element for Gecko, which is just an atom.
 #[cfg(feature = "gecko")]
-pub type LocalName = crate::gecko_string_cache::Atom;
+pub type LocalName = crate::values::AtomIdent;
 #[cfg(feature = "gecko")]
 pub use crate::gecko_string_cache::Namespace;
 
diff --git a/components/style/macros.rs b/components/style/macros.rs
index b4f4f1f7caf..e60be8efc5f 100644
--- a/components/style/macros.rs
+++ b/components/style/macros.rs
@@ -133,3 +133,10 @@ macro_rules! profiler_label {
 macro_rules! profiler_label {
     ($label_type:ident) => {};
 }
+
+#[cfg(feature = "gecko")]
+macro_rules! local_name {
+    ($s:tt) => {
+        $crate::values::AtomIdent(atom!($s))
+    };
+}
diff --git a/components/style/rule_collector.rs b/components/style/rule_collector.rs
index 884abc07c63..86293e5c785 100644
--- a/components/style/rule_collector.rs
+++ b/components/style/rule_collector.rs
@@ -13,7 +13,6 @@ use crate::selector_parser::PseudoElement;
 use crate::shared_lock::Locked;
 use crate::stylesheets::Origin;
 use crate::stylist::{AuthorStylesEnabled, Rule, RuleInclusion, Stylist};
-use crate::Atom;
 use selectors::matching::{ElementSelectorFlags, MatchingContext, MatchingMode};
 use servo_arc::ArcBorrow;
 use smallvec::SmallVec;
@@ -43,7 +42,7 @@ pub fn containing_shadow_ignoring_svg_use<E: TElement>(
     loop {
         let host = shadow.host();
         let host_is_svg_use_element =
-            host.is_svg_element() && host.local_name() == &*local_name!("use");
+            host.is_svg_element() && host.local_name() == &**local_name!("use");
         if !host_is_svg_use_element {
             return Some(shadow);
         }
@@ -319,7 +318,7 @@ where
             };
 
             hash_target.each_part(|part| {
-                if let Some(part_rules) = part_rules.get(part) {
+                if let Some(part_rules) = part_rules.get(&part.0) {
                     collector.collect_rules_in_list(part_rules, cascade_level);
                 }
             });
@@ -377,7 +376,7 @@ where
 
         let mut shadow_cascade_order = ShadowCascadeOrder::for_innermost_containing_tree();
 
-        let mut parts = SmallVec::<[Atom; 3]>::new();
+        let mut parts = SmallVec::<[_; 3]>::new();
         self.rule_hash_target.each_part(|p| parts.push(p.clone()));
 
         loop {
@@ -405,7 +404,7 @@ where
                 };
                 self.in_tree(containing_host, |collector| {
                     for p in &parts {
-                        if let Some(part_rules) = part_rules.get(p) {
+                        if let Some(part_rules) = part_rules.get(&p.0) {
                             collector.collect_rules_in_list(part_rules, cascade_level);
                         }
                     }
diff --git a/components/style/sharing/mod.rs b/components/style/sharing/mod.rs
index fab21901bd9..9adb7afb8cd 100644
--- a/components/style/sharing/mod.rs
+++ b/components/style/sharing/mod.rs
@@ -73,7 +73,7 @@ use crate::properties::ComputedValues;
 use crate::rule_tree::StrongRuleNode;
 use crate::style_resolver::{PrimaryStyle, ResolvedElementStyles};
 use crate::stylist::Stylist;
-use crate::Atom;
+use crate::values::AtomIdent;
 use atomic_refcell::{AtomicRefCell, AtomicRefMut};
 use owning_ref::OwningHandle;
 use selectors::matching::{ElementSelectorFlags, VisitedHandlingMode};
@@ -126,13 +126,13 @@ pub struct ValidationData {
     ///
     /// TODO(emilio): Maybe check whether rules for these classes apply to the
     /// element?
-    class_list: Option<SmallVec<[Atom; 5]>>,
+    class_list: Option<SmallVec<[AtomIdent; 5]>>,
 
     /// The part list of this element.
     ///
     /// TODO(emilio): Maybe check whether rules with these part names apply to
     /// the element?
-    part_list: Option<SmallVec<[Atom; 5]>>,
+    part_list: Option<SmallVec<[AtomIdent; 5]>>,
 
     /// The list of presentational attributes of the element.
     pres_hints: Option<SmallVec<[ApplicableDeclarationBlock; 5]>>,
@@ -168,7 +168,7 @@ impl ValidationData {
     }
 
     /// Get or compute the part-list associated with this element.
-    pub fn part_list<E>(&mut self, element: E) -> &[Atom]
+    pub fn part_list<E>(&mut self, element: E) -> &[AtomIdent]
     where
         E: TElement,
     {
@@ -176,7 +176,7 @@ impl ValidationData {
             return &[];
         }
         self.part_list.get_or_insert_with(|| {
-            let mut list = SmallVec::<[Atom; 5]>::new();
+            let mut list = SmallVec::<[_; 5]>::new();
             element.each_part(|p| list.push(p.clone()));
             // See below for the reasoning.
             if !list.spilled() {
@@ -187,12 +187,12 @@ impl ValidationData {
     }
 
     /// Get or compute the class-list associated with this element.
-    pub fn class_list<E>(&mut self, element: E) -> &[Atom]
+    pub fn class_list<E>(&mut self, element: E) -> &[AtomIdent]
     where
         E: TElement,
     {
         self.class_list.get_or_insert_with(|| {
-            let mut list = SmallVec::<[Atom; 5]>::new();
+            let mut list = SmallVec::<[_; 5]>::new();
             element.each_class(|c| list.push(c.clone()));
             // Assuming there are a reasonable number of classes (we use the
             // inline capacity as "reasonable number"), sort them to so that
@@ -294,12 +294,12 @@ impl<E: TElement> Deref for StyleSharingCandidate<E> {
 
 impl<E: TElement> StyleSharingCandidate<E> {
     /// Get the classlist of this candidate.
-    fn class_list(&mut self) -> &[Atom] {
+    fn class_list(&mut self) -> &[AtomIdent] {
         self.validation_data.class_list(self.element)
     }
 
     /// Get the part list of this candidate.
-    fn part_list(&mut self) -> &[Atom] {
+    fn part_list(&mut self) -> &[AtomIdent] {
         self.validation_data.part_list(self.element)
     }
 
@@ -361,11 +361,11 @@ impl<E: TElement> StyleSharingTarget<E> {
         }
     }
 
-    fn class_list(&mut self) -> &[Atom] {
+    fn class_list(&mut self) -> &[AtomIdent] {
         self.validation_data.class_list(self.element)
     }
 
-    fn part_list(&mut self) -> &[Atom] {
+    fn part_list(&mut self) -> &[AtomIdent] {
         self.validation_data.part_list(self.element)
     }
 
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index db950397c37..cc0c4a21d72 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -806,7 +806,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
                 return;
             }
             let is_html_select_element = element.map_or(false, |e| {
-                e.is_html_element() && e.local_name() == &*local_name!("select")
+                e.is_html_element() && e.local_name() == &*atom!("select")
             });
             if !is_html_select_element {
                 return;
diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index 8cf9efb3927..418a86bc5e0 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -1651,7 +1651,7 @@ impl<'a> SelectorVisitor for StylistSelectorVisitor<'a> {
                 //
                 // NOTE(emilio): See the comment regarding on when this may
                 // break in visit_complex_selector.
-                self.mapped_ids.insert(id.clone());
+                self.mapped_ids.insert(id.0.clone());
             },
             _ => {},
         }
@@ -2078,7 +2078,7 @@ impl CascadeData {
                             self.part_rules
                                 .get_or_insert_with(|| Box::new(Default::default()))
                                 .for_insertion(pseudo_element)
-                                .try_entry(parts.last().unwrap().clone())?
+                                .try_entry(parts.last().unwrap().clone().0)?
                                 .or_insert_with(SmallVec::new)
                                 .try_push(rule)?;
                         } else {
diff --git a/components/style/values/mod.rs b/components/style/values/mod.rs
index 36ea909ab87..6c088535d7f 100644
--- a/components/style/values/mod.rs
+++ b/components/style/values/mod.rs
@@ -13,6 +13,7 @@ use crate::values::distance::{ComputeSquaredDistance, SquaredDistance};
 use crate::Atom;
 pub use cssparser::{serialize_identifier, serialize_name, CowRcStr, Parser};
 pub use cssparser::{SourceLocation, Token, RGBA};
+use precomputed_hash::PrecomputedHash;
 use selectors::parser::SelectorParseErrorKind;
 use std::fmt::{self, Debug, Write};
 use std::hash;
@@ -84,6 +85,112 @@ where
     serialize_name(&ident, dest)
 }
 
+/// A CSS string stored as an `Atom`.
+#[repr(transparent)]
+#[derive(
+    Clone,
+    Debug,
+    Default,
+    Deref,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+pub struct AtomString(pub Atom);
+
+impl cssparser::ToCss for AtomString {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: Write,
+    {
+        self.0
+            .with_str(|s| cssparser::CssStringWriter::new(dest).write_str(s))
+    }
+}
+
+impl PrecomputedHash for AtomString {
+    #[inline]
+    fn precomputed_hash(&self) -> u32 {
+        self.0.precomputed_hash()
+    }
+}
+
+impl<'a> From<&'a str> for AtomString {
+    #[inline]
+    fn from(string: &str) -> Self {
+        Self(Atom::from(string))
+    }
+}
+
+/// A CSS `<ident>` stored as an `Atom`.
+#[repr(transparent)]
+#[derive(
+    Clone,
+    Debug,
+    Default,
+    Deref,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+pub struct AtomIdent(pub Atom);
+
+impl cssparser::ToCss for AtomIdent {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: Write,
+    {
+        serialize_atom_identifier(&self.0, dest)
+    }
+}
+
+impl PrecomputedHash for AtomIdent {
+    #[inline]
+    fn precomputed_hash(&self) -> u32 {
+        self.0.precomputed_hash()
+    }
+}
+
+impl<'a> From<&'a str> for AtomIdent {
+    #[inline]
+    fn from(string: &str) -> Self {
+        Self(Atom::from(string))
+    }
+}
+
+impl AtomIdent {
+    /// Like `Atom::with` but for `AtomIdent`.
+    #[cfg(feature = "gecko")]
+    pub unsafe fn with<F, R>(ptr: *const crate::gecko_bindings::structs::nsAtom, callback: F) -> R
+    where
+        F: FnOnce(&Self) -> R,
+    {
+        Atom::with(ptr, |atom: &Atom| {
+            // safety: repr(transparent)
+            let atom = atom as *const Atom as *const AtomIdent;
+            callback(&*atom)
+        })
+    }
+}
+
+#[cfg(feature = "gecko")]
+impl std::borrow::Borrow<crate::gecko_string_cache::WeakAtom> for AtomIdent {
+    #[inline]
+    fn borrow(&self) -> &crate::gecko_string_cache::WeakAtom {
+        self.0.borrow()
+    }
+}
+
 /// Serialize a normalized value into percentage.
 pub fn serialize_percentage<W>(value: CSSFloat, dest: &mut CssWriter<W>) -> fmt::Result
 where

From 85b45cd615b650bfc1d74fd4f764dc09bb48f7ae Mon Sep 17 00:00:00 2001
From: Sunita Sen <sunitacool41@gmail.com>
Date: Mon, 23 Nov 2020 01:40:21 +0000
Subject: [PATCH 082/156] style: Add support for touch-action:pinch-zoom -
 Rewrite to_css and parse for touchAction

Differential Revision: https://phabricator.services.mozilla.com/D97650
---
 components/style/values/specified/box.rs | 81 ++++++++++++++++--------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 77eada92ed4..dddce05bc49 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1199,43 +1199,68 @@ impl ToCss for TouchAction {
     where
         W: Write,
     {
-        match *self {
-            TouchAction::NONE => dest.write_str("none"),
-            TouchAction::AUTO => dest.write_str("auto"),
-            TouchAction::MANIPULATION => dest.write_str("manipulation"),
-            _ if self.contains(TouchAction::PAN_X | TouchAction::PAN_Y) => {
-                dest.write_str("pan-x pan-y")
-            },
-            _ if self.contains(TouchAction::PAN_X) => dest.write_str("pan-x"),
-            _ if self.contains(TouchAction::PAN_Y) => dest.write_str("pan-y"),
-            _ => panic!("invalid touch-action value"),
+        if self.contains(TouchAction::AUTO) {
+            return dest.write_str("auto");
         }
+        if self.contains(TouchAction::NONE) {
+            return dest.write_str("none");
+        }
+        if self.contains(TouchAction::MANIPULATION) {
+            return dest.write_str("manipulation");
+        }
+
+        let mut has_any = false;
+        macro_rules! maybe_write_value {
+            ($ident:path => $str:expr) => {
+                if self.contains($ident) {
+                    if has_any {
+                        dest.write_str(" ")?;
+                    }
+                    has_any = true;
+                    dest.write_str($str)?;
+                }
+            };
+        }
+        maybe_write_value!(TouchAction::PAN_X => "pan-x");
+        maybe_write_value!(TouchAction::PAN_Y => "pan-y");
+
+        debug_assert!(has_any);
+        Ok(())
     }
 }
 
 impl Parse for TouchAction {
+    /// auto | none | [ pan-x || pan-y ] | manipulation
     fn parse<'i, 't>(
         _context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<TouchAction, ParseError<'i>> {
-        try_match_ident_ignore_ascii_case! { input,
-            "auto" => Ok(TouchAction::AUTO),
-            "none" => Ok(TouchAction::NONE),
-            "manipulation" => Ok(TouchAction::MANIPULATION),
-            "pan-x" => {
-                if input.try_parse(|i| i.expect_ident_matching("pan-y")).is_ok() {
-                    Ok(TouchAction::PAN_X | TouchAction::PAN_Y)
-                } else {
-                    Ok(TouchAction::PAN_X)
-                }
-            },
-            "pan-y" => {
-                if input.try_parse(|i| i.expect_ident_matching("pan-x")).is_ok() {
-                    Ok(TouchAction::PAN_X | TouchAction::PAN_Y)
-                } else {
-                    Ok(TouchAction::PAN_Y)
-                }
-            },
+        let mut result = TouchAction::empty();
+        while let Ok(name) = input.try_parse(|i| i.expect_ident_cloned()) {
+            let flag = match_ignore_ascii_case! { &name,
+                "pan-x" => Some(TouchAction::PAN_X),
+                "pan-y" => Some(TouchAction::PAN_Y),
+                "none" if result.is_empty() => return Ok(TouchAction::NONE),
+                "manipulation" if result.is_empty() => return Ok(TouchAction::MANIPULATION),
+                "auto" if result.is_empty() => return Ok(TouchAction::AUTO),
+                _ => None
+            };
+
+            let flag = match flag {
+                Some(flag) if !result.contains(flag) => flag,
+                _ => {
+                    return Err(
+                        input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name))
+                    );
+                },
+            };
+            result.insert(flag);
+        }
+
+        if !result.is_empty() {
+            Ok(result)
+        } else {
+            Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
         }
     }
 }

From 9f20a24e4cac49dc3f5346bb065b43fa6ea9a513 Mon Sep 17 00:00:00 2001
From: Sunita Sen <sunitacool41@gmail.com>
Date: Tue, 24 Nov 2020 13:33:51 +0000
Subject: [PATCH 083/156] style: Add support for touch-action:pinch-zoom - Add
 pinch-zoom support to touchAction.

Differential Revision: https://phabricator.services.mozilla.com/D97815
---
 components/style/values/specified/box.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index dddce05bc49..1e135b4757e 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1170,7 +1170,7 @@ bitflags! {
     /// Values for the `touch-action` property.
     #[derive(MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem)]
     /// These constants match Gecko's `NS_STYLE_TOUCH_ACTION_*` constants.
-    #[value_info(other_values = "auto,none,manipulation,pan-x,pan-y")]
+    #[value_info(other_values = "auto,none,manipulation,pan-x,pan-y,pinch-zoom")]
     #[repr(C)]
     pub struct TouchAction: u8 {
         /// `none` variant
@@ -1183,6 +1183,8 @@ bitflags! {
         const PAN_Y = 1 << 3;
         /// `manipulation` variant
         const MANIPULATION = 1 << 4;
+        /// `pinch-zoom` variant
+        const PINCH_ZOOM = 1 << 5;
     }
 }
 
@@ -1223,6 +1225,7 @@ impl ToCss for TouchAction {
         }
         maybe_write_value!(TouchAction::PAN_X => "pan-x");
         maybe_write_value!(TouchAction::PAN_Y => "pan-y");
+        maybe_write_value!(TouchAction::PINCH_ZOOM => "pinch-zoom");
 
         debug_assert!(has_any);
         Ok(())
@@ -1230,7 +1233,7 @@ impl ToCss for TouchAction {
 }
 
 impl Parse for TouchAction {
-    /// auto | none | [ pan-x || pan-y ] | manipulation
+    /// auto | none | [ pan-x || pan-y || pinch-zoom ] | manipulation
     fn parse<'i, 't>(
         _context: &ParserContext,
         input: &mut Parser<'i, 't>,
@@ -1240,6 +1243,7 @@ impl Parse for TouchAction {
             let flag = match_ignore_ascii_case! { &name,
                 "pan-x" => Some(TouchAction::PAN_X),
                 "pan-y" => Some(TouchAction::PAN_Y),
+                "pinch-zoom" => Some(TouchAction::PINCH_ZOOM),
                 "none" if result.is_empty() => return Ok(TouchAction::NONE),
                 "manipulation" if result.is_empty() => return Ok(TouchAction::MANIPULATION),
                 "auto" if result.is_empty() => return Ok(TouchAction::AUTO),

From 55e9d8c2141f190bb094b9b48d6835103d083545 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Mon, 30 Nov 2020 12:45:14 +0000
Subject: [PATCH 084/156] style: Remove layout.css.conic-gradient.enabled
 preference.

Differential Revision: https://phabricator.services.mozilla.com/D98126
---
 components/style/values/specified/image.rs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 684fa3e2bab..86b01cb5a31 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -63,16 +63,6 @@ pub type PercentOrNone = generic::PercentOrNone<Percentage>;
 
 type LengthPercentageItemList = crate::OwnedSlice<generic::GradientItem<Color, LengthPercentage>>;
 
-#[cfg(feature = "gecko")]
-fn conic_gradients_enabled() -> bool {
-    static_prefs::pref!("layout.css.conic-gradient.enabled")
-}
-
-#[cfg(feature = "servo")]
-fn conic_gradients_enabled() -> bool {
-    false
-}
-
 #[cfg(feature = "gecko")]
 fn cross_fade_enabled() -> bool {
     static_prefs::pref!("layout.css.cross-fade.enabled")
@@ -102,11 +92,9 @@ impl SpecifiedValueInfo for Gradient {
             "-webkit-repeating-radial-gradient",
             "-moz-repeating-radial-gradient",
             "-webkit-gradient",
+            "conic-gradient",
+            "repeating-conic-gradient",
         ]);
-
-        if conic_gradients_enabled() {
-            f(&["conic-gradient", "repeating-conic-gradient"]);
-        }
     }
 }
 
@@ -339,10 +327,10 @@ impl Parse for Gradient {
             "-moz-repeating-radial-gradient" => {
                 (Shape::Radial, true, GradientCompatMode::Moz)
             },
-            "conic-gradient" if conic_gradients_enabled() => {
+            "conic-gradient" => {
                 (Shape::Conic, false, GradientCompatMode::Modern)
             },
-            "repeating-conic-gradient" if conic_gradients_enabled() => {
+            "repeating-conic-gradient" => {
                 (Shape::Conic, true, GradientCompatMode::Modern)
             },
             "-webkit-gradient" => {

From eb257a4dc3458483614423d65b1c28ce43c0b56a Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Tue, 1 Dec 2020 00:03:28 +0000
Subject: [PATCH 085/156] style: Separate out some of the declaration
 precedence components from @viewport rules

Differential Revision: https://phabricator.services.mozilla.com/D97817
---
 .../style/stylesheets/cascading_at_rule.rs    | 70 +++++++++++++++++++
 components/style/stylesheets/mod.rs           |  1 +
 components/style/stylesheets/viewport_rule.rs | 59 +---------------
 3 files changed, 73 insertions(+), 57 deletions(-)
 create mode 100644 components/style/stylesheets/cascading_at_rule.rs

diff --git a/components/style/stylesheets/cascading_at_rule.rs b/components/style/stylesheets/cascading_at_rule.rs
new file mode 100644
index 00000000000..b23b0720fed
--- /dev/null
+++ b/components/style/stylesheets/cascading_at_rule.rs
@@ -0,0 +1,70 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Cascading at-rule types and traits
+
+use crate::stylesheets::Origin;
+use std::fmt::{self, Write};
+use style_traits::{CssWriter, ToCss};
+
+/// Computes the cascade precedence as according to
+/// <http://dev.w3.org/csswg/css-cascade/#cascade-origin>
+#[inline]
+fn cascade_precendence(origin: Origin, important: bool) -> u8 {
+    match (origin, important) {
+        (Origin::UserAgent, true) => 1,
+        (Origin::User, true) => 2,
+        (Origin::Author, true) => 3,
+        (Origin::Author, false) => 4,
+        (Origin::User, false) => 5,
+        (Origin::UserAgent, false) => 6,
+    }
+}
+
+/// Cascading rule descriptor implementation.
+/// This is only used for at-rules which can cascade. These are @viewport and
+/// @page, although we don't currently implement @page as such.
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToShmem)]
+pub struct DescriptorDeclaration<T> {
+    /// Origin of the declaration
+    pub origin: Origin,
+    /// Declaration value
+    pub descriptor: T,
+    /// Indicates the presence of a !important property.
+    pub important: bool,
+}
+
+impl<T> DescriptorDeclaration<T> {
+    #[allow(missing_docs)]
+    pub fn new(origin: Origin, descriptor: T, important: bool) -> Self {
+        Self {
+            origin,
+            descriptor,
+            important,
+        }
+    }
+    /// Returns true iff self is equal or higher precedence to the other.
+    pub fn higher_or_equal_precendence(&self, other: &Self) -> bool {
+        let self_precedence = cascade_precendence(self.origin, self.important);
+        let other_precedence = cascade_precendence(other.origin, other.important);
+
+        self_precedence <= other_precedence
+    }
+}
+
+impl<T> ToCss for DescriptorDeclaration<T>
+where
+    T: ToCss,
+{
+    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
+    where
+        W: Write,
+    {
+        self.descriptor.to_css(dest)?;
+        if self.important {
+            dest.write_str(" !important")?;
+        }
+        dest.write_char(';')
+    }
+}
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index a5e71140742..2daa9f3c547 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -4,6 +4,7 @@
 
 //! Style sheets and their CSS rules.
 
+mod cascading_at_rule;
 mod counter_style_rule;
 mod document_rule;
 mod font_face_rule;
diff --git a/components/style/stylesheets/viewport_rule.rs b/components/style/stylesheets/viewport_rule.rs
index a6ad967b34c..b4edeadd4bc 100644
--- a/components/style/stylesheets/viewport_rule.rs
+++ b/components/style/stylesheets/viewport_rule.rs
@@ -17,6 +17,7 @@ use crate::rule_cache::RuleCacheConditions;
 use crate::shared_lock::{SharedRwLockReadGuard, StylesheetGuards, ToCssWithGuard};
 use crate::str::CssStringWriter;
 use crate::stylesheets::{Origin, StylesheetInDocument};
+use crate::stylesheets::cascading_at_rule::DescriptorDeclaration;
 use crate::values::computed::{Context, ToComputedValue};
 use crate::values::generics::length::LengthPercentageOrAuto;
 use crate::values::generics::NonNegative;
@@ -225,42 +226,8 @@ struct ViewportRuleParser<'a, 'b: 'a> {
     context: &'a ParserContext<'b>,
 }
 
-#[derive(Clone, Debug, PartialEq, ToShmem)]
-#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
 #[allow(missing_docs)]
-pub struct ViewportDescriptorDeclaration {
-    pub origin: Origin,
-    pub descriptor: ViewportDescriptor,
-    pub important: bool,
-}
-
-impl ViewportDescriptorDeclaration {
-    #[allow(missing_docs)]
-    pub fn new(
-        origin: Origin,
-        descriptor: ViewportDescriptor,
-        important: bool,
-    ) -> ViewportDescriptorDeclaration {
-        ViewportDescriptorDeclaration {
-            origin: origin,
-            descriptor: descriptor,
-            important: important,
-        }
-    }
-}
-
-impl ToCss for ViewportDescriptorDeclaration {
-    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
-    where
-        W: Write,
-    {
-        self.descriptor.to_css(dest)?;
-        if self.important {
-            dest.write_str(" !important")?;
-        }
-        dest.write_str(";")
-    }
-}
+pub type ViewportDescriptorDeclaration = DescriptorDeclaration<ViewportDescriptor>;
 
 fn parse_shorthand<'i, 't>(
     context: &ParserContext,
@@ -554,28 +521,6 @@ impl ToCssWithGuard for ViewportRule {
     }
 }
 
-/// Computes the cascade precedence as according to
-/// <http://dev.w3.org/csswg/css-cascade/#cascade-origin>
-fn cascade_precendence(origin: Origin, important: bool) -> u8 {
-    match (origin, important) {
-        (Origin::UserAgent, true) => 1,
-        (Origin::User, true) => 2,
-        (Origin::Author, true) => 3,
-        (Origin::Author, false) => 4,
-        (Origin::User, false) => 5,
-        (Origin::UserAgent, false) => 6,
-    }
-}
-
-impl ViewportDescriptorDeclaration {
-    fn higher_or_equal_precendence(&self, other: &ViewportDescriptorDeclaration) -> bool {
-        let self_precedence = cascade_precendence(self.origin, self.important);
-        let other_precedence = cascade_precendence(other.origin, other.important);
-
-        self_precedence <= other_precedence
-    }
-}
-
 #[allow(missing_docs)]
 pub struct Cascade {
     declarations: Vec<Option<(usize, ViewportDescriptorDeclaration)>>,

From 5277275263b7d8f69eb0e0a3476fa2ff017dec36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 3 Dec 2020 19:37:05 +0000
Subject: [PATCH 086/156] style: Make CssUrl::is_fragment marginally more
 efficient.

No need to do utf8 shenanigans for what this function does.

Differential Revision: https://phabricator.services.mozilla.com/D97473
---
 components/style/gecko/url.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs
index 2e694b3a2d6..ac7c9359b00 100644
--- a/components/style/gecko/url.rs
+++ b/components/style/gecko/url.rs
@@ -109,7 +109,7 @@ impl CssUrlData {
     /// Returns true if this URL looks like a fragment.
     /// See https://drafts.csswg.org/css-values/#local-urls
     pub fn is_fragment(&self) -> bool {
-        self.as_str().chars().next().map_or(false, |c| c == '#')
+        self.as_str().as_bytes().iter().next().map_or(false, |b| *b == b'#')
     }
 
     /// Return the unresolved url as string, or the empty string if it's

From bd2566d3916ace7d84a5b41cbdfe11d306f9dc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 4 Dec 2020 03:14:36 +0000
Subject: [PATCH 087/156] style: Update cssparser to get ParserState in rule
 parser.

The changes should be trivial.

The third_party changes are up for review in
https://github.com/servo/rust-cssparser/pull/277 (and of course I'll
land with a bump to 0.28 rather than the override after that gets r+'d).

The basic idea is that with this we have the actual start offset of the
rule, so we wouldn't include html comments or other invalid stuff we
discard during sanitization in bug 1680084. But that's a separate
change.

Differential Revision: https://phabricator.services.mozilla.com/D98677
---
 components/style/Cargo.toml                   |  2 +-
 .../stylesheets/font_feature_values_rule.rs   |  4 +-
 .../style/stylesheets/keyframes_rule.rs       |  6 +--
 components/style/stylesheets/rule_parser.rs   | 40 +++++++++----------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 4a62541f3b3..23cd44e99cf 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -35,7 +35,7 @@ arrayvec = "0.5"
 atomic_refcell = "0.1"
 bitflags = "1.0"
 byteorder = "1.0"
-cssparser = "0.27"
+cssparser = "0.28"
 derive_more = "0.99"
 encoding_rs = { version = "0.8", optional = true }
 euclid = "0.22"
diff --git a/components/style/stylesheets/font_feature_values_rule.rs b/components/style/stylesheets/font_feature_values_rule.rs
index 74900f96baf..8417497acba 100644
--- a/components/style/stylesheets/font_feature_values_rule.rs
+++ b/components/style/stylesheets/font_feature_values_rule.rs
@@ -20,7 +20,7 @@ use crate::values::serialize_atom_identifier;
 use crate::Atom;
 use cssparser::{AtRuleParser, AtRuleType, BasicParseErrorKind, CowRcStr};
 use cssparser::{DeclarationListParser, DeclarationParser, Parser};
-use cssparser::{QualifiedRuleParser, RuleListParser, SourceLocation, Token};
+use cssparser::{QualifiedRuleParser, RuleListParser, SourceLocation, ParserState, Token};
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
 
@@ -413,7 +413,7 @@ macro_rules! font_feature_values_blocks {
             fn parse_block<'t>(
                 &mut self,
                 prelude: BlockType,
-                _location: SourceLocation,
+                _: &ParserState,
                 input: &mut Parser<'i, 't>
             ) -> Result<Self::AtRule, ParseError<'i>> {
                 debug_assert_eq!(self.context.rule_type(), CssRuleType::FontFeatureValues);
diff --git a/components/style/stylesheets/keyframes_rule.rs b/components/style/stylesheets/keyframes_rule.rs
index 97394802320..a35d3d2d623 100644
--- a/components/style/stylesheets/keyframes_rule.rs
+++ b/components/style/stylesheets/keyframes_rule.rs
@@ -17,7 +17,7 @@ use crate::str::CssStringWriter;
 use crate::stylesheets::rule_parser::VendorPrefix;
 use crate::stylesheets::{CssRuleType, StylesheetContents};
 use crate::values::{serialize_percentage, KeyframesName};
-use cssparser::{parse_one_rule, DeclarationListParser, DeclarationParser, SourceLocation, Token};
+use cssparser::{parse_one_rule, DeclarationListParser, DeclarationParser, ParserState, SourceLocation, Token};
 use cssparser::{AtRuleParser, CowRcStr, Parser, ParserInput, QualifiedRuleParser, RuleListParser};
 use servo_arc::Arc;
 use std::fmt::{self, Write};
@@ -533,7 +533,7 @@ impl<'a, 'i> QualifiedRuleParser<'i> for KeyframeListParser<'a> {
     fn parse_block<'t>(
         &mut self,
         selector: Self::Prelude,
-        source_location: SourceLocation,
+        start: &ParserState,
         input: &mut Parser<'i, 't>,
     ) -> Result<Self::QualifiedRule, ParseError<'i>> {
         let context = ParserContext::new_with_rule_type(
@@ -566,7 +566,7 @@ impl<'a, 'i> QualifiedRuleParser<'i> for KeyframeListParser<'a> {
         Ok(Arc::new(self.shared_lock.wrap(Keyframe {
             selector,
             block: Arc::new(self.shared_lock.wrap(block)),
-            source_location,
+            source_location: start.source_location(),
         })))
     }
 }
diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs
index 0b01a5f7bdd..f0624cd9784 100644
--- a/components/style/stylesheets/rule_parser.rs
+++ b/components/style/stylesheets/rule_parser.rs
@@ -27,7 +27,7 @@ use crate::values::computed::font::FamilyName;
 use crate::values::{CssUrl, CustomIdent, KeyframesName};
 use crate::{Namespace, Prefix};
 use cssparser::{AtRuleParser, AtRuleType, Parser, QualifiedRuleParser, RuleListParser};
-use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, SourceLocation};
+use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, ParserState};
 use selectors::SelectorList;
 use servo_arc::Arc;
 use style_traits::{ParseError, StyleParseErrorKind};
@@ -251,10 +251,10 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
     fn parse_block<'t>(
         &mut self,
         prelude: AtRuleBlockPrelude,
-        location: SourceLocation,
+        start: &ParserState,
         input: &mut Parser<'i, 't>,
     ) -> Result<CssRule, ParseError<'i>> {
-        AtRuleParser::parse_block(&mut self.nested(), prelude, location, input).map(|rule| {
+        AtRuleParser::parse_block(&mut self.nested(), prelude, start, input).map(|rule| {
             self.state = State::Body;
             rule
         })
@@ -264,8 +264,8 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
     fn rule_without_block(
         &mut self,
         prelude: AtRuleNonBlockPrelude,
-        source_location: SourceLocation,
-    ) -> CssRule {
+        start: &ParserState,
+    ) -> Self::AtRule {
         match prelude {
             AtRuleNonBlockPrelude::Import(url, media) => {
                 let loader = self
@@ -274,7 +274,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
 
                 let import_rule = loader.request_stylesheet(
                     url,
-                    source_location,
+                    start.source_location(),
                     &self.context,
                     &self.shared_lock,
                     media,
@@ -296,7 +296,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
                 CssRule::Namespace(Arc::new(self.shared_lock.wrap(NamespaceRule {
                     prefix,
                     url,
-                    source_location,
+                    source_location: start.source_location(),
                 })))
             },
         }
@@ -324,10 +324,10 @@ impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
     fn parse_block<'t>(
         &mut self,
         prelude: Self::Prelude,
-        location: SourceLocation,
+        start: &ParserState,
         input: &mut Parser<'i, 't>,
     ) -> Result<CssRule, ParseError<'i>> {
-        QualifiedRuleParser::parse_block(&mut self.nested(), prelude, location, input).map(
+        QualifiedRuleParser::parse_block(&mut self.nested(), prelude, start, input).map(
             |result| {
                 self.state = State::Body;
                 result
@@ -461,7 +461,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
     fn parse_block<'t>(
         &mut self,
         prelude: AtRuleBlockPrelude,
-        source_location: SourceLocation,
+        start: &ParserState,
         input: &mut Parser<'i, 't>,
     ) -> Result<CssRule, ParseError<'i>> {
         match prelude {
@@ -473,7 +473,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                 );
 
                 Ok(CssRule::FontFace(Arc::new(self.shared_lock.wrap(
-                    parse_font_face_block(&context, input, source_location).into(),
+                    parse_font_face_block(&context, input, start.source_location()).into(),
                 ))))
             },
             AtRuleBlockPrelude::FontFeatureValues(family_names) => {
@@ -484,7 +484,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                 );
 
                 Ok(CssRule::FontFeatureValues(Arc::new(self.shared_lock.wrap(
-                    FontFeatureValuesRule::parse(&context, input, family_names, source_location),
+                    FontFeatureValuesRule::parse(&context, input, family_names, start.source_location()),
                 ))))
             },
             AtRuleBlockPrelude::CounterStyle(name) => {
@@ -495,14 +495,14 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                 );
 
                 Ok(CssRule::CounterStyle(Arc::new(self.shared_lock.wrap(
-                    parse_counter_style_body(name, &context, input, source_location)?.into(),
+                    parse_counter_style_body(name, &context, input, start.source_location())?.into(),
                 ))))
             },
             AtRuleBlockPrelude::Media(media_queries) => {
                 Ok(CssRule::Media(Arc::new(self.shared_lock.wrap(MediaRule {
                     media_queries,
                     rules: self.parse_nested_rules(input, CssRuleType::Media),
-                    source_location,
+                    source_location: start.source_location(),
                 }))))
             },
             AtRuleBlockPrelude::Supports(condition) => {
@@ -518,7 +518,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                         condition,
                         rules: self.parse_nested_rules(input, CssRuleType::Supports),
                         enabled,
-                        source_location,
+                        source_location: start.source_location(),
                     },
                 ))))
             },
@@ -545,7 +545,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                         name,
                         keyframes: parse_keyframe_list(&context, input, self.shared_lock),
                         vendor_prefix,
-                        source_location,
+                        source_location: start.source_location(),
                     },
                 ))))
             },
@@ -559,7 +559,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                 let declarations = parse_property_declaration_list(&context, input, None);
                 Ok(CssRule::Page(Arc::new(self.shared_lock.wrap(PageRule {
                     block: Arc::new(self.shared_lock.wrap(declarations)),
-                    source_location,
+                    source_location: start.source_location(),
                 }))))
             },
             AtRuleBlockPrelude::Document(condition) => {
@@ -570,7 +570,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                     DocumentRule {
                         condition,
                         rules: self.parse_nested_rules(input, CssRuleType::Document),
-                        source_location,
+                        source_location: start.source_location(),
                     },
                 ))))
             },
@@ -598,7 +598,7 @@ impl<'a, 'b, 'i> QualifiedRuleParser<'i> for NestedRuleParser<'a, 'b> {
     fn parse_block<'t>(
         &mut self,
         selectors: Self::Prelude,
-        source_location: SourceLocation,
+        start: &ParserState,
         input: &mut Parser<'i, 't>,
     ) -> Result<CssRule, ParseError<'i>> {
         let context =
@@ -609,7 +609,7 @@ impl<'a, 'b, 'i> QualifiedRuleParser<'i> for NestedRuleParser<'a, 'b> {
         Ok(CssRule::Style(Arc::new(self.shared_lock.wrap(StyleRule {
             selectors,
             block,
-            source_location,
+            source_location: start.source_location(),
         }))))
     }
 }

From 108f61928b0dee6712ee0f9015e32938885f98a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 4 Dec 2020 15:41:24 +0000
Subject: [PATCH 088/156] style: Use a more precise rule start for
 sanitization.

Differential Revision: https://phabricator.services.mozilla.com/D98710
---
 components/style/stylesheets/mod.rs         |  6 ++--
 components/style/stylesheets/rule_parser.rs | 32 ++++++++++-----------
 components/style/stylesheets/stylesheet.rs  |  5 ++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index 2daa9f3c547..4c1e996fd5d 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -405,8 +405,10 @@ impl CssRule {
             allow_import_rules,
         };
 
-        parse_one_rule(&mut input, &mut rule_parser)
-            .map_err(|_| rule_parser.dom_error.unwrap_or(RulesMutateError::Syntax))
+        match parse_one_rule(&mut input, &mut rule_parser) {
+            Ok((_, rule)) => Ok(rule),
+            Err(_) => Err(rule_parser.dom_error.unwrap_or(RulesMutateError::Syntax)),
+        }
     }
 }
 
diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs
index f0624cd9784..4150f9936f1 100644
--- a/components/style/stylesheets/rule_parser.rs
+++ b/components/style/stylesheets/rule_parser.rs
@@ -27,7 +27,7 @@ use crate::values::computed::font::FamilyName;
 use crate::values::{CssUrl, CustomIdent, KeyframesName};
 use crate::{Namespace, Prefix};
 use cssparser::{AtRuleParser, AtRuleType, Parser, QualifiedRuleParser, RuleListParser};
-use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, ParserState};
+use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, SourcePosition, ParserState};
 use selectors::SelectorList;
 use servo_arc::Arc;
 use style_traits::{ParseError, StyleParseErrorKind};
@@ -178,7 +178,7 @@ pub enum AtRuleNonBlockPrelude {
 impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
     type PreludeNoBlock = AtRuleNonBlockPrelude;
     type PreludeBlock = AtRuleBlockPrelude;
-    type AtRule = CssRule;
+    type AtRule = (SourcePosition, CssRule);
     type Error = StyleParseErrorKind<'i>;
 
     fn parse_prelude<'t>(
@@ -253,11 +253,10 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
         prelude: AtRuleBlockPrelude,
         start: &ParserState,
         input: &mut Parser<'i, 't>,
-    ) -> Result<CssRule, ParseError<'i>> {
-        AtRuleParser::parse_block(&mut self.nested(), prelude, start, input).map(|rule| {
-            self.state = State::Body;
-            rule
-        })
+    ) -> Result<Self::AtRule, ParseError<'i>> {
+        let rule = AtRuleParser::parse_block(&mut self.nested(), prelude, start, input)?;
+        self.state = State::Body;
+        Ok((start.position(), rule))
     }
 
     #[inline]
@@ -266,7 +265,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
         prelude: AtRuleNonBlockPrelude,
         start: &ParserState,
     ) -> Self::AtRule {
-        match prelude {
+        let rule = match prelude {
             AtRuleNonBlockPrelude::Import(url, media) => {
                 let loader = self
                     .loader
@@ -299,13 +298,15 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
                     source_location: start.source_location(),
                 })))
             },
-        }
+        };
+
+        (start.position(), rule)
     }
 }
 
 impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
     type Prelude = SelectorList<SelectorImpl>;
-    type QualifiedRule = CssRule;
+    type QualifiedRule = (SourcePosition, CssRule);
     type Error = StyleParseErrorKind<'i>;
 
     #[inline]
@@ -326,13 +327,10 @@ impl<'a, 'i> QualifiedRuleParser<'i> for TopLevelRuleParser<'a> {
         prelude: Self::Prelude,
         start: &ParserState,
         input: &mut Parser<'i, 't>,
-    ) -> Result<CssRule, ParseError<'i>> {
-        QualifiedRuleParser::parse_block(&mut self.nested(), prelude, start, input).map(
-            |result| {
-                self.state = State::Body;
-                result
-            },
-        )
+    ) -> Result<Self::QualifiedRule, ParseError<'i>> {
+        let rule = QualifiedRuleParser::parse_block(&mut self.nested(), prelude, start, input)?;
+        self.state = State::Body;
+        Ok((start.position(), rule))
     }
 }
 
diff --git a/components/style/stylesheets/stylesheet.rs b/components/style/stylesheets/stylesheet.rs
index e5b0c073f2f..8a9fd7db7cd 100644
--- a/components/style/stylesheets/stylesheet.rs
+++ b/components/style/stylesheets/stylesheet.rs
@@ -503,19 +503,18 @@ impl Stylesheet {
             let mut iter = RuleListParser::new_for_stylesheet(&mut input, rule_parser);
 
             loop {
-                let rule_start = iter.input.position().byte_index();
                 let result = match iter.next() {
                     Some(result) => result,
                     None => break,
                 };
                 match result {
-                    Ok(rule) => {
+                    Ok((rule_start, rule)) => {
                         if let Some(ref mut data) = sanitization_data {
                             if !data.kind.allows(&rule) {
                                 continue;
                             }
                             let end = iter.input.position().byte_index();
-                            data.output.push_str(&css[rule_start..end]);
+                            data.output.push_str(&css[rule_start.byte_index()..end]);
                         }
                         // Use a fallible push here, and if it fails, just fall
                         // out of the loop.  This will cause the page to be

From 45af831c82aa10a89c83ebd542403cb0be12ac2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Dec 2020 13:43:50 +0000
Subject: [PATCH 089/156] style: Remove
 layout.css.xul-tree-pseudos.content.enabled.

We unshipped these a while ago and left the pref just for testing
purposes. But now all the reftests using it were conveniently migrated
to chrome:// tests, so we no longer need it.

Differential Revision: https://phabricator.services.mozilla.com/D56950
---
 components/style/gecko/pseudo_element_definition.mako.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/style/gecko/pseudo_element_definition.mako.rs b/components/style/gecko/pseudo_element_definition.mako.rs
index f4a6671bd39..0478a114de9 100644
--- a/components/style/gecko/pseudo_element_definition.mako.rs
+++ b/components/style/gecko/pseudo_element_definition.mako.rs
@@ -112,11 +112,7 @@ impl PseudoElement {
             % for pseudo in PSEUDOS:
                 ${pseudo_element_variant(pseudo)} =>
                 % if pseudo.is_tree_pseudo_element():
-                    if static_prefs::pref!("layout.css.xul-tree-pseudos.content.enabled") {
-                        0
-                    } else {
-                        structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS_AND_CHROME
-                    },
+                    structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS_AND_CHROME,
                 % elif pseudo.is_anon_box():
                     structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS,
                 % else:

From 5f4da63a5e865fbf9818cc5843c2d79b15c70898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Dec 2020 16:14:35 +0000
Subject: [PATCH 090/156] style: Remove some text-decoration prefs that are
 always on.

Differential Revision: https://phabricator.services.mozilla.com/D99675
---
 .../style/properties/longhands/inherited_text.mako.rs |  8 --------
 components/style/properties/longhands/text.mako.rs    |  1 -
 components/style/properties/shorthands/text.mako.rs   | 11 ++---------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs
index 8e9e5340420..c108bbcc75f 100644
--- a/components/style/properties/longhands/inherited_text.mako.rs
+++ b/components/style/properties/longhands/inherited_text.mako.rs
@@ -109,8 +109,6 @@ ${helpers.predefined_type(
     extra_specified="${'distribute' if engine == 'gecko' else ''}"
     gecko_enum_prefix="StyleTextJustify"
     animation_value_type="discrete"
-    gecko_pref="layout.css.text-justify.enabled"
-    has_effect_on_gecko_scrollbars="False"
     spec="https://drafts.csswg.org/css-text/#propdef-text-justify"
     servo_restyle_damage="rebuild_and_reflow"
 >
@@ -385,8 +383,6 @@ ${helpers.predefined_type(
     "computed::LengthPercentageOrAuto::auto()",
     engines="gecko",
     animation_value_type="ComputedValue",
-    gecko_pref="layout.css.text-underline-offset.enabled",
-    has_effect_on_gecko_scrollbars=False,
     spec="https://drafts.csswg.org/css-text-decor-4/#underline-offset",
 )}
 
@@ -397,8 +393,6 @@ ${helpers.predefined_type(
     "computed::TextUnderlinePosition::AUTO",
     engines="gecko",
     animation_value_type="discrete",
-    gecko_pref="layout.css.text-underline-position.enabled",
-    has_effect_on_gecko_scrollbars=False,
     spec="https://drafts.csswg.org/css-text-decor-3/#text-underline-position-property",
 )}
 
@@ -410,7 +404,5 @@ ${helpers.predefined_type(
     engines="gecko",
     needs_context=False,
     animation_value_type="discrete",
-    gecko_pref="layout.css.text-decoration-skip-ink.enabled",
-    has_effect_on_gecko_scrollbars=False,
     spec="https://drafts.csswg.org/css-text-decor-4/#text-decoration-skip-ink-property",
 )}
diff --git a/components/style/properties/longhands/text.mako.rs b/components/style/properties/longhands/text.mako.rs
index 1912bc28e3b..1660ed5c58e 100644
--- a/components/style/properties/longhands/text.mako.rs
+++ b/components/style/properties/longhands/text.mako.rs
@@ -75,6 +75,5 @@ ${helpers.predefined_type(
    engines="gecko",
    initial_specified_value="generics::text::GenericTextDecorationLength::Auto",
    animation_value_type="ComputedValue",
-   gecko_pref="layout.css.text-decoration-thickness.enabled",
    spec="https://drafts.csswg.org/css-text-decor-4/#text-decoration-width-property"
 )}
diff --git a/components/style/properties/shorthands/text.mako.rs b/components/style/properties/shorthands/text.mako.rs
index 5c7d9c7655c..03637d557e5 100644
--- a/components/style/properties/shorthands/text.mako.rs
+++ b/components/style/properties/shorthands/text.mako.rs
@@ -10,11 +10,9 @@
                     sub_properties="text-decoration-line
                     ${' text-decoration-style text-decoration-color text-decoration-thickness' if engine == 'gecko' else ''}"
                     spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration">
-
     % if engine == "gecko":
         use crate::values::specified;
         use crate::properties::longhands::{text_decoration_style, text_decoration_color, text_decoration_thickness};
-        use crate::properties::{PropertyId, LonghandId};
     % endif
     use crate::properties::longhands::text_decoration_line;
 
@@ -23,9 +21,6 @@
         input: &mut Parser<'i, 't>,
     ) -> Result<Longhands, ParseError<'i>> {
         % if engine == "gecko":
-            let text_decoration_thickness_enabled =
-                PropertyId::Longhand(LonghandId::TextDecorationThickness).enabled_for_all_content();
-
             let (mut line, mut style, mut color, mut thickness, mut any) = (None, None, None, None, false);
         % else:
             let (mut line, mut any) = (None, false);
@@ -49,9 +44,7 @@
             % if engine == "gecko":
                 parse_component!(style, text_decoration_style);
                 parse_component!(color, text_decoration_color);
-                if text_decoration_thickness_enabled {
-                    parse_component!(thickness, text_decoration_thickness);
-                }
+                parse_component!(thickness, text_decoration_thickness);
             % endif
 
             break;
@@ -82,7 +75,7 @@
             % if engine == "gecko":
                 *self.text_decoration_style == text_decoration_style::SpecifiedValue::Solid,
                 *self.text_decoration_color == specified::Color::CurrentColor,
-                self.text_decoration_thickness.map_or(true, |t| t.is_auto())
+                self.text_decoration_thickness.is_auto()
             % else:
                 true, true, true
             % endif

From 54f5b24c69cb1834cd575c4ba1a216b8bf59a2bb Mon Sep 17 00:00:00 2001
From: Kartik Gautam <ikartikgautam@outlook.com>
Date: Tue, 15 Dec 2020 10:34:54 +0000
Subject: [PATCH 091/156] style: Remove trailing empty lines

Differential Revision: https://phabricator.services.mozilla.com/D99595
---
 components/style/properties/shorthands/padding.mako.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/style/properties/shorthands/padding.mako.rs b/components/style/properties/shorthands/padding.mako.rs
index 4d2ea361e15..11ddfed3b11 100644
--- a/components/style/properties/shorthands/padding.mako.rs
+++ b/components/style/properties/shorthands/padding.mako.rs
@@ -56,4 +56,3 @@ ${helpers.two_properties_shorthand(
     engines="gecko",
     spec="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding-inline"
 )}
-

From 019e6a3e2ab385c22f844084c8cb9a6396f7ae99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 16 Dec 2020 08:16:08 +0000
Subject: [PATCH 092/156] style: Rename -moz-autofill to just autofill.

No compat impact, as this remains an internal pseudo-class for the time
being.

Differential Revision: https://phabricator.services.mozilla.com/D99295
---
 components/style/gecko/non_ts_pseudo_class_list.rs | 3 ++-
 components/style/gecko/wrapper.rs                  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index d1e49036d90..d927e886bc7 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -37,6 +37,7 @@ macro_rules! apply_non_ts_list {
                 ("any-link", AnyLink, IN_VISITED_OR_UNVISITED_STATE, _),
                 ("visited", Visited, IN_VISITED_STATE, _),
                 ("active", Active, IN_ACTIVE_STATE, _),
+                ("autofill", Autofill, IN_AUTOFILL_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("checked", Checked, IN_CHECKED_STATE, _),
                 ("defined", Defined, IN_DEFINED_STATE, _),
                 ("disabled", Disabled, IN_DISABLED_STATE, _),
@@ -62,7 +63,7 @@ macro_rules! apply_non_ts_list {
                 ("-moz-dir-attr-ltr", MozDirAttrLTR, IN_HAS_DIR_ATTR_LTR_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-dir-attr-rtl", MozDirAttrRTL, IN_HAS_DIR_ATTR_RTL_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-dir-attr-like-auto", MozDirAttrLikeAuto, IN_HAS_DIR_ATTR_LIKE_AUTO_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
-                ("-moz-autofill", MozAutofill, IN_AUTOFILL_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+
                 ("-moz-autofill-preview", MozAutofillPreview, IN_AUTOFILL_PREVIEW_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
 
                 ("-moz-handler-clicktoplay", MozHandlerClickToPlay, IN_HANDLER_CLICK_TO_PLAY_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 4773bd89997..0e0486133a9 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2017,6 +2017,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
     {
         use selectors::matching::*;
         match *pseudo_class {
+            NonTSPseudoClass::Autofill |
             NonTSPseudoClass::Defined |
             NonTSPseudoClass::Focus |
             NonTSPseudoClass::Enabled |
@@ -2062,7 +2063,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozDirAttrLTR |
             NonTSPseudoClass::MozDirAttrRTL |
             NonTSPseudoClass::MozDirAttrLikeAuto |
-            NonTSPseudoClass::MozAutofill |
             NonTSPseudoClass::MozModalDialog |
             NonTSPseudoClass::MozTopmostModalDialog |
             NonTSPseudoClass::Active |

From 72a0dbacc79a7e2f861aa6eb8a1976d8fdcc65a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 16 Dec 2020 08:16:16 +0000
Subject: [PATCH 093/156] style: Expose :autofill behind a pref to content, and
 add :-webkit-autofill as a compat alias.

Nightly only until we get resolutions on the relevant spec issues.

Differential Revision: https://phabricator.services.mozilla.com/D99296
---
 components/style/gecko/selector_parser.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index c63bc81c95b..0a7e2922c93 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -121,6 +121,7 @@ impl NonTSPseudoClass {
                     "-moz-full-screen" => Some(NonTSPseudoClass::Fullscreen),
                     "-moz-read-only" => Some(NonTSPseudoClass::ReadOnly),
                     "-moz-read-write" => Some(NonTSPseudoClass::ReadWrite),
+                    "-webkit-autofill" => Some(NonTSPseudoClass::Autofill),
                     _ => None,
                 }
             }
@@ -155,9 +156,12 @@ impl NonTSPseudoClass {
     /// Returns whether the pseudo-class is enabled in content sheets.
     #[inline]
     fn is_enabled_in_content(&self) -> bool {
-        if matches!(*self, NonTSPseudoClass::FocusVisible) {
+        if let NonTSPseudoClass::FocusVisible = *self {
             return static_prefs::pref!("layout.css.focus-visible.enabled");
         }
+        if let NonTSPseudoClass::Autofill = *self {
+            return static_prefs::pref!("layout.css.autofill.enabled");
+        }
         !self.has_any_flag(NonTSPseudoClassFlag::PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME)
     }
 

From a3f84f85e34805b1f23407fc85b30a58533632a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 16 Dec 2020 20:24:03 +0000
Subject: [PATCH 094/156] style: Remove layout.css.moz-any-is-is.enabled.

We shipped this, let's remove the MozAny code.

Differential Revision: https://phabricator.services.mozilla.com/D99607
---
 components/style/gecko/selector_parser.rs     | 60 ++-----------------
 components/style/gecko/wrapper.rs             |  4 --
 .../invalidation/element/element_wrapper.rs   | 10 ----
 3 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 0a7e2922c93..b619f58af60 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -14,13 +14,10 @@ use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
 use crate::values::{AtomIdent, AtomString};
 use cssparser::{BasicParseError, BasicParseErrorKind, Parser};
 use cssparser::{CowRcStr, SourceLocation, ToCss, Token};
-use selectors::parser::{SelectorParseErrorKind, ParseErrorRecovery};
-use selectors::parser::{self as selector_parser, Selector};
-use selectors::visitor::SelectorVisitor;
+use selectors::parser::{ParseErrorRecovery, SelectorParseErrorKind};
 use selectors::SelectorList;
 use std::fmt;
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss as ToCss_};
-use thin_slice::ThinBoxedSlice;
 
 pub use crate::gecko::pseudo_element::{
     PseudoElement, EAGER_PSEUDOS, EAGER_PSEUDO_COUNT, PSEUDO_COUNT,
@@ -54,11 +51,6 @@ macro_rules! pseudo_class_name {
             Lang(Lang),
             /// The `:dir` pseudo-class.
             Dir(Direction),
-            /// The non-standard `:-moz-any` pseudo-class.
-            ///
-            /// TODO(emilio): We disallow combinators and pseudos here, so we
-            /// should use SimpleSelector instead
-            MozAny(ThinBoxedSlice<Selector<SelectorImpl>>),
             /// The non-standard `:-moz-locale-dir` pseudo-class.
             MozLocaleDir(Direction),
         }
@@ -90,17 +82,6 @@ impl ToCss for NonTSPseudoClass {
                         dir.to_css(&mut CssWriter::new(dest))?;
                         return dest.write_char(')')
                     },
-                    NonTSPseudoClass::MozAny(ref selectors) => {
-                        dest.write_str(":-moz-any(")?;
-                        let mut iter = selectors.iter();
-                        let first = iter.next().expect(":-moz-any must have at least 1 selector");
-                        first.to_css(dest)?;
-                        for selector in iter {
-                            dest.write_str(", ")?;
-                            selector.to_css(dest)?;
-                        }
-                        return dest.write_char(')')
-                    }
                 }
             }
         }
@@ -145,8 +126,7 @@ impl NonTSPseudoClass {
                     $(NonTSPseudoClass::$name => check_flag!($flags),)*
                     NonTSPseudoClass::MozLocaleDir(_) |
                     NonTSPseudoClass::Lang(_) |
-                    NonTSPseudoClass::Dir(_) |
-                    NonTSPseudoClass::MozAny(_) => false,
+                    NonTSPseudoClass::Dir(_) => false,
                 }
             }
         }
@@ -181,8 +161,7 @@ impl NonTSPseudoClass {
                     $(NonTSPseudoClass::$name => flag!($state),)*
                     NonTSPseudoClass::Dir(..) |
                     NonTSPseudoClass::MozLocaleDir(..) |
-                    NonTSPseudoClass::Lang(..) |
-                    NonTSPseudoClass::MozAny(..) => ElementState::empty(),
+                    NonTSPseudoClass::Lang(..) => ElementState::empty(),
                 }
             }
         }
@@ -202,12 +181,7 @@ impl NonTSPseudoClass {
     /// revalidation.
     pub fn needs_cache_revalidation(&self) -> bool {
         self.state_flag().is_empty() &&
-            !matches!(
-                *self,
-                // :-moz-any is handled by the revalidation visitor walking
-                // the things inside it; it does not need to cause
-                // revalidation on its own.
-                NonTSPseudoClass::MozAny(_) |
+            !matches!(*self,
                       // :dir() depends on state only, but doesn't use state_flag
                       // because its semantics don't quite match.  Nevertheless, it
                       // doesn't need cache revalidation, because we already compare
@@ -251,21 +225,6 @@ impl ::selectors::parser::NonTSPseudoClass for NonTSPseudoClass {
             NonTSPseudoClass::Hover | NonTSPseudoClass::Active | NonTSPseudoClass::Focus
         )
     }
-
-    fn visit<V>(&self, visitor: &mut V) -> bool
-    where
-        V: SelectorVisitor<Impl = Self::Impl>,
-    {
-        if let NonTSPseudoClass::MozAny(ref selectors) = *self {
-            for selector in selectors.iter() {
-                if !selector.visit(visitor) {
-                    return false;
-                }
-            }
-        }
-
-        true
-    }
 }
 
 /// The dummy struct we use to implement our selector parsing.
@@ -359,8 +318,7 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
 
     #[inline]
     fn is_is_alias(&self, function: &str) -> bool {
-        static_prefs::pref!("layout.css.moz-any-is-is.enabled") &&
-            function.eq_ignore_ascii_case("-moz-any")
+        function.eq_ignore_ascii_case("-moz-any")
     }
 
     fn parse_non_ts_pseudo_class(
@@ -396,14 +354,6 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
             "dir" => {
                 NonTSPseudoClass::Dir(Direction::parse(parser)?)
             },
-            "-moz-any" => {
-                NonTSPseudoClass::MozAny(
-                    selector_parser::parse_compound_selector_list(
-                        self,
-                        parser,
-                    )?.into()
-                )
-            },
             _ => return Err(parser.new_custom_error(
                 SelectorParseErrorKind::UnsupportedPseudoClassOrElement(name.clone())
             ))
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 0e0486133a9..397e6e491c9 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2136,10 +2136,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
                 self.document_state().contains(state_bit)
             },
             NonTSPseudoClass::MozPlaceholder => false,
-            NonTSPseudoClass::MozAny(ref sels) => context.nest(|context| {
-                sels.iter()
-                    .any(|s| matches_complex_selector(s.iter(), self, context, flags_setter))
-            }),
             NonTSPseudoClass::Lang(ref lang_arg) => self.match_element_lang(None, lang_arg),
             NonTSPseudoClass::MozLocaleDir(ref dir) => {
                 let state_bit = DocumentState::NS_DOCUMENT_STATE_RTL_LOCALE;
diff --git a/components/style/invalidation/element/element_wrapper.rs b/components/style/invalidation/element/element_wrapper.rs
index 953c07f46c7..d79e1402228 100644
--- a/components/style/invalidation/element/element_wrapper.rs
+++ b/components/style/invalidation/element/element_wrapper.rs
@@ -178,16 +178,6 @@ where
         // Some pseudo-classes need special handling to evaluate them against
         // the snapshot.
         match *pseudo_class {
-            #[cfg(feature = "gecko")]
-            NonTSPseudoClass::MozAny(ref selectors) => {
-                use selectors::matching::matches_complex_selector;
-                return context.nest(|context| {
-                    selectors
-                        .iter()
-                        .any(|s| matches_complex_selector(s.iter(), self, context, _setter))
-                });
-            },
-
             // :dir is implemented in terms of state flags, but which state flag
             // it maps to depends on the argument to :dir.  That means we can't
             // just add its state flags to the NonTSPseudoClass, because if we

From f58301ecbc2f61cc6a42a2539f1123ab8bc1db8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 17 Dec 2020 14:04:35 +0000
Subject: [PATCH 095/156] style: Avoid UTF-8 -> UTF-16 conversion during CSSOM
 serialization.

This lifts a bunch of string conversions higher up the stack, but allows
us to make the servo code use utf-8 unconditionally, and seemed faster
in my benchmarking (see comment 0).

It should also make a bunch of attribute setters faster too (like
setting .cssText), now that we use UTF8String for them (we couldn't
because we couldn't specify different string types for the getter and
setters).

Differential Revision: https://phabricator.services.mozilla.com/D99590
---
 .../style/properties/declaration_block.rs     | 12 ++-
 .../style/properties/properties.mako.rs       |  9 +-
 components/style/str.rs                       | 95 +------------------
 3 files changed, 15 insertions(+), 101 deletions(-)

diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index bd0a87f0b0a..9170f6e650d 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -14,7 +14,7 @@ use crate::parser::ParserContext;
 use crate::properties::animated_properties::{AnimationValue, AnimationValueMap};
 use crate::selector_parser::SelectorImpl;
 use crate::shared_lock::Locked;
-use crate::str::{CssString, CssStringBorrow, CssStringWriter};
+use crate::str::{CssString, CssStringWriter};
 use crate::stylesheets::{CssRuleType, Origin, UrlExtraData};
 use crate::values::computed::Context;
 use cssparser::{parse_important, CowRcStr, DeclarationListParser, ParserInput};
@@ -1093,7 +1093,11 @@ impl PropertyDeclarationBlock {
                         }
 
                         AppendableValue::Css {
-                            css: CssStringBorrow::from(&v),
+                            // Safety: serialization only generates valid utf-8.
+                            #[cfg(feature = "gecko")]
+                            css: unsafe { v.as_str_unchecked() },
+                            #[cfg(feature = "servo")]
+                            css: &v,
                             with_variables: false,
                         }
                     },
@@ -1179,7 +1183,7 @@ where
     /// or when storing a serialized shorthand value before appending directly.
     Css {
         /// The raw CSS string.
-        css: CssStringBorrow<'a>,
+        css: &'a str,
         /// Whether the original serialization contained variables or not.
         with_variables: bool,
     },
@@ -1207,7 +1211,7 @@ where
     I: Iterator<Item = &'a PropertyDeclaration>,
 {
     match appendable_value {
-        AppendableValue::Css { css, .. } => css.append_to(dest),
+        AppendableValue::Css { css, .. } => dest.write_str(css),
         AppendableValue::Declaration(decl) => decl.to_css(dest),
         AppendableValue::DeclarationsForShorthand(shorthand, decls) => {
             shorthand.longhands_to_css(decls, &mut CssWriter::new(dest))
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index a4316a501ad..505068b8556 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -46,7 +46,7 @@ use crate::values::computed::NonNegativeLength;
 use crate::values::serialize_atom_name;
 use crate::rule_tree::StrongRuleNode;
 use crate::Zero;
-use crate::str::{CssString, CssStringBorrow, CssStringWriter};
+use crate::str::{CssString, CssStringWriter};
 use std::cell::Cell;
 
 pub use self::declaration_block::*;
@@ -1529,10 +1529,7 @@ impl ShorthandId {
         // https://drafts.csswg.org/css-variables/#variables-in-shorthands
         if let Some(css) = first_declaration.with_variables_from_shorthand(self) {
             if declarations2.all(|d| d.with_variables_from_shorthand(self) == Some(css)) {
-               return Some(AppendableValue::Css {
-                   css: CssStringBorrow::from(css),
-                   with_variables: true,
-               });
+               return Some(AppendableValue::Css { css, with_variables: true });
             }
             return None;
         }
@@ -1541,7 +1538,7 @@ impl ShorthandId {
         if let Some(keyword) = first_declaration.get_css_wide_keyword() {
             if declarations2.all(|d| d.get_css_wide_keyword() == Some(keyword)) {
                 return Some(AppendableValue::Css {
-                    css: CssStringBorrow::from(keyword.to_str()),
+                    css: keyword.to_str(),
                     with_variables: false,
                 });
             }
diff --git a/components/style/str.rs b/components/style/str.rs
index 01f70c1f963..9badcdf413c 100644
--- a/components/style/str.rs
+++ b/components/style/str.rs
@@ -9,7 +9,6 @@
 use num_traits::ToPrimitive;
 use std::borrow::Cow;
 use std::convert::AsRef;
-use std::fmt::{self, Write};
 use std::iter::{Filter, Peekable};
 use std::str::Split;
 
@@ -171,98 +170,12 @@ pub fn string_as_ascii_lowercase<'a>(input: &'a str) -> Cow<'a, str> {
 
 /// To avoid accidentally instantiating multiple monomorphizations of large
 /// serialization routines, we define explicit concrete types and require
-/// them in those routines. This primarily avoids accidental mixing of UTF8
-/// with UTF16 serializations in Gecko.
+/// them in those routines. This avoids accidental mixing of String and
+/// nsACString arguments in Gecko, which would cause code size to blow up.
 #[cfg(feature = "gecko")]
-pub type CssStringWriter = ::nsstring::nsAString;
+pub type CssStringWriter = ::nsstring::nsACString;
 
 /// String type that coerces to CssStringWriter, used when serialization code
 /// needs to allocate a temporary string.
 #[cfg(feature = "gecko")]
-pub type CssString = ::nsstring::nsString;
-
-/// Certain serialization code needs to interact with borrowed strings, which
-/// are sometimes native UTF8 Rust strings, and other times serialized UTF16
-/// strings. This enum multiplexes the two cases.
-#[cfg(feature = "gecko")]
-pub enum CssStringBorrow<'a> {
-    /// A borrow of a UTF16 CssString.
-    UTF16(&'a ::nsstring::nsString),
-    /// A borrow of a regular Rust UTF8 string.
-    UTF8(&'a str),
-}
-
-#[cfg(feature = "gecko")]
-impl<'a> CssStringBorrow<'a> {
-    /// Writes the borrowed string to the provided writer.
-    pub fn append_to(&self, dest: &mut CssStringWriter) -> fmt::Result {
-        match *self {
-            CssStringBorrow::UTF16(s) => {
-                dest.append(s);
-                Ok(())
-            },
-            CssStringBorrow::UTF8(s) => dest.write_str(s),
-        }
-    }
-
-    /// Returns true of the borrowed string is empty.
-    pub fn is_empty(&self) -> bool {
-        match *self {
-            CssStringBorrow::UTF16(s) => s.is_empty(),
-            CssStringBorrow::UTF8(s) => s.is_empty(),
-        }
-    }
-}
-
-#[cfg(feature = "gecko")]
-impl<'a> From<&'a str> for CssStringBorrow<'a> {
-    fn from(s: &'a str) -> Self {
-        CssStringBorrow::UTF8(s)
-    }
-}
-
-#[cfg(feature = "gecko")]
-impl<'a> From<&'a ::nsstring::nsString> for CssStringBorrow<'a> {
-    fn from(s: &'a ::nsstring::nsString) -> Self {
-        CssStringBorrow::UTF16(s)
-    }
-}
-
-/// String. The comments for the Gecko types explain the need for this abstraction.
-#[cfg(feature = "servo")]
-pub type CssStringWriter = String;
-
-/// String. The comments for the Gecko types explain the need for this abstraction.
-#[cfg(feature = "servo")]
-pub type CssString = String;
-
-/// Borrowed string. The comments for the Gecko types explain the need for this abstraction.
-#[cfg(feature = "servo")]
-pub struct CssStringBorrow<'a>(&'a str);
-
-#[cfg(feature = "servo")]
-impl<'a> CssStringBorrow<'a> {
-    /// Appends the borrowed string to the given string.
-    pub fn append_to(&self, dest: &mut CssStringWriter) -> fmt::Result {
-        dest.write_str(self.0)
-    }
-
-    /// Returns true if the borrowed string is empty.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-}
-
-#[cfg(feature = "servo")]
-impl<'a> From<&'a str> for CssStringBorrow<'a> {
-    fn from(s: &'a str) -> Self {
-        CssStringBorrow(s)
-    }
-}
-
-#[cfg(feature = "servo")]
-impl<'a> From<&'a String> for CssStringBorrow<'a> {
-    fn from(s: &'a String) -> Self {
-        CssStringBorrow(&*s)
-    }
-}
+pub type CssString = ::nsstring::nsCString;

From 0dc6c32759c9e8284fb6b34ad16ba243d18c7ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 23 Dec 2020 02:59:11 +0000
Subject: [PATCH 096/156] style: Make next_in_preorder generate slightly better
 code.

This avoids the panic code in release builds.

Differential Revision: https://phabricator.services.mozilla.com/D100094
---
 components/style/dom.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/components/style/dom.rs b/components/style/dom.rs
index 2edf5ae7dab..86c5a382891 100644
--- a/components/style/dom.rs
+++ b/components/style/dom.rs
@@ -188,22 +188,18 @@ pub trait TNode: Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
             return Some(c);
         }
 
-        if Some(*self) == scoped_to {
-            return None;
-        }
-
-        let mut current = *self;
+        let mut current = Some(*self);
         loop {
-            if let Some(s) = current.next_sibling() {
-                return Some(s);
-            }
-
-            let parent = current.parent_node();
-            if parent == scoped_to {
+            if current == scoped_to {
                 return None;
             }
 
-            current = parent.expect("Not a descendant of the scope?");
+            debug_assert!(current.is_some(), "not a descendant of the scope?");
+            if let Some(s) = current?.next_sibling() {
+                return Some(s);
+            }
+
+            current = current?.parent_node();
         }
     }
 

From 610ebe2e25086f0d980f5d6cc0ab79e63e0f1130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 2 Jan 2021 04:50:01 +0000
Subject: [PATCH 097/156] style: Reorder some conditions when handling
 class/part attributes.

Empty class attributes are uncommon.

Differential Revision: https://phabricator.services.mozilla.com/D100592
---
 components/style/gecko/snapshot_helpers.rs | 35 +++++++++++-----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/components/style/gecko/snapshot_helpers.rs b/components/style/gecko/snapshot_helpers.rs
index ee8d7dfd704..f34fca40f1c 100644
--- a/components/style/gecko/snapshot_helpers.rs
+++ b/components/style/gecko/snapshot_helpers.rs
@@ -34,27 +34,26 @@ unsafe fn ptr<T>(attr: &structs::nsAttrValue) -> *const T {
 unsafe fn get_class_or_part_from_attr(attr: &structs::nsAttrValue) -> Class {
     debug_assert!(bindings::Gecko_AssertClassAttrValueIsSane(attr));
     let base_type = base_type(attr);
-    if base_type == structs::nsAttrValue_ValueBaseType_eStringBase {
-        return Class::None;
-    }
     if base_type == structs::nsAttrValue_ValueBaseType_eAtomBase {
         return Class::One(ptr::<nsAtom>(attr));
     }
-    debug_assert_eq!(base_type, structs::nsAttrValue_ValueBaseType_eOtherBase);
-
-    let container = ptr::<structs::MiscContainer>(attr);
-    debug_assert_eq!(
-        (*container).mType,
-        structs::nsAttrValue_ValueType_eAtomArray
-    );
-    let array = (*container)
-        .__bindgen_anon_1
-        .mValue
-        .as_ref()
-        .__bindgen_anon_1
-        .mAtomArray
-        .as_ref();
-    Class::More(&***array)
+    if base_type == structs::nsAttrValue_ValueBaseType_eOtherBase {
+        let container = ptr::<structs::MiscContainer>(attr);
+        debug_assert_eq!(
+            (*container).mType,
+            structs::nsAttrValue_ValueType_eAtomArray
+        );
+        let array = (*container)
+            .__bindgen_anon_1
+            .mValue
+            .as_ref()
+            .__bindgen_anon_1
+            .mAtomArray
+            .as_ref();
+        return Class::More(&***array)
+    }
+    debug_assert_eq!(base_type, structs::nsAttrValue_ValueBaseType_eStringBase);
+    Class::None
 }
 
 #[inline(always)]

From b8d46406f64507b031c662d2a4fde4eccb5f8ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sat, 2 Jan 2021 17:37:45 +0000
Subject: [PATCH 098/156] style: Inline nsTArray::deref.

This shaves >50ms if the compiler decides not to inline it, compilers are
sometimes dumb.

Depends on D100593

Differential Revision: https://phabricator.services.mozilla.com/D100594
---
 components/style/gecko_bindings/sugar/ns_t_array.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/style/gecko_bindings/sugar/ns_t_array.rs b/components/style/gecko_bindings/sugar/ns_t_array.rs
index 04ba326c615..d10ed420dd8 100644
--- a/components/style/gecko_bindings/sugar/ns_t_array.rs
+++ b/components/style/gecko_bindings/sugar/ns_t_array.rs
@@ -13,6 +13,7 @@ use std::slice;
 impl<T> Deref for nsTArray<T> {
     type Target = [T];
 
+    #[inline]
     fn deref<'a>(&'a self) -> &'a [T] {
         unsafe { slice::from_raw_parts(self.slice_begin(), self.header().mLength as usize) }
     }

From 892b0ffb5da78c753c44ae6fe4b83a4374a27345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 4 Jan 2021 17:56:33 +0000
Subject: [PATCH 099/156] style: Use an AutoTArray for atom arrays in
 attributes (class / part).

These are never empty, and storing 4 elements inline seems worth it
given we also heap-allocate the array itself.

Depends on D100592

Differential Revision: https://phabricator.services.mozilla.com/D100593
---
 components/style/gecko/snapshot_helpers.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/style/gecko/snapshot_helpers.rs b/components/style/gecko/snapshot_helpers.rs
index f34fca40f1c..8d99f84a958 100644
--- a/components/style/gecko/snapshot_helpers.rs
+++ b/components/style/gecko/snapshot_helpers.rs
@@ -43,14 +43,16 @@ unsafe fn get_class_or_part_from_attr(attr: &structs::nsAttrValue) -> Class {
             (*container).mType,
             structs::nsAttrValue_ValueType_eAtomArray
         );
-        let array = (*container)
+        // NOTE: Bindgen doesn't deal with AutoTArray, so cast it below.
+        let array: *mut u8 = *(*container)
             .__bindgen_anon_1
             .mValue
             .as_ref()
             .__bindgen_anon_1
             .mAtomArray
             .as_ref();
-        return Class::More(&***array)
+        let array = array as *const structs::nsTArray<structs::RefPtr<nsAtom>>;
+        return Class::More(&**array)
     }
     debug_assert_eq!(base_type, structs::nsAttrValue_ValueBaseType_eStringBase);
     Class::None
@@ -132,7 +134,8 @@ pub fn has_class_or_part(
         Class::One(atom) => unsafe { case_sensitivity.eq_atom(name, WeakAtom::new(atom)) },
         Class::More(atoms) => match case_sensitivity {
             CaseSensitivity::CaseSensitive => {
-                atoms.iter().any(|atom| atom.mRawPtr == name.as_ptr())
+                let name_ptr = name.as_ptr();
+                atoms.iter().any(|atom| atom.mRawPtr == name_ptr)
             },
             CaseSensitivity::AsciiCaseInsensitive => unsafe {
                 atoms

From a4506d94ecbee1c91e32c93eeebbd9992fd330f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 4 Jan 2021 20:12:05 +0000
Subject: [PATCH 100/156] style: Remove some dead plugins code.

Differential Revision: https://phabricator.services.mozilla.com/D100472
---
 components/style/element_state.rs                  | 12 ------------
 components/style/gecko/non_ts_pseudo_class_list.rs |  7 -------
 components/style/gecko/wrapper.rs                  |  6 ------
 3 files changed, 25 deletions(-)

diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index 5dc3cc0c25d..e05ff8778e7 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -55,12 +55,6 @@ bitflags! {
         const IN_BROKEN_STATE = 1 << 14;
         /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-loading
         const IN_LOADING_STATE = 1 << 17;
-        /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-handler-blocked
-        const IN_HANDLER_BLOCKED_STATE = 1 << 18;
-        /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-handler-disabled
-        const IN_HANDLER_DISABLED_STATE = 1 << 19;
-        /// Non-standard: https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-handler-crashed
-        const IN_HANDLER_CRASHED_STATE = 1 << 20;
         /// <https://html.spec.whatwg.org/multipage/#selector-required>
         const IN_REQUIRED_STATE = 1 << 21;
         /// <https://html.spec.whatwg.org/multipage/#selector-optional>
@@ -106,12 +100,6 @@ bitflags! {
         ///
         /// But also https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo
         const IN_FOCUSRING_STATE = 1 << 39;
-        /// Non-standard & undocumented.
-        const IN_HANDLER_CLICK_TO_PLAY_STATE = 1 << 40;
-        /// Non-standard & undocumented.
-        const IN_HANDLER_VULNERABLE_UPDATABLE_STATE = 1 << 41;
-        /// Non-standard & undocumented.
-        const IN_HANDLER_VULNERABLE_NO_UPDATE_STATE = 1 << 42;
         /// <https://drafts.csswg.org/selectors-4/#the-focus-within-pseudo>
         const IN_FOCUS_WITHIN_STATE = 1 << 43;
         /// :dir matching; the states are used for dynamic change detection.
diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index d927e886bc7..7bffe282a72 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -66,13 +66,6 @@ macro_rules! apply_non_ts_list {
 
                 ("-moz-autofill-preview", MozAutofillPreview, IN_AUTOFILL_PREVIEW_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
 
-                ("-moz-handler-clicktoplay", MozHandlerClickToPlay, IN_HANDLER_CLICK_TO_PLAY_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-                ("-moz-handler-vulnerable-updatable", MozHandlerVulnerableUpdatable, IN_HANDLER_VULNERABLE_UPDATABLE_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-                ("-moz-handler-vulnerable-no-update", MozHandlerVulnerableNoUpdate, IN_HANDLER_VULNERABLE_NO_UPDATE_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-
-                ("-moz-handler-disabled", MozHandlerDisabled, IN_HANDLER_DISABLED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-                ("-moz-handler-blocked", MozHandlerBlocked, IN_HANDLER_BLOCKED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-                ("-moz-handler-crashed", MozHandlerCrashed, IN_HANDLER_CRASHED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-handler-noplugins", MozHandlerNoPlugins, IN_HANDLER_NOPLUGINS, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
 
                 ("-moz-math-increment-script-level", MozMathIncrementScriptLevel, IN_INCREMENT_SCRIPT_LEVEL_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 397e6e491c9..ce873ed45f7 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2033,9 +2033,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozUIValid |
             NonTSPseudoClass::MozBroken |
             NonTSPseudoClass::MozLoading |
-            NonTSPseudoClass::MozHandlerBlocked |
-            NonTSPseudoClass::MozHandlerDisabled |
-            NonTSPseudoClass::MozHandlerCrashed |
             NonTSPseudoClass::Required |
             NonTSPseudoClass::Optional |
             NonTSPseudoClass::ReadOnly |
@@ -2046,9 +2043,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozDevtoolsHighlighted |
             NonTSPseudoClass::MozStyleeditorTransitioning |
             NonTSPseudoClass::MozFocusRing |
-            NonTSPseudoClass::MozHandlerClickToPlay |
-            NonTSPseudoClass::MozHandlerVulnerableUpdatable |
-            NonTSPseudoClass::MozHandlerVulnerableNoUpdate |
             NonTSPseudoClass::MozHandlerNoPlugins |
             NonTSPseudoClass::MozMathIncrementScriptLevel |
             NonTSPseudoClass::InRange |

From 65a06d5003c25d25748892ba7cedf8d151a7721b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 7 Jan 2021 04:15:01 +0000
Subject: [PATCH 101/156] style: Support full <image> syntax in
 list-style-image as per spec.

This allows supporting image-set(), etc, and simplifies the bullet frame
code significantly, too thanks to two changes:

  * Instead of manually managing the image request, use the CSS image
    loader, with the `REQUEST_REQUIRES_REFLOW` flag, to handle image
    loads correctly. This didn't exist when this code was initially
    implemented, but we can nicely use it now.

  * Instead of re-implementing another WebRender command-builder thing,
    we can just reuse the nsImageRenderer code.

Differential Revision: https://phabricator.services.mozilla.com/D100774
---
 components/style/properties/longhands/list.mako.rs  | 6 +++---
 components/style/properties/shorthands/list.mako.rs | 8 ++++----
 components/style/values/computed/url.rs             | 3 ---
 components/style/values/specified/url.rs            | 3 ---
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/components/style/properties/longhands/list.mako.rs b/components/style/properties/longhands/list.mako.rs
index b50b961c735..82e226418cd 100644
--- a/components/style/properties/longhands/list.mako.rs
+++ b/components/style/properties/longhands/list.mako.rs
@@ -54,10 +54,10 @@ ${helpers.single_keyword(
 
 ${helpers.predefined_type(
     "list-style-image",
-    "url::ImageUrlOrNone",
+    "Image",
     engines="gecko servo-2013 servo-2020",
-    initial_value="computed::url::ImageUrlOrNone::none()",
-    initial_specified_value="specified::url::ImageUrlOrNone::none()",
+    initial_value="computed::Image::None",
+    initial_specified_value="specified::Image::None",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-lists/#propdef-list-style-image",
     servo_restyle_damage="rebuild_and_reflow",
diff --git a/components/style/properties/shorthands/list.mako.rs b/components/style/properties/shorthands/list.mako.rs
index fd8cd8b1c23..f757c368cfa 100644
--- a/components/style/properties/shorthands/list.mako.rs
+++ b/components/style/properties/shorthands/list.mako.rs
@@ -10,7 +10,7 @@
                     derive_serialize="True"
                     spec="https://drafts.csswg.org/css-lists/#propdef-list-style">
     use crate::properties::longhands::{list_style_image, list_style_position, list_style_type};
-    use crate::values::specified::url::ImageUrlOrNone;
+    use crate::values::specified::Image;
 
     pub fn parse_value<'i, 't>(
         context: &ParserContext,
@@ -69,7 +69,7 @@
             (true, 2, None, None) => {
                 Ok(expanded! {
                     list_style_position: position,
-                    list_style_image: ImageUrlOrNone::none(),
+                    list_style_image: Image::None,
                     list_style_type: ListStyleType::None,
                 })
             }
@@ -83,14 +83,14 @@
             (true, 1, Some(list_style_type), None) => {
                 Ok(expanded! {
                     list_style_position: position,
-                    list_style_image: ImageUrlOrNone::none(),
+                    list_style_image: Image::None,
                     list_style_type: list_style_type,
                 })
             }
             (true, 1, None, None) => {
                 Ok(expanded! {
                     list_style_position: position,
-                    list_style_image: ImageUrlOrNone::none(),
+                    list_style_image: Image::None,
                     list_style_type: ListStyleType::None,
                 })
             }
diff --git a/components/style/values/computed/url.rs b/components/style/values/computed/url.rs
index 4815281a3bf..9f0d8f5bb3e 100644
--- a/components/style/values/computed/url.rs
+++ b/components/style/values/computed/url.rs
@@ -13,6 +13,3 @@ pub use crate::servo::url::{ComputedImageUrl, ComputedUrl};
 
 /// Computed <url> | <none>
 pub type UrlOrNone = GenericUrlOrNone<ComputedUrl>;
-
-/// Computed image <url> | <none>
-pub type ImageUrlOrNone = GenericUrlOrNone<ComputedImageUrl>;
diff --git a/components/style/values/specified/url.rs b/components/style/values/specified/url.rs
index b0a69b362d8..17ecbe0d5e8 100644
--- a/components/style/values/specified/url.rs
+++ b/components/style/values/specified/url.rs
@@ -13,6 +13,3 @@ pub use crate::servo::url::{SpecifiedImageUrl, SpecifiedUrl};
 
 /// Specified <url> | <none>
 pub type UrlOrNone = GenericUrlOrNone<SpecifiedUrl>;
-
-/// Specified image <url> | <none>
-pub type ImageUrlOrNone = GenericUrlOrNone<SpecifiedImageUrl>;

From f27003c810b45f850a18c55b0f8134a9e52a3082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 16 Jul 2020 18:51:21 +0000
Subject: [PATCH 102/156] style: Teach style_derive's map_type_params about
 mapping self correctly.

Consider the following:

struct Complex<T> {
    something: T,
    #[compute(field_bound)]
    something_else: Generic<Self, T>,
}

That will generate:

impl<T> ToComputedValue for Complex<T>
where
    T: ToComputedValue,
    Generic<Self, T>: ToComputedValue<ComputedValue = Generic<Self, <T as ToComputedValue>::ComputedValue>>,
{
    // ...
}

That last clause is obviously incorrect. map_type_params correctly maps
the T, but it should know also about Self.

Ideally we could just do the same as for T and do:

    <Self as ToComputedValue>::ComputedValue

But that doesn't quite work, because we are in that implementation of
the trait, and the compiler rightfully complains about we don't yet
knowing the computed type. So we need to pass it explicitly, which is
simple enough, if a bit annoying.

Differential Revision: https://phabricator.services.mozilla.com/D83816
---
 components/derive_common/cg.rs                | 30 +++++++++++--------
 .../style_derive/specified_value_info.rs      |  1 +
 components/style_derive/to_computed_value.rs  |  4 ++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/components/derive_common/cg.rs b/components/derive_common/cg.rs
index c51c0d7750b..8abfd871496 100644
--- a/components/derive_common/cg.rs
+++ b/components/derive_common/cg.rs
@@ -154,19 +154,19 @@ pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &
     segment.into()
 }
 
-pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], f: &mut F) -> Type
+pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Type
 where
     F: FnMut(&Ident) -> Type,
 {
     match *ty {
         Type::Slice(ref inner) => Type::from(TypeSlice {
-            elem: Box::new(map_type_params(&inner.elem, params, f)),
+            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
             ..inner.clone()
         }),
         Type::Array(ref inner) => {
             //ref ty, ref expr) => {
             Type::from(TypeArray {
-                elem: Box::new(map_type_params(&inner.elem, params, f)),
+                elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
                 ..inner.clone()
             })
         },
@@ -175,7 +175,7 @@ where
             elems: inner
                 .elems
                 .iter()
-                .map(|ty| map_type_params(&ty, params, f))
+                .map(|ty| map_type_params(&ty, params, self_type, f))
                 .collect(),
             ..inner.clone()
         }),
@@ -187,10 +187,16 @@ where
                 if params.iter().any(|ref param| &param.ident == ident) {
                     return f(ident);
                 }
+                if ident == "Self" {
+                    return Type::from(TypePath {
+                        qself: None,
+                        path: self_type.clone(),
+                    });
+                }
             }
             Type::from(TypePath {
                 qself: None,
-                path: map_type_params_in_path(path, params, f),
+                path: map_type_params_in_path(path, params, self_type, f),
             })
         },
         Type::Path(TypePath {
@@ -198,25 +204,25 @@ where
             ref path,
         }) => Type::from(TypePath {
             qself: qself.as_ref().map(|qself| QSelf {
-                ty: Box::new(map_type_params(&qself.ty, params, f)),
+                ty: Box::new(map_type_params(&qself.ty, params, self_type, f)),
                 position: qself.position,
                 ..qself.clone()
             }),
-            path: map_type_params_in_path(path, params, f),
+            path: map_type_params_in_path(path, params, self_type, f),
         }),
         Type::Paren(ref inner) => Type::from(TypeParen {
-            elem: Box::new(map_type_params(&inner.elem, params, f)),
+            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
             ..inner.clone()
         }),
         Type::Group(ref inner) => Type::from(TypeGroup {
-            elem: Box::new(map_type_params(&inner.elem, params, f)),
+            elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
             ..inner.clone()
         }),
         ref ty => panic!("type {:?} cannot be mapped yet", ty),
     }
 }
 
-fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], f: &mut F) -> Path
+fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Path
 where
     F: FnMut(&Ident) -> Type,
 {
@@ -236,11 +242,11 @@ where
                                 .map(|arg| match arg {
                                     ty @ &GenericArgument::Lifetime(_) => ty.clone(),
                                     &GenericArgument::Type(ref data) => {
-                                        GenericArgument::Type(map_type_params(data, params, f))
+                                        GenericArgument::Type(map_type_params(data, params, self_type, f))
                                     },
                                     &GenericArgument::Binding(ref data) => {
                                         GenericArgument::Binding(Binding {
-                                            ty: map_type_params(&data.ty, params, f),
+                                            ty: map_type_params(&data.ty, params, self_type, f),
                                             ..data.clone()
                                         })
                                     },
diff --git a/components/style_derive/specified_value_info.rs b/components/style_derive/specified_value_info.rs
index b9473c64008..c477f4a7cf9 100644
--- a/components/style_derive/specified_value_info.rs
+++ b/components/style_derive/specified_value_info.rs
@@ -112,6 +112,7 @@ pub fn derive(mut input: DeriveInput) -> TokenStream {
 
     let name = &input.ident;
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
     quote! {
         impl #impl_generics style_traits::SpecifiedValueInfo for #name #ty_generics
         #where_clause
diff --git a/components/style_derive/to_computed_value.rs b/components/style_derive/to_computed_value.rs
index 5fe2be5af75..5e0f595c6b9 100644
--- a/components/style_derive/to_computed_value.rs
+++ b/components/style_derive/to_computed_value.rs
@@ -47,12 +47,15 @@ pub fn derive_to_value(
         cg::add_predicate(&mut where_clause, parse_quote!(#param: #trait_path));
     }
 
+    let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
+
     let mut add_field_bound = |binding: &BindingInfo| {
         let ty = &binding.ast().ty;
 
         let output_type = cg::map_type_params(
             ty,
             &params,
+            &computed_value_type,
             &mut |ident| parse_quote!(<#ident as #trait_path>::#output_type_name),
         );
 
@@ -142,7 +145,6 @@ pub fn derive_to_value(
 
     input.generics.where_clause = where_clause;
     let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-    let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
 
     let impl_ = trait_impl(from_body, to_body);
 

From 4f28a8cd312be1e59db24b4a1c90d759ab2b525b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 7 Jan 2021 04:15:29 +0000
Subject: [PATCH 103/156] style: Implement parsing and serialization for most
 of image-set().

This implements the basic image-set notation without the format()
function (for simplicity).

There's a remaining serialization issue (we should probably skip 1x
resolutions), but that's fine for now, I'll address this in a follow-up
when the feature is testable.

The intention is to do the image selection at computed value time
(keeping a selected index or such), but same, follow-up.

This also fixes an issue where the cors-mode for -moz-image-rect and
cross-fade() was getting ignored when parsing.

Differential Revision: https://phabricator.services.mozilla.com/D100640
---
 components/style/gecko/url.rs                 |   5 +-
 components/style/values/computed/image.rs     |   4 +-
 .../style/values/computed/resolution.rs       |   2 +
 components/style/values/generics/image.rs     |  47 ++++++--
 components/style/values/specified/image.rs    | 109 +++++++++++++++---
 .../style/values/specified/resolution.rs      |   2 +-
 6 files changed, 139 insertions(+), 30 deletions(-)

diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs
index ac7c9359b00..00f4ed8266b 100644
--- a/components/style/gecko/url.rs
+++ b/components/style/gecko/url.rs
@@ -285,14 +285,15 @@ impl SpecifiedImageUrl {
 
     /// Provides an alternate method for parsing that associates the URL
     /// with anonymous CORS headers.
-    pub fn parse_with_cors_anonymous<'i, 't>(
+    pub fn parse_with_cors_mode<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         Ok(SpecifiedImageUrl(SpecifiedUrl::parse_with_cors_mode(
             context,
             input,
-            CorsMode::Anonymous,
+            cors_mode,
         )?))
     }
 }
diff --git a/components/style/values/computed/image.rs b/components/style/values/computed/image.rs
index 4eda2e91e21..6f609bdf6fa 100644
--- a/components/style/values/computed/image.rs
+++ b/components/style/values/computed/image.rs
@@ -15,7 +15,7 @@ use crate::values::computed::NumberOrPercentage;
 use crate::values::computed::{Angle, Color, Context};
 use crate::values::computed::{
     AngleOrPercentage, LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage,
-    ToComputedValue,
+    ToComputedValue, Resolution,
 };
 use crate::values::generics::image::{self as generic, GradientCompatMode};
 use crate::values::specified::image::LineDirection as SpecifiedLineDirection;
@@ -26,7 +26,7 @@ use style_traits::{CssWriter, ToCss};
 
 /// Computed values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl, Color, Percentage>;
+pub type Image = generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl, Color, Percentage, Resolution>;
 
 /// Computed values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
diff --git a/components/style/values/computed/resolution.rs b/components/style/values/computed/resolution.rs
index c08fe2be1a3..72580635b81 100644
--- a/components/style/values/computed/resolution.rs
+++ b/components/style/values/computed/resolution.rs
@@ -13,6 +13,8 @@ use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
 
 /// A computed `<resolution>`.
+#[repr(C)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem)]
 pub struct Resolution(CSSFloat);
 
 impl Resolution {
diff --git a/components/style/values/generics/image.rs b/components/style/values/generics/image.rs
index f92eca8ae2f..ff6498d668a 100644
--- a/components/style/values/generics/image.rs
+++ b/components/style/values/generics/image.rs
@@ -22,7 +22,7 @@ use style_traits::{CssWriter, ToCss};
     Clone, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem,
 )]
 #[repr(C, u8)]
-pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage> {
+pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage, Resolution> {
     /// `none` variant.
     None,
     /// A `<url()>` image.
@@ -51,6 +51,9 @@ pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage> {
     /// and store images directly inside of cross-fade instead of
     /// boxing them there.
     CrossFade(Box<GenericCrossFade<Self, Color, Percentage>>),
+
+    /// An `image-set()` function.
+    ImageSet(Box<GenericImageSet<Self, Resolution>>),
 }
 
 pub use self::GenericImage as Image;
@@ -135,6 +138,36 @@ pub use self::GenericCrossFade as CrossFade;
 pub use self::GenericCrossFadeElement as CrossFadeElement;
 pub use self::GenericCrossFadeImage as CrossFadeImage;
 
+/// https://drafts.csswg.org/css-images-4/#image-set-notation
+#[css(comma, function = "image-set")]
+#[derive(
+    Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss, ToComputedValue,
+)]
+#[repr(C)]
+pub struct GenericImageSet<Image, Resolution> {
+    /// All of the image and resolution pairs.
+    #[css(iterable)]
+    pub items: crate::OwnedSlice<GenericImageSetItem<Image, Resolution>>,
+}
+
+/// An optional percent and a cross fade image.
+#[derive(
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
+)]
+#[repr(C)]
+pub struct GenericImageSetItem<Image, Resolution> {
+    /// `<image>`. `<string>` is converted to `Image::Url` at parse time.
+    pub image: Image,
+    /// The `<resolution>`.
+    ///
+    /// TODO: Skip serialization if it is 1x.
+    pub resolution: Resolution,
+    // TODO: type() function.
+}
+
+pub use self::GenericImageSet as ImageSet;
+pub use self::GenericImageSetItem as ImageSetItem;
+
 /// A CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
 #[derive(Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem)]
@@ -377,26 +410,23 @@ pub struct GenericMozImageRect<NumberOrPercentage, MozImageRectUrl> {
 
 pub use self::GenericMozImageRect as MozImageRect;
 
-impl<G, R, U, C, P> fmt::Debug for Image<G, R, U, C, P>
+impl<G, R, U, C, P, Resolution> fmt::Debug for Image<G, R, U, C, P, Resolution>
 where
-    G: ToCss,
-    R: ToCss,
-    U: ToCss,
-    C: ToCss,
-    P: ToCss,
+    Image<G, R, U, C, P, Resolution>: ToCss,
 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         self.to_css(&mut CssWriter::new(f))
     }
 }
 
-impl<G, R, U, C, P> ToCss for Image<G, R, U, C, P>
+impl<G, R, U, C, P, Resolution> ToCss for Image<G, R, U, C, P, Resolution>
 where
     G: ToCss,
     R: ToCss,
     U: ToCss,
     C: ToCss,
     P: ToCss,
+    Resolution: ToCss,
 {
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
     where
@@ -415,6 +445,7 @@ where
                 serialize_atom_identifier(selector, dest)?;
                 dest.write_str(")")
             },
+            Image::ImageSet(ref is) => is.to_css(dest),
             Image::CrossFade(ref cf) => cf.to_css(dest),
         }
     }
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 86b01cb5a31..1a0711231b3 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -9,6 +9,7 @@
 
 use crate::custom_properties::SpecifiedValue;
 use crate::parser::{Parse, ParserContext};
+use crate::stylesheets::CorsMode;
 use crate::values::generics::image::PaintWorklet;
 use crate::values::generics::image::{
     self as generic, Circle, Ellipse, GradientCompatMode, ShapeExtent,
@@ -20,7 +21,7 @@ use crate::values::specified::position::{Position, PositionComponent, Side};
 use crate::values::specified::url::SpecifiedImageUrl;
 use crate::values::specified::{
     Angle, AngleOrPercentage, Color, Length, LengthPercentage, NonNegativeLength,
-    NonNegativeLengthPercentage,
+    NonNegativeLengthPercentage, Resolution
 };
 use crate::values::specified::{Number, NumberOrPercentage, Percentage};
 use crate::Atom;
@@ -35,7 +36,7 @@ use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss};
 
 /// Specified values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::Image<Gradient, MozImageRect, SpecifiedImageUrl, Color, Percentage>;
+pub type Image = generic::Image<Gradient, MozImageRect, SpecifiedImageUrl, Color, Percentage, Resolution>;
 
 /// Specified values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
@@ -61,6 +62,12 @@ pub type CrossFadeImage = generic::CrossFadeImage<Image, Color>;
 /// A specified percentage or nothing.
 pub type PercentOrNone = generic::PercentOrNone<Percentage>;
 
+/// `image-set()`
+pub type ImageSet = generic::ImageSet<Image, Resolution>;
+
+/// Each of the arguments to `image-set()`
+pub type ImageSetItem = generic::ImageSetItem<Image, Resolution>;
+
 type LengthPercentageItemList = crate::OwnedSlice<generic::GradientItem<Color, LengthPercentage>>;
 
 #[cfg(feature = "gecko")]
@@ -73,6 +80,16 @@ fn cross_fade_enabled() -> bool {
     false
 }
 
+#[cfg(feature = "gecko")]
+fn image_set_enabled() -> bool {
+    static_prefs::pref!("layout.css.image-set.enabled")
+}
+
+#[cfg(feature = "servo")]
+fn image_set_enabled() -> bool {
+    false
+}
+
 impl SpecifiedValueInfo for Gradient {
     const SUPPORTED_TYPES: u8 = CssType::GRADIENT;
 
@@ -110,6 +127,16 @@ impl<Image, Color, Percentage> SpecifiedValueInfo for generic::CrossFade<Image,
     }
 }
 
+impl<Image, Resolution> SpecifiedValueInfo for generic::ImageSet<Image, Resolution> {
+    const SUPPORTED_TYPES: u8 = 0;
+
+    fn collect_completion_keywords(f: KeywordsCollectFn) {
+        if image_set_enabled() {
+            f(&["image-set"]);
+        }
+    }
+}
+
 /// A specified gradient line direction.
 ///
 /// FIXME(emilio): This should be generic over Angle.
@@ -152,18 +179,33 @@ impl Parse for Image {
     fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
+    ) -> Result<Image, ParseError<'i>> {
+        Image::parse_with_cors_mode(context, input, CorsMode::None)
+    }
+}
+
+impl Image {
+    fn parse_with_cors_mode<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Image, ParseError<'i>> {
         if input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
             return Ok(generic::Image::None);
         }
-        if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse(context, input)) {
+        if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode)) {
             return Ok(generic::Image::Url(url));
         }
         if let Ok(gradient) = input.try_parse(|i| Gradient::parse(context, i)) {
             return Ok(generic::Image::Gradient(Box::new(gradient)));
         }
+        if image_set_enabled() {
+            if let Ok(is) = input.try_parse(|input| ImageSet::parse(context, input, cors_mode)) {
+                return Ok(generic::Image::ImageSet(Box::new(is)));
+            }
+        }
         if cross_fade_enabled() {
-            if let Ok(cf) = input.try_parse(|input| CrossFade::parse(context, input)) {
+            if let Ok(cf) = input.try_parse(|input| CrossFade::parse(context, input, cors_mode)) {
                 return Ok(generic::Image::CrossFade(Box::new(cf)));
             }
         }
@@ -175,7 +217,7 @@ impl Parse for Image {
         }
         #[cfg(feature = "gecko")]
         {
-            if let Ok(image_rect) = input.try_parse(|input| MozImageRect::parse(context, input)) {
+            if let Ok(image_rect) = input.try_parse(|input| MozImageRect::parse(context, input, cors_mode)) {
                 return Ok(generic::Image::Rect(Box::new(image_rect)));
             }
             Ok(generic::Image::Element(Image::parse_element(input)?))
@@ -214,40 +256,37 @@ impl Image {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Image, ParseError<'i>> {
-        if let Ok(url) =
-            input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_anonymous(context, input))
-        {
-            return Ok(generic::Image::Url(url));
-        }
-        Self::parse(context, input)
+        Self::parse_with_cors_mode(context, input, CorsMode::Anonymous)
     }
 }
 
-impl Parse for CrossFade {
+impl CrossFade {
     /// cross-fade() = cross-fade( <cf-image># )
     fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         input.expect_function_matching("cross-fade")?;
         let elements = input.parse_nested_block(|input| {
-            input.parse_comma_separated(|input| CrossFadeElement::parse(context, input))
+            input.parse_comma_separated(|input| CrossFadeElement::parse(context, input, cors_mode))
         })?;
         let elements = crate::OwnedSlice::from(elements);
         Ok(Self { elements })
     }
 }
 
-impl Parse for CrossFadeElement {
+impl CrossFadeElement {
     /// <cf-image> = <percentage>? && [ <image> | <color> ]
     fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         // Try and parse a leading percent sign.
         let mut percent = PercentOrNone::parse_or_none(context, input);
         // Parse the image
-        let image = CrossFadeImage::parse(context, input)?;
+        let image = CrossFadeImage::parse(context, input, cors_mode)?;
         // Try and parse a trailing percent sign.
         if percent == PercentOrNone::None {
             percent = PercentOrNone::parse_or_none(context, input);
@@ -274,6 +313,40 @@ impl PercentOrNone {
     }
 }
 
+impl ImageSet {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
+    ) -> Result<Self, ParseError<'i>> {
+        input.expect_function_matching("image-set")?;
+        let items = input.parse_nested_block(|input| {
+            input.parse_comma_separated(|input| ImageSetItem::parse(context, input, cors_mode))
+        })?;
+        Ok(Self {
+            items: items.into()
+        })
+    }
+}
+
+impl ImageSetItem {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
+    ) -> Result<Self, ParseError<'i>> {
+        let image = match input.try_parse(|i| i.expect_url_or_string()) {
+            Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(url.as_ref().into(), context, cors_mode)),
+            Err(..) => Image::parse(context, input)?,
+        };
+        let resolution = input.try_parse(|input| Resolution::parse(context, input)).unwrap_or(Resolution::X(1.0));
+        Ok(Self {
+            image,
+            resolution,
+        })
+    }
+}
+
 impl Parse for Gradient {
     fn parse<'i, 't>(
         context: &ParserContext,
@@ -1043,11 +1116,12 @@ impl Parse for PaintWorklet {
     }
 }
 
-impl Parse for MozImageRect {
+impl MozImageRect {
     #[cfg(not(feature = "gecko"))]
     fn parse<'i, 't>(
         _context: &ParserContext,
         input: &mut Parser<'i, 't>,
+        _cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         Err(input.new_error_for_next_token())
     }
@@ -1056,6 +1130,7 @@ impl Parse for MozImageRect {
     fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         input.try_parse(|i| i.expect_function_matching("-moz-image-rect"))?;
         input.parse_nested_block(|i| {
@@ -1063,7 +1138,7 @@ impl Parse for MozImageRect {
             let url = SpecifiedImageUrl::parse_from_string(
                 string.as_ref().to_owned(),
                 context,
-                crate::stylesheets::CorsMode::None,
+                cors_mode,
             );
             i.expect_comma()?;
             let top = NumberOrPercentage::parse_non_negative(context, i)?;
diff --git a/components/style/values/specified/resolution.rs b/components/style/values/specified/resolution.rs
index f8854226b53..e8674cffaaa 100644
--- a/components/style/values/specified/resolution.rs
+++ b/components/style/values/specified/resolution.rs
@@ -12,7 +12,7 @@ use cssparser::{Parser, Token};
 use style_traits::{ParseError, StyleParseErrorKind};
 
 /// A specified resolution.
-#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss, ToShmem)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss, ToShmem, SpecifiedValueInfo)]
 pub enum Resolution {
     /// Dots per inch.
     #[css(dimension)]

From 7ddd46aba4c1704f576811ac6e8b5ba2cf904b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 8 Jan 2021 09:54:23 +0000
Subject: [PATCH 104/156] style: Implement source selection for image-set.

This is based on the logic in ResponsiveImageSelector::SelectImage (just
simplified because there's no viewport-dependent widths here).

Differential Revision: https://phabricator.services.mozilla.com/D100698
---
 components/style/values/computed/image.rs  | 75 ++++++++++++++++++----
 components/style/values/generics/image.rs  |  8 ++-
 components/style/values/specified/image.rs |  1 +
 3 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/components/style/values/computed/image.rs b/components/style/values/computed/image.rs
index 6f609bdf6fa..307b7fa0c2f 100644
--- a/components/style/values/computed/image.rs
+++ b/components/style/values/computed/image.rs
@@ -18,7 +18,7 @@ use crate::values::computed::{
     ToComputedValue, Resolution,
 };
 use crate::values::generics::image::{self as generic, GradientCompatMode};
-use crate::values::specified::image::LineDirection as SpecifiedLineDirection;
+use crate::values::specified::image as specified;
 use crate::values::specified::position::{HorizontalPositionKeyword, VerticalPositionKeyword};
 use std::f32::consts::PI;
 use std::fmt::{self, Write};
@@ -64,13 +64,66 @@ pub enum LineDirection {
     Corner(HorizontalPositionKeyword, VerticalPositionKeyword),
 }
 
+/// The computed value for an `image-set()` image.
+pub type ImageSet = generic::GenericImageSet<Image, Resolution>;
+
+impl ToComputedValue for specified::ImageSet {
+    type ComputedValue = ImageSet;
+
+    fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
+        let items = self.items.to_computed_value(context);
+        let dpr = context.device().device_pixel_ratio().get();
+        let mut selected_index = 0;
+        let mut selected_resolution = items[0].resolution.dppx();
+        for (i, item) in items.iter().enumerate().skip(1) {
+            let candidate_resolution = item.resolution.dppx();
+
+            // https://drafts.csswg.org/css-images-4/#image-set-notation:
+            //
+            //     Make a UA-specific choice of which to load, based on whatever
+            //     criteria deemed relevant (such as the resolution of the
+            //     display, connection speed, etc).
+            //
+            // For now, select the lowest resolution greater than display
+            // density, otherwise the greatest resolution available
+            let better_candidate = || {
+                if selected_resolution < dpr && candidate_resolution > selected_resolution {
+                    return true;
+                }
+                if candidate_resolution < selected_resolution && candidate_resolution >= dpr {
+                    return true;
+                }
+                false
+            };
+
+            if better_candidate() {
+                selected_index = i;
+                selected_resolution = candidate_resolution;
+            }
+        }
+
+        ImageSet {
+            selected_index,
+            items,
+        }
+    }
+
+    fn from_computed_value(computed: &Self::ComputedValue) -> Self {
+        Self {
+            selected_index: 0,
+            items: ToComputedValue::from_computed_value(&computed.items),
+        }
+    }
+}
+
+
 /// Computed values for `-moz-image-rect(...)`.
 #[cfg(feature = "gecko")]
 pub type MozImageRect = generic::GenericMozImageRect<NumberOrPercentage, ComputedImageUrl>;
 
 /// Empty enum on non-gecko
 #[cfg(not(feature = "gecko"))]
-pub type MozImageRect = crate::values::specified::image::MozImageRect;
+pub type MozImageRect = specified::MozImageRect;
 
 impl generic::LineDirection for LineDirection {
     fn points_downwards(&self, compat_mode: GradientCompatMode) -> bool {
@@ -116,28 +169,28 @@ impl generic::LineDirection for LineDirection {
     }
 }
 
-impl ToComputedValue for SpecifiedLineDirection {
+impl ToComputedValue for specified::LineDirection {
     type ComputedValue = LineDirection;
 
     fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
         match *self {
-            SpecifiedLineDirection::Angle(ref angle) => {
+            specified::LineDirection::Angle(ref angle) => {
                 LineDirection::Angle(angle.to_computed_value(context))
             },
-            SpecifiedLineDirection::Horizontal(x) => LineDirection::Horizontal(x),
-            SpecifiedLineDirection::Vertical(y) => LineDirection::Vertical(y),
-            SpecifiedLineDirection::Corner(x, y) => LineDirection::Corner(x, y),
+            specified::LineDirection::Horizontal(x) => LineDirection::Horizontal(x),
+            specified::LineDirection::Vertical(y) => LineDirection::Vertical(y),
+            specified::LineDirection::Corner(x, y) => LineDirection::Corner(x, y),
         }
     }
 
     fn from_computed_value(computed: &Self::ComputedValue) -> Self {
         match *computed {
             LineDirection::Angle(ref angle) => {
-                SpecifiedLineDirection::Angle(ToComputedValue::from_computed_value(angle))
+                specified::LineDirection::Angle(ToComputedValue::from_computed_value(angle))
             },
-            LineDirection::Horizontal(x) => SpecifiedLineDirection::Horizontal(x),
-            LineDirection::Vertical(y) => SpecifiedLineDirection::Vertical(y),
-            LineDirection::Corner(x, y) => SpecifiedLineDirection::Corner(x, y),
+            LineDirection::Horizontal(x) => specified::LineDirection::Horizontal(x),
+            LineDirection::Vertical(y) => specified::LineDirection::Vertical(y),
+            LineDirection::Corner(x, y) => specified::LineDirection::Corner(x, y),
         }
     }
 }
diff --git a/components/style/values/generics/image.rs b/components/style/values/generics/image.rs
index ff6498d668a..b4301cd1b29 100644
--- a/components/style/values/generics/image.rs
+++ b/components/style/values/generics/image.rs
@@ -53,7 +53,7 @@ pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage, Resolution>
     CrossFade(Box<GenericCrossFade<Self, Color, Percentage>>),
 
     /// An `image-set()` function.
-    ImageSet(Box<GenericImageSet<Self, Resolution>>),
+    ImageSet(#[compute(field_bound)] Box<GenericImageSet<Self, Resolution>>),
 }
 
 pub use self::GenericImage as Image;
@@ -141,10 +141,14 @@ pub use self::GenericCrossFadeImage as CrossFadeImage;
 /// https://drafts.csswg.org/css-images-4/#image-set-notation
 #[css(comma, function = "image-set")]
 #[derive(
-    Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss, ToComputedValue,
+    Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C)]
 pub struct GenericImageSet<Image, Resolution> {
+    /// The index of the selected candidate. Zero for specified values.
+    #[css(skip)]
+    pub selected_index: usize,
+
     /// All of the image and resolution pairs.
     #[css(iterable)]
     pub items: crate::OwnedSlice<GenericImageSetItem<Image, Resolution>>,
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 1a0711231b3..b8cfeb1bbbb 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -324,6 +324,7 @@ impl ImageSet {
             input.parse_comma_separated(|input| ImageSetItem::parse(context, input, cors_mode))
         })?;
         Ok(Self {
+            selected_index: 0,
             items: items.into()
         })
     }

From ad8ac70ae82e5f5c67f0a26a15fec3f33756052b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 11 Jan 2021 01:57:17 +0000
Subject: [PATCH 105/156] style: Remove the moz-focus-outer code.

This pseudo does nothing and we successfully removed it in bug 1655859
(firefox 81).

Differential Revision: https://phabricator.services.mozilla.com/D101289
---
 components/style/gecko/pseudo_element.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/style/gecko/pseudo_element.rs b/components/style/gecko/pseudo_element.rs
index ed312dc2d8f..55d202c9236 100644
--- a/components/style/gecko/pseudo_element.rs
+++ b/components/style/gecko/pseudo_element.rs
@@ -161,9 +161,6 @@ impl PseudoElement {
     /// Whether this pseudo-element is enabled for all content.
     pub fn enabled_in_content(&self) -> bool {
         match *self {
-            PseudoElement::MozFocusOuter => {
-                static_prefs::pref!("layout.css.moz-focus-outer.enabled")
-            },
             PseudoElement::FileSelectorButton => {
                 static_prefs::pref!("layout.css.file-selector-button.enabled")
             },

From 70edd2318cb623902ce44610e93dfe986d89e086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 11 Jan 2021 01:55:50 +0000
Subject: [PATCH 106/156] style: Remove layout.css.file-selector-button.enabled
 pref.

On by default since bug 1662478 (Firefox 82)

Depends on D101289

Differential Revision: https://phabricator.services.mozilla.com/D101290
---
 components/style/gecko/pseudo_element.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/style/gecko/pseudo_element.rs b/components/style/gecko/pseudo_element.rs
index 55d202c9236..5a9b955b1c8 100644
--- a/components/style/gecko/pseudo_element.rs
+++ b/components/style/gecko/pseudo_element.rs
@@ -160,12 +160,7 @@ impl PseudoElement {
 
     /// Whether this pseudo-element is enabled for all content.
     pub fn enabled_in_content(&self) -> bool {
-        match *self {
-            PseudoElement::FileSelectorButton => {
-                static_prefs::pref!("layout.css.file-selector-button.enabled")
-            },
-            _ => (self.flags() & structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS_AND_CHROME) == 0,
-        }
+        self.flags() & structs::CSS_PSEUDO_ELEMENT_ENABLED_IN_UA_SHEETS_AND_CHROME == 0
     }
 
     /// Whether this pseudo is enabled explicitly in UA sheets.

From f16305d25aea18056d8cc1423bcfe915e50204be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 11 Jan 2021 01:53:12 +0000
Subject: [PATCH 107/156] style: Remove
 layout.css.unknown-webkit-pseudo-element.

Enabled since bug 1486325 (Firefox 64).

Depends on D101290

Differential Revision: https://phabricator.services.mozilla.com/D101291
---
 .../style/gecko/pseudo_element_definition.mako.rs      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/style/gecko/pseudo_element_definition.mako.rs b/components/style/gecko/pseudo_element_definition.mako.rs
index 0478a114de9..41dff1a9468 100644
--- a/components/style/gecko/pseudo_element_definition.mako.rs
+++ b/components/style/gecko/pseudo_element_definition.mako.rs
@@ -205,12 +205,10 @@ impl PseudoElement {
                 if starts_with_ignore_ascii_case(name, "-moz-tree-") {
                     return PseudoElement::tree_pseudo_element(name, Box::new([]))
                 }
-                if static_prefs::pref!("layout.css.unknown-webkit-pseudo-element") {
-                    const WEBKIT_PREFIX: &str = "-webkit-";
-                    if starts_with_ignore_ascii_case(name, WEBKIT_PREFIX) {
-                        let part = string_as_ascii_lowercase(&name[WEBKIT_PREFIX.len()..]);
-                        return Some(PseudoElement::UnknownWebkit(part.into()));
-                    }
+                const WEBKIT_PREFIX: &str = "-webkit-";
+                if starts_with_ignore_ascii_case(name, WEBKIT_PREFIX) {
+                    let part = string_as_ascii_lowercase(&name[WEBKIT_PREFIX.len()..]);
+                    return Some(PseudoElement::UnknownWebkit(part.into()));
                 }
             }
         }

From df7ea837d8bbed29df400374e0c862c5d80bf573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 17 Jan 2021 15:07:49 +0000
Subject: [PATCH 108/156] style: Allow resource:// stylesheets to use
 chrome-only rules.

We'll use it to use @-moz-document from plaintext.css.

Differential Revision: https://phabricator.services.mozilla.com/D101516
---
 components/style/parser.rs          | 2 +-
 components/style/selector_parser.rs | 2 +-
 components/style/stylesheets/mod.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/style/parser.rs b/components/style/parser.rs
index e38602144ef..f306e2f3838 100644
--- a/components/style/parser.rs
+++ b/components/style/parser.rs
@@ -140,7 +140,7 @@ impl<'a> ParserContext<'a> {
     /// Returns whether chrome-only rules should be parsed.
     #[inline]
     pub fn chrome_rules_enabled(&self) -> bool {
-        self.url_data.is_chrome() || self.stylesheet_origin == Origin::User
+        self.url_data.chrome_rules_enabled() || self.stylesheet_origin == Origin::User
     }
 
     /// Whether we're in a user-agent stylesheet or chrome rules are enabled.
diff --git a/components/style/selector_parser.rs b/components/style/selector_parser.rs
index a8b5c3bc33e..52675abf45a 100644
--- a/components/style/selector_parser.rs
+++ b/components/style/selector_parser.rs
@@ -75,7 +75,7 @@ impl<'a> SelectorParser<'a> {
     /// Whether we're parsing selectors in a stylesheet that has chrome
     /// privilege.
     pub fn chrome_rules_enabled(&self) -> bool {
-        self.url_data.map_or(false, |d| d.is_chrome()) || self.stylesheet_origin == Origin::User
+        self.url_data.map_or(false, |d| d.chrome_rules_enabled()) || self.stylesheet_origin == Origin::User
     }
 }
 
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index 4c1e996fd5d..724a54ff127 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -154,8 +154,8 @@ impl UrlExtraData {
 
     /// True if this URL scheme is chrome.
     #[inline]
-    pub fn is_chrome(&self) -> bool {
-        self.as_ref().mIsChrome
+    pub fn chrome_rules_enabled(&self) -> bool {
+        self.as_ref().mChromeRulesEnabled
     }
 
     /// Create a reference to this `UrlExtraData` from a reference to pointer.
@@ -213,7 +213,7 @@ impl fmt::Debug for UrlExtraData {
 
         formatter
             .debug_struct("URLExtraData")
-            .field("is_chrome", &self.is_chrome())
+            .field("chrome_rules_enabled", &self.chrome_rules_enabled())
             .field(
                 "base",
                 &DebugURI(self.as_ref().mBaseURI.raw::<structs::nsIURI>()),

From 45b837399fc2b47f7e9b6acce97ed69b2f54a890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 17 Jan 2021 14:44:41 +0000
Subject: [PATCH 109/156] style: Add dark mode to plaintext.css, and a document
 rule to target plaintext documents.

We add two @-moz-document functions: `plain-text-document()`, matching the
obvious, and `unobservable-document()`, which matches a top-level document with
no opener. This is the equivalent check we do for automatic darkening of
`about:blank` here:

    https://searchfox.org/mozilla-central/rev/014fe72eaba26dcf6082fb9bbaf208f97a38594e/layout/base/PresShell.cpp#5282

The former we don't need to use, but it's nice to let user stylesheets target
plaintext documents properly (rather than relying on extensions or what not).

Note that these are not content-observable.

Add two tests: One showing that we produce different rendering when on dark
mode, and one showing that we produce the same one from an iframe, regardless
of dark mode.

Depends on D101517

Differential Revision: https://phabricator.services.mozilla.com/D101518
---
 components/style/stylesheets/document_rule.rs | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/components/style/stylesheets/document_rule.rs b/components/style/stylesheets/document_rule.rs
index ce326808b63..736dddb502e 100644
--- a/components/style/stylesheets/document_rule.rs
+++ b/components/style/stylesheets/document_rule.rs
@@ -110,6 +110,13 @@ pub enum DocumentMatchingFunction {
     /// Matching function for a media document.
     #[css(function)]
     MediaDocument(MediaDocumentKind),
+    /// Matching function for a plain-text document.
+    #[css(function)]
+    PlainTextDocument(()),
+    /// Matching function for a document that can be observed by other content
+    /// documents.
+    #[css(function)]
+    UnobservableDocument(()),
 }
 
 macro_rules! parse_quoted_or_unquoted_string {
@@ -161,6 +168,21 @@ impl DocumentMatchingFunction {
                     Ok(DocumentMatchingFunction::MediaDocument(kind))
                 })
             },
+
+            "plain-text-document" => {
+                input.parse_nested_block(|input| {
+                    input.expect_exhausted()?;
+                    Ok(DocumentMatchingFunction::PlainTextDocument(()))
+                })
+            },
+
+            "unobservable-document" => {
+                input.parse_nested_block(|input| {
+                    input.expect_exhausted()?;
+                    Ok(DocumentMatchingFunction::UnobservableDocument(()))
+                })
+            },
+
             _ => {
                 Err(location.new_custom_error(
                     StyleParseErrorKind::UnexpectedFunction(function.clone())
@@ -184,6 +206,8 @@ impl DocumentMatchingFunction {
             DocumentMatchingFunction::MediaDocument(_) => {
                 GeckoDocumentMatchingFunction::MediaDocument
             },
+            DocumentMatchingFunction::PlainTextDocument(..) => GeckoDocumentMatchingFunction::PlainTextDocument,
+            DocumentMatchingFunction::UnobservableDocument(..) => GeckoDocumentMatchingFunction::UnobservableDocument,
         };
 
         let pattern = nsCStr::from(match *self {
@@ -197,6 +221,8 @@ impl DocumentMatchingFunction {
                 MediaDocumentKind::Plugin => "plugin",
                 MediaDocumentKind::Video => "video",
             },
+            DocumentMatchingFunction::PlainTextDocument(()) |
+            DocumentMatchingFunction::UnobservableDocument(()) => "",
         });
         unsafe { Gecko_DocumentRule_UseForPresentation(device.document(), &*pattern, func) }
     }
@@ -253,10 +279,9 @@ impl DocumentCondition {
 
     #[cfg(feature = "gecko")]
     fn allowed_in(&self, context: &ParserContext) -> bool {
-        use crate::stylesheets::Origin;
         use static_prefs::pref;
 
-        if context.stylesheet_origin != Origin::Author {
+        if context.in_ua_or_chrome_sheet() {
             return true;
         }
 

From eec92977f7f710e231cd003c284755f3ebf32035 Mon Sep 17 00:00:00 2001
From: longsonr <longsonr@gmail.com>
Date: Mon, 18 Jan 2021 08:11:05 +0000
Subject: [PATCH 110/156] style: remove svg.transform-box.enabled pref

It's been default true since Firefox 55 via bug 1208550

Differential Revision: https://phabricator.services.mozilla.com/D102093
---
 components/style/properties/longhands/box.mako.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index ca93fd916ea..cf30afaa1ae 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -573,7 +573,6 @@ ${helpers.single_keyword(
     "border-box fill-box view-box",
     engines="gecko",
     gecko_enum_prefix="StyleGeometryBox",
-    gecko_pref="svg.transform-box.enabled",
     spec="https://drafts.csswg.org/css-transforms/#transform-box",
     gecko_inexhaustive="True",
     animation_value_type="discrete",

From f4a8acc5582cb777229291b22b5a8522058ed522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 21 Jan 2021 06:14:16 +0000
Subject: [PATCH 111/156] style: Add a non-native-theme media query.

Differential Revision: https://phabricator.services.mozilla.com/D102457
---
 components/style/gecko/media_features.rs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index d8a7f67157e..03fea6e51e4 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -537,6 +537,16 @@ fn eval_moz_print_preview(
     query_value.map_or(is_print_preview, |v| v == is_print_preview)
 }
 
+fn eval_moz_non_native_content_theme(
+    device: &Device,
+    query_value: Option<bool>,
+    _: Option<RangeOrOperator>,
+) -> bool {
+    let non_native_theme =
+        unsafe { bindings::Gecko_MediaFeatures_ShouldAvoidNativeTheme(device.document()) };
+    query_value.map_or(non_native_theme, |v| v == non_native_theme)
+}
+
 fn eval_moz_is_resource_document(
     device: &Device,
     query_value: Option<bool>,
@@ -604,7 +614,7 @@ macro_rules! system_metric_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -808,6 +818,12 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [
         Evaluator::BoolInteger(eval_moz_print_preview),
         ParsingRequirements::CHROME_AND_UA_ONLY,
     ),
+    feature!(
+        atom!("-moz-non-native-content-theme"),
+        AllowsRanges::No,
+        Evaluator::BoolInteger(eval_moz_non_native_content_theme),
+        ParsingRequirements::CHROME_AND_UA_ONLY,
+    ),
     system_metric_feature!(atom!("-moz-scrollbar-start-backward")),
     system_metric_feature!(atom!("-moz-scrollbar-start-forward")),
     system_metric_feature!(atom!("-moz-scrollbar-end-backward")),

From 1927a676fd655081f343add831e3acc98eaf87b4 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Mon, 25 Jan 2021 11:53:57 +0000
Subject: [PATCH 112/156] Bug 1687239 part 3 - Remove the PluginProblem UA
 Widget and related CSS pseudos.

Differential Revision: https://phabricator.services.mozilla.com/D102901
---
 components/style/gecko/non_ts_pseudo_class_list.rs | 2 --
 components/style/gecko/wrapper.rs                  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 7bffe282a72..7ed67725df0 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -66,8 +66,6 @@ macro_rules! apply_non_ts_list {
 
                 ("-moz-autofill-preview", MozAutofillPreview, IN_AUTOFILL_PREVIEW_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
 
-                ("-moz-handler-noplugins", MozHandlerNoPlugins, IN_HANDLER_NOPLUGINS, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
-
                 ("-moz-math-increment-script-level", MozMathIncrementScriptLevel, IN_INCREMENT_SCRIPT_LEVEL_STATE, _),
 
                 ("required", Required, IN_REQUIRED_STATE, _),
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index ce873ed45f7..3a4bd8d759c 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2043,7 +2043,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozDevtoolsHighlighted |
             NonTSPseudoClass::MozStyleeditorTransitioning |
             NonTSPseudoClass::MozFocusRing |
-            NonTSPseudoClass::MozHandlerNoPlugins |
             NonTSPseudoClass::MozMathIncrementScriptLevel |
             NonTSPseudoClass::InRange |
             NonTSPseudoClass::OutOfRange |

From 96c08d78cf24ccd50c2a2837b43e1724155c1f0f Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Wed, 27 Jan 2021 00:47:56 +0000
Subject: [PATCH 113/156] style: Add page-size parsing to Servo

Differential Revision: https://phabricator.services.mozilla.com/D102360
---
 components/style/values/computed/mod.rs   |   2 +
 components/style/values/computed/page.rs  |  14 +++
 components/style/values/generics/mod.rs   |   3 +
 components/style/values/generics/page.rs  | 114 ++++++++++++++++++++++
 components/style/values/specified/mod.rs  |   2 +
 components/style/values/specified/page.rs |  48 +++++++++
 6 files changed, 183 insertions(+)
 create mode 100644 components/style/values/computed/page.rs
 create mode 100644 components/style/values/generics/page.rs
 create mode 100644 components/style/values/specified/page.rs

diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 4d9d553bdb9..f5266b1cc4b 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -71,6 +71,7 @@ pub use self::list::MozListReversed;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
+pub use self::page::{Orientation, PaperSize, PageSize};
 pub use self::percentage::{NonNegativePercentage, Percentage};
 pub use self::position::AspectRatio;
 pub use self::position::{
@@ -118,6 +119,7 @@ pub mod length_percentage;
 pub mod list;
 pub mod motion;
 pub mod outline;
+pub mod page;
 pub mod percentage;
 pub mod position;
 pub mod rect;
diff --git a/components/style/values/computed/page.rs b/components/style/values/computed/page.rs
new file mode 100644
index 00000000000..4dd8804596e
--- /dev/null
+++ b/components/style/values/computed/page.rs
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Computed @page at-rule properties
+
+use crate::values::computed::length::NonNegativeLength;
+use crate::values::generics;
+use crate::values::generics::size::Size2D;
+
+pub use generics::page::Orientation;
+pub use generics::page::PaperSize;
+/// Computed value of the @page size descriptor
+pub type PageSize = generics::page::PageSize<Size2D<NonNegativeLength>>;
diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs
index 09a99432e17..1bcfa23352d 100644
--- a/components/style/values/generics/mod.rs
+++ b/components/style/values/generics/mod.rs
@@ -31,6 +31,7 @@ pub mod grid;
 pub mod image;
 pub mod length;
 pub mod motion;
+pub mod page;
 pub mod position;
 pub mod rect;
 pub mod size;
@@ -292,3 +293,5 @@ impl<L> ClipRectOrAuto<L> {
         matches!(*self, ClipRectOrAuto::Auto)
     }
 }
+
+pub use page::PageSize;
diff --git a/components/style/values/generics/page.rs b/components/style/values/generics/page.rs
new file mode 100644
index 00000000000..fc771062333
--- /dev/null
+++ b/components/style/values/generics/page.rs
@@ -0,0 +1,114 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! @page at-rule properties
+
+/// Page size names.
+///
+/// https://drafts.csswg.org/css-page-3/#typedef-page-size-page-size
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(u8)]
+pub enum PaperSize {
+    /// ISO A5 media
+    A5,
+    /// ISO A4 media
+    A4,
+    /// ISO A3 media
+    A3,
+    /// ISO B5 media
+    B5,
+    /// ISO B4 media
+    B4,
+    /// JIS B5 media
+    JisB5,
+    /// JIS B4 media
+    JisB4,
+    /// North American Letter size
+    Letter,
+    /// North American Legal size
+    Legal,
+    /// North American Ledger size
+    Ledger,
+}
+
+/// Paper orientation
+///
+/// https://drafts.csswg.org/css-page-3/#page-size-prop
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(u8)]
+pub enum Orientation {
+    /// Portrait orientation
+    Portrait,
+    /// Landscape orientation
+    Landscape,
+}
+
+/// Page size property
+///
+/// https://drafts.csswg.org/css-page-3/#page-size-prop
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(C, u8)]
+pub enum PageSize<S> {
+    /// Page dimensions.
+    Size(S),
+    /// Paper size with no orientation.
+    PaperSize(PaperSize),
+    /// An orientation with no size.
+    Orientation(Orientation),
+    /// Paper size by name, with an orientation.
+    PaperSizeAndOrientation(PaperSize, Orientation),
+    /// `auto` value.
+    Auto,
+}
+
+impl<S> PageSize<S> {
+    /// `auto` value.
+    #[inline]
+    pub fn auto() -> Self {
+        PageSize::Auto
+    }
+
+    /// Whether this is the `auto` value.
+    #[inline]
+    pub fn is_auto(&self) -> bool {
+        matches!(*self, PageSize::Auto)
+    }
+}
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index d6d763686e7..76d383a07ee 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -70,6 +70,7 @@ pub use self::list::MozListReversed;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
+pub use self::page::{Orientation, PaperSize, PageSize};
 pub use self::percentage::Percentage;
 pub use self::position::AspectRatio;
 pub use self::position::{
@@ -121,6 +122,7 @@ pub mod list;
 pub mod motion;
 pub mod outline;
 pub mod percentage;
+pub mod page;
 pub mod position;
 pub mod rect;
 pub mod resolution;
diff --git a/components/style/values/specified/page.rs b/components/style/values/specified/page.rs
new file mode 100644
index 00000000000..81684e114a3
--- /dev/null
+++ b/components/style/values/specified/page.rs
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Specified @page at-rule properties
+
+use crate::parser::{Parse, ParserContext};
+use crate::values::generics;
+use crate::values::generics::size::Size2D;
+use crate::values::specified::length::NonNegativeLength;
+use cssparser::Parser;
+use style_traits::ParseError;
+
+pub use generics::page::Orientation;
+pub use generics::page::PaperSize;
+/// Specified value of the @page size descriptor
+pub type PageSize = generics::page::PageSize<Size2D<NonNegativeLength>>;
+
+impl Parse for PageSize {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        // Try to parse as <page-size> [ <orientation> ]
+        if let Ok(paper_size) = input.try_parse(PaperSize::parse) {
+            if let Ok(orientation) = input.try_parse(Orientation::parse) {
+                return Ok(PageSize::PaperSizeAndOrientation(paper_size, orientation));
+            }
+            return Ok(PageSize::PaperSize(paper_size));
+        }
+        // Try to parse as <orientation> [ <page-size> ]
+        if let Ok(orientation) = input.try_parse(Orientation::parse) {
+            if let Ok(paper_size) = input.try_parse(PaperSize::parse) {
+                return Ok(PageSize::PaperSizeAndOrientation(paper_size, orientation));
+            }
+            return Ok(PageSize::Orientation(orientation));
+        }
+        // Try to parse dimensions
+        if let Ok(size) =
+            input.try_parse(|i| Size2D::parse_with(context, i, NonNegativeLength::parse))
+        {
+            return Ok(PageSize::Size(size));
+        }
+        // auto value
+        input.expect_ident_matching("auto")?;
+        Ok(PageSize::Auto)
+    }
+}

From 4d8f55a7cb29e1042924b5725e4e8d2d560fbe67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 28 Jan 2021 22:11:54 +0000
Subject: [PATCH 114/156] style: Add a more sensible scrollbar size API to
 nsITheme, and use it to replace ScrollbarNonDisappearing.

There's no reason we should need an scrollbar box to query the size of a
scrollbar. I plan to use this in the following patch to make the size of a
resizer not vary depending on whether the container has scrollbars or not,
which is what ultimately causes the reftest failure.

Differential Revision: https://phabricator.services.mozilla.com/D103302
---
 components/style/values/specified/box.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 1e135b4757e..94785b60988 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1834,10 +1834,6 @@ pub enum Appearance {
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MozMacVibrantTitlebarLight,
 
-    /// A non-disappearing scrollbar.
-    #[css(skip)]
-    ScrollbarNonDisappearing,
-
     /// A themed focus outline (for outline:auto).
     ///
     /// This isn't exposed to CSS at all, just here for convenience.

From 84cabf24163d55b73c1c1096f022812a6455de03 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Sat, 30 Jan 2021 13:47:10 +0000
Subject: [PATCH 115/156] style: Support Grid/Flex/Table/Column layout for the
 rendered legend of a fieldset.

Differential Revision: https://phabricator.services.mozilla.com/D101555
---
 components/style/values/specified/box.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 94785b60988..2c56a32be54 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -266,6 +266,12 @@ impl Display {
         .unwrap()
     }
 
+    /// Returns the raw underlying u16 value.
+    #[inline]
+    pub const fn to_u16(&self) -> u16 {
+        self.0
+    }
+
     /// Whether this is `display: inline` (or `inline list-item`).
     #[inline]
     pub fn is_inline_flow(&self) -> bool {

From e084d8e9d2e0c69cc387286f15335b5ffc3541b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 2 Feb 2021 23:45:25 +0000
Subject: [PATCH 116/156] style: Remove focus-visible feature flag.

This shipped in 85, we can remove the feature flag now. Keep
:-moz-focusring as an alias to :focus-visible at parse time.

Differential Revision: https://phabricator.services.mozilla.com/D103752
---
 components/style/gecko/non_ts_pseudo_class_list.rs | 2 --
 components/style/gecko/selector_parser.rs          | 4 +---
 components/style/gecko/wrapper.rs                  | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 7ed67725df0..1fff5d19050 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -55,8 +55,6 @@ macro_rules! apply_non_ts_list {
                 ("fullscreen", Fullscreen, IN_FULLSCREEN_STATE, _),
                 ("-moz-modal-dialog", MozModalDialog, IN_MODAL_DIALOG_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
                 ("-moz-topmost-modal-dialog", MozTopmostModalDialog, IN_TOPMOST_MODAL_DIALOG_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
-                // TODO(emilio): This is inconsistently named (the capital R).
-                ("-moz-focusring", MozFocusRing, IN_FOCUSRING_STATE, _),
                 ("-moz-broken", MozBroken, IN_BROKEN_STATE, _),
                 ("-moz-loading", MozLoading, IN_LOADING_STATE, _),
                 ("-moz-has-dir-attr", MozHasDirAttr, IN_HAS_DIR_ATTR_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS),
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index b619f58af60..7010de45c7f 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -102,6 +102,7 @@ impl NonTSPseudoClass {
                     "-moz-full-screen" => Some(NonTSPseudoClass::Fullscreen),
                     "-moz-read-only" => Some(NonTSPseudoClass::ReadOnly),
                     "-moz-read-write" => Some(NonTSPseudoClass::ReadWrite),
+                    "-moz-focusring" => Some(NonTSPseudoClass::FocusVisible),
                     "-webkit-autofill" => Some(NonTSPseudoClass::Autofill),
                     _ => None,
                 }
@@ -136,9 +137,6 @@ impl NonTSPseudoClass {
     /// Returns whether the pseudo-class is enabled in content sheets.
     #[inline]
     fn is_enabled_in_content(&self) -> bool {
-        if let NonTSPseudoClass::FocusVisible = *self {
-            return static_prefs::pref!("layout.css.focus-visible.enabled");
-        }
         if let NonTSPseudoClass::Autofill = *self {
             return static_prefs::pref!("layout.css.autofill.enabled");
         }
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 3a4bd8d759c..80a2478e94c 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2042,7 +2042,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::MozDragOver |
             NonTSPseudoClass::MozDevtoolsHighlighted |
             NonTSPseudoClass::MozStyleeditorTransitioning |
-            NonTSPseudoClass::MozFocusRing |
             NonTSPseudoClass::MozMathIncrementScriptLevel |
             NonTSPseudoClass::InRange |
             NonTSPseudoClass::OutOfRange |

From 5fe702fa2be5a2e0ca0008b41fb8ff0967335f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 7 Feb 2021 12:33:45 +0000
Subject: [PATCH 117/156] style: Move caption-side outside of mako.

Make it an enum class, etc.

Differential Revision: https://phabricator.services.mozilla.com/D103978
---
 components/style/properties/data.py           |  1 +
 .../longhands/inherited_table.mako.rs         | 10 ++---
 components/style/values/computed/mod.rs       |  1 +
 components/style/values/computed/table.rs     |  7 +++
 components/style/values/specified/mod.rs      |  1 +
 components/style/values/specified/table.rs    | 45 +++++++++++++++++++
 6 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 components/style/values/computed/table.rs
 create mode 100644 components/style/values/specified/table.rs

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 77444f971d7..2dccca68790 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -399,6 +399,7 @@ class Longhand(object):
                 "BackgroundRepeat",
                 "BorderImageRepeat",
                 "BorderStyle",
+                "table::CaptionSide",
                 "Clear",
                 "ColumnCount",
                 "Contain",
diff --git a/components/style/properties/longhands/inherited_table.mako.rs b/components/style/properties/longhands/inherited_table.mako.rs
index 488fe5d2659..5630d1070ea 100644
--- a/components/style/properties/longhands/inherited_table.mako.rs
+++ b/components/style/properties/longhands/inherited_table.mako.rs
@@ -26,12 +26,12 @@ ${helpers.single_keyword(
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
-${helpers.single_keyword(
+${helpers.predefined_type(
     "caption-side",
-    "top bottom",
+    "table::CaptionSide",
+    "computed::table::CaptionSide::Top",
+    needs_context=False,
     engines="gecko servo-2013",
-    extra_gecko_values="right left top-outside bottom-outside",
-    needs_conversion="True",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-tables/#propdef-caption-side",
     servo_restyle_damage="rebuild_and_reflow",
@@ -46,5 +46,5 @@ ${helpers.predefined_type(
     animation_value_type="BorderSpacing",
     boxed=True,
     spec="https://drafts.csswg.org/css-tables/#propdef-border-spacing",
-    servo_restyle_damage = "reflow",
+    servo_restyle_damage="reflow",
 )}
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index f5266b1cc4b..9ac147c8279 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -125,6 +125,7 @@ pub mod position;
 pub mod rect;
 pub mod resolution;
 pub mod svg;
+pub mod table;
 pub mod text;
 pub mod time;
 pub mod transform;
diff --git a/components/style/values/computed/table.rs b/components/style/values/computed/table.rs
new file mode 100644
index 00000000000..47109e20eca
--- /dev/null
+++ b/components/style/values/computed/table.rs
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Computed types for CSS values related to tables.
+
+pub use super::specified::table::CaptionSide;
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index 76d383a07ee..f5183993f64 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -129,6 +129,7 @@ pub mod resolution;
 pub mod source_size_list;
 pub mod svg;
 pub mod svg_path;
+pub mod table;
 pub mod text;
 pub mod time;
 pub mod transform;
diff --git a/components/style/values/specified/table.rs b/components/style/values/specified/table.rs
new file mode 100644
index 00000000000..cd2bfa96c5d
--- /dev/null
+++ b/components/style/values/specified/table.rs
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Specified types for CSS values related to tables.
+
+/// Specified values for the `caption-side` property.
+///
+/// Note that despite having "physical" names, these are actually interpreted
+/// according to the table's writing-mode: Top and Bottom are treated as
+/// block-start and -end respectively, and Left and Right are treated as
+/// line-start and -end.
+///
+/// https://drafts.csswg.org/css-tables/#propdef-caption-side
+#[allow(missing_docs)]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    FromPrimitive,
+    MallocSizeOf,
+    Ord,
+    Parse,
+    PartialEq,
+    PartialOrd,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(u8)]
+pub enum CaptionSide {
+    Top,
+    Bottom,
+    #[cfg(feature = "gecko")]
+    Right,
+    #[cfg(feature = "gecko")]
+    Left,
+    #[cfg(feature = "gecko")]
+    TopOutside,
+    #[cfg(feature = "gecko")]
+    BottomOutside,
+}

From 20f5e14bf8a63178e3f326a889083c00ec416d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 9 Feb 2021 00:35:51 +0000
Subject: [PATCH 118/156] style: Remove the need for needs_context in the mako
 glue.

It's only used to disambiguate between the one-argument and the trait
version of Keyword::parse. Instead, just explicitly use the trait
version, so that we don't need to specify it.

Differential Revision: https://phabricator.services.mozilla.com/D104328
---
 components/style/properties/helpers.mako.rs   | 32 ++++++++-----------
 .../style/properties/longhands/border.mako.rs |  1 -
 .../style/properties/longhands/box.mako.rs    | 11 -------
 .../style/properties/longhands/column.mako.rs |  1 -
 .../longhands/inherited_svg.mako.rs           |  2 --
 .../longhands/inherited_table.mako.rs         |  1 -
 .../longhands/inherited_text.mako.rs          |  5 ---
 .../style/properties/longhands/list.mako.rs   |  1 -
 .../style/properties/longhands/ui.mako.rs     |  1 -
 .../properties/shorthands/border.mako.rs      |  2 --
 .../style/properties/shorthands/box.mako.rs   |  6 ----
 11 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs
index 1e6c1400a18..3b8e10b5125 100644
--- a/components/style/properties/helpers.mako.rs
+++ b/components/style/properties/helpers.mako.rs
@@ -9,7 +9,7 @@
 %>
 
 <%def name="predefined_type(name, type, initial_value, parse_method='parse',
-            needs_context=True, vector=False,
+            vector=False,
             computed_type=None, initial_specified_value=None,
             allow_quirks='No', allow_empty=False, **kwargs)">
     <%def name="predefined_type_inner(name, type, initial_value, parse_method)">
@@ -45,10 +45,10 @@
         ) -> Result<SpecifiedValue, ParseError<'i>> {
             % if allow_quirks != "No":
             specified::${type}::${parse_method}_quirky(context, input, AllowQuirks::${allow_quirks})
-            % elif needs_context:
+            % elif parse_method != "parse":
             specified::${type}::${parse_method}(context, input)
             % else:
-            specified::${type}::${parse_method}(input)
+            <specified::${type} as crate::parser::Parse>::parse(context, input)
             % endif
         }
     </%def>
@@ -971,25 +971,21 @@
     name,
     first_property,
     second_property,
-    parser_function,
-    needs_context=True,
+    parser_function='crate::parser::Parse::parse',
     **kwargs
 )">
 <%call expr="self.shorthand(name, sub_properties=' '.join([first_property, second_property]), **kwargs)">
     #[allow(unused_imports)]
     use crate::parser::Parse;
+    #[allow(unused_imports)]
     use crate::values::specified;
 
     pub fn parse_value<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Longhands, ParseError<'i>> {
-        let parse_one = |_c: &ParserContext, input: &mut Parser<'i, 't>| {
-            % if needs_context:
-            ${parser_function}(_c, input)
-            % else:
-            ${parser_function}(input)
-            % endif
+        let parse_one = |c: &ParserContext, input: &mut Parser<'i, 't>| -> Result<crate::properties::longhands::${to_rust_ident(first_property)}::SpecifiedValue, ParseError<'i>> {
+            ${parser_function}(c, input)
         };
 
         let first = parse_one(context, input)?;
@@ -1017,26 +1013,26 @@
 </%call>
 </%def>
 
-<%def name="four_sides_shorthand(name, sub_property_pattern, parser_function,
-                                 needs_context=True, allow_quirks='No', **kwargs)">
+<%def name="four_sides_shorthand(name, sub_property_pattern,
+                                 parser_function='crate::parser::Parse::parse',
+                                 allow_quirks='No', **kwargs)">
     <% sub_properties=' '.join(sub_property_pattern % side for side in PHYSICAL_SIDES) %>
     <%call expr="self.shorthand(name, sub_properties=sub_properties, **kwargs)">
         #[allow(unused_imports)]
         use crate::parser::Parse;
         use crate::values::generics::rect::Rect;
+        #[allow(unused_imports)]
         use crate::values::specified;
 
         pub fn parse_value<'i, 't>(
             context: &ParserContext,
             input: &mut Parser<'i, 't>,
         ) -> Result<Longhands, ParseError<'i>> {
-            let rect = Rect::parse_with(context, input, |_c, i| {
+            let rect = Rect::parse_with(context, input, |c, i| -> Result<crate::properties::longhands::${to_rust_ident(sub_property_pattern % "top")}::SpecifiedValue, ParseError<'i>> {
             % if allow_quirks != "No":
-                ${parser_function}_quirky(_c, i, specified::AllowQuirks::${allow_quirks})
-            % elif needs_context:
-                ${parser_function}(_c, i)
+                ${parser_function}_quirky(c, i, specified::AllowQuirks::${allow_quirks})
             % else:
-                ${parser_function}(i)
+                ${parser_function}(c, i)
             % endif
             })?;
             Ok(expanded! {
diff --git a/components/style/properties/longhands/border.mako.rs b/components/style/properties/longhands/border.mako.rs
index 1c4eae16939..11ed63a438a 100644
--- a/components/style/properties/longhands/border.mako.rs
+++ b/components/style/properties/longhands/border.mako.rs
@@ -42,7 +42,6 @@
         animation_value_type="discrete" if not is_logical else "none",
         logical=is_logical,
         logical_group="border-style",
-        needs_context=False,
     )}
 
     ${helpers.predefined_type(
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index cf30afaa1ae..810368be155 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -71,7 +71,6 @@ ${helpers.predefined_type(
     initial_specified_value="specified::Float::None",
     spec="https://drafts.csswg.org/css-box/#propdef-float",
     animation_value_type="discrete",
-    needs_context=False,
     servo_restyle_damage="rebuild_and_reflow",
     gecko_ffi_name="mFloat",
 )}
@@ -82,7 +81,6 @@ ${helpers.predefined_type(
     "computed::Clear::None",
     engines="gecko servo-2013",
     animation_value_type="discrete",
-    needs_context=False,
     gecko_ffi_name="mBreakType",
     spec="https://drafts.csswg.org/css-box/#propdef-clear",
     servo_restyle_damage="rebuild_and_reflow",
@@ -117,7 +115,6 @@ ${helpers.single_keyword(
         "computed::OverflowClipBox::PaddingBox",
         engines="gecko",
         enabled_in="ua",
-        needs_context=False,
         gecko_pref="layout.css.overflow-clip-box.enabled",
         animation_value_type="discrete",
         spec="Internal, may be standardized in the future: \
@@ -136,7 +133,6 @@ ${helpers.single_keyword(
         logical=logical,
         animation_value_type="discrete",
         spec="https://drafts.csswg.org/css-overflow-3/#propdef-{}".format(full_name),
-        needs_context=False,
         servo_restyle_damage = "reflow",
         gecko_pref="layout.css.overflow-logical.enabled" if logical else None,
     )}
@@ -148,7 +144,6 @@ ${helpers.predefined_type(
     "computed::OverflowAnchor::Auto",
     engines="gecko",
     initial_specified_value="specified::OverflowAnchor::Auto",
-    needs_context=False,
     gecko_pref="layout.css.scroll-anchoring.enabled",
     spec="https://drafts.csswg.org/css-scroll-anchoring/#exclusion-api",
     animation_value_type="discrete",
@@ -468,7 +463,6 @@ ${helpers.predefined_type(
         "OverscrollBehavior",
         "computed::OverscrollBehavior::Auto",
         engines="gecko",
-        needs_context=False,
         logical_group="overscroll-behavior",
         logical=logical,
         gecko_pref="layout.css.overscroll-behavior.enabled",
@@ -494,7 +488,6 @@ ${helpers.predefined_type(
     "BreakBetween",
     "computed::BreakBetween::Auto",
     engines="gecko",
-    needs_context=False,
     spec="https://drafts.csswg.org/css-break/#propdef-break-after",
     animation_value_type="discrete",
 )}
@@ -504,7 +497,6 @@ ${helpers.predefined_type(
     "BreakBetween",
     "computed::BreakBetween::Auto",
     engines="gecko",
-    needs_context=False,
     spec="https://drafts.csswg.org/css-break/#propdef-break-before",
     animation_value_type="discrete",
 )}
@@ -514,7 +506,6 @@ ${helpers.predefined_type(
     "BreakWithin",
     "computed::BreakWithin::Auto",
     engines="gecko",
-    needs_context=False,
     alias="page-break-inside",
     spec="https://drafts.csswg.org/css-break/#propdef-break-inside",
     animation_value_type="discrete",
@@ -528,7 +519,6 @@ ${helpers.predefined_type(
     "computed::Resize::None",
     engines="gecko",
     animation_value_type="discrete",
-    needs_context=False,
     gecko_ffi_name="mResize",
     spec="https://drafts.csswg.org/css-ui/#propdef-resize",
 )}
@@ -584,7 +574,6 @@ ${helpers.predefined_type(
     "computed::TransformStyle::Flat",
     engines="gecko servo-2013 servo-2020",
     spec="https://drafts.csswg.org/css-transforms-2/#transform-style-property",
-    needs_context=False,
     extra_prefixes=transform_extra_prefixes,
     flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
     animation_value_type="discrete",
diff --git a/components/style/properties/longhands/column.mako.rs b/components/style/properties/longhands/column.mako.rs
index 1974e82d137..2d9a116d30b 100644
--- a/components/style/properties/longhands/column.mako.rs
+++ b/components/style/properties/longhands/column.mako.rs
@@ -84,7 +84,6 @@ ${helpers.predefined_type(
     "BorderStyle",
     "computed::BorderStyle::None",
     engines="gecko",
-    needs_context=False,
     initial_specified_value="specified::BorderStyle::None",
     extra_prefixes="moz:layout.css.prefixes.columns",
     animation_value_type="discrete",
diff --git a/components/style/properties/longhands/inherited_svg.mako.rs b/components/style/properties/longhands/inherited_svg.mako.rs
index 73db38e0042..820b2d25d04 100644
--- a/components/style/properties/longhands/inherited_svg.mako.rs
+++ b/components/style/properties/longhands/inherited_svg.mako.rs
@@ -72,7 +72,6 @@ ${helpers.predefined_type(
     "FillRule",
     "Default::default()",
     engines="gecko",
-    needs_context=False,
     animation_value_type="discrete",
     spec="https://www.w3.org/TR/SVG11/painting.html#FillRuleProperty",
 )}
@@ -165,7 +164,6 @@ ${helpers.predefined_type(
     "FillRule",
     "Default::default()",
     engines="gecko",
-    needs_context=False,
     animation_value_type="discrete",
     spec="https://www.w3.org/TR/SVG11/masking.html#ClipRuleProperty",
 )}
diff --git a/components/style/properties/longhands/inherited_table.mako.rs b/components/style/properties/longhands/inherited_table.mako.rs
index 5630d1070ea..b38df2423a1 100644
--- a/components/style/properties/longhands/inherited_table.mako.rs
+++ b/components/style/properties/longhands/inherited_table.mako.rs
@@ -30,7 +30,6 @@ ${helpers.predefined_type(
     "caption-side",
     "table::CaptionSide",
     "computed::table::CaptionSide::Top",
-    needs_context=False,
     engines="gecko servo-2013",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-tables/#propdef-caption-side",
diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs
index c108bbcc75f..3720119ce88 100644
--- a/components/style/properties/longhands/inherited_text.mako.rs
+++ b/components/style/properties/longhands/inherited_text.mako.rs
@@ -83,7 +83,6 @@ ${helpers.predefined_type(
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap",
     alias="word-wrap",
-    needs_context=False,
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
@@ -95,7 +94,6 @@ ${helpers.predefined_type(
     servo_2020_pref="layout.2020.unimplemented",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text/#propdef-word-break",
-    needs_context=False,
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
@@ -143,7 +141,6 @@ ${helpers.predefined_type(
     "text-align-last",
     "TextAlignLast",
     "computed::text::TextAlignLast::Auto",
-    needs_context=False,
     engines="gecko",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text/#propdef-text-align-last",
@@ -286,7 +283,6 @@ ${helpers.predefined_type(
     engines="gecko",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text-3/#line-break-property",
-    needs_context=False,
 )}
 
 // CSS Compatibility
@@ -402,7 +398,6 @@ ${helpers.predefined_type(
     "TextDecorationSkipInk",
     "computed::TextDecorationSkipInk::Auto",
     engines="gecko",
-    needs_context=False,
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text-decor-4/#text-decoration-skip-ink-property",
 )}
diff --git a/components/style/properties/longhands/list.mako.rs b/components/style/properties/longhands/list.mako.rs
index 82e226418cd..b9a11a574f5 100644
--- a/components/style/properties/longhands/list.mako.rs
+++ b/components/style/properties/longhands/list.mako.rs
@@ -91,7 +91,6 @@ ${helpers.predefined_type(
     engines="gecko",
     animation_value_type="discrete",
     enabled_in="ua",
-    needs_context=False,
     spec="Internal implementation detail for <ol reversed>",
     servo_restyle_damage="rebuild_and_reflow",
 )}
diff --git a/components/style/properties/longhands/ui.mako.rs b/components/style/properties/longhands/ui.mako.rs
index e205c82da99..1dfdfcc1a73 100644
--- a/components/style/properties/longhands/ui.mako.rs
+++ b/components/style/properties/longhands/ui.mako.rs
@@ -37,7 +37,6 @@ ${helpers.predefined_type(
     engines="gecko",
     extra_prefixes="moz webkit",
     animation_value_type="discrete",
-    needs_context=False,
     spec="https://drafts.csswg.org/css-ui-4/#propdef-user-select",
 )}
 
diff --git a/components/style/properties/shorthands/border.mako.rs b/components/style/properties/shorthands/border.mako.rs
index 7419ad90217..c204c878444 100644
--- a/components/style/properties/shorthands/border.mako.rs
+++ b/components/style/properties/shorthands/border.mako.rs
@@ -17,9 +17,7 @@ ${helpers.four_sides_shorthand(
 ${helpers.four_sides_shorthand(
     "border-style",
     "border-%s-style",
-    "specified::BorderStyle::parse",
     engines="gecko servo-2013 servo-2020",
-    needs_context=False,
     spec="https://drafts.csswg.org/css-backgrounds/#border-style",
 )}
 
diff --git a/components/style/properties/shorthands/box.mako.rs b/components/style/properties/shorthands/box.mako.rs
index e1b94e52ac3..24cb850b971 100644
--- a/components/style/properties/shorthands/box.mako.rs
+++ b/components/style/properties/shorthands/box.mako.rs
@@ -8,10 +8,8 @@ ${helpers.two_properties_shorthand(
     "overflow",
     "overflow-x",
     "overflow-y",
-    "specified::Overflow::parse",
     engines="gecko servo-2013 servo-2020",
     flags="SHORTHAND_IN_GETCS",
-    needs_context=False,
     spec="https://drafts.csswg.org/css-overflow/#propdef-overflow",
 )}
 
@@ -19,10 +17,8 @@ ${helpers.two_properties_shorthand(
     "overflow-clip-box",
     "overflow-clip-box-block",
     "overflow-clip-box-inline",
-    "specified::OverflowClipBox::parse",
     engines="gecko",
     enabled_in="ua",
-    needs_context=False,
     gecko_pref="layout.css.overflow-clip-box.enabled",
     spec="Internal, may be standardized in the future "
          "(https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-clip-box)",
@@ -310,9 +306,7 @@ ${helpers.two_properties_shorthand(
     "overscroll-behavior",
     "overscroll-behavior-x",
     "overscroll-behavior-y",
-    "specified::OverscrollBehavior::parse",
     engines="gecko",
-    needs_context=False,
     gecko_pref="layout.css.overscroll-behavior.enabled",
     spec="https://wicg.github.io/overscroll-behavior/#overscroll-behavior-properties",
 )}

From db03b2cf8eabb25e7c7e655329c750cbca7d74ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 10 Feb 2021 15:30:40 +0000
Subject: [PATCH 119/156] style: Normalize NaN to zero as a result of calc().

Differential Revision: https://phabricator.services.mozilla.com/D104563
---
 components/style/values/computed/length.rs            |  6 ++++++
 components/style/values/computed/length_percentage.rs |  8 ++++----
 components/style/values/mod.rs                        | 11 +++++++++++
 components/style/values/specified/calc.rs             |  6 ++++--
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
index 2cca9f71b78..0908273b88c 100644
--- a/components/style/values/computed/length.rs
+++ b/components/style/values/computed/length.rs
@@ -224,6 +224,12 @@ impl CSSPixelLength {
         CSSPixelLength(px)
     }
 
+    /// Returns a normalized (NaN turned to zero) version of this length.
+    #[inline]
+    pub fn normalized(self) -> Self {
+        Self::new(crate::values::normalize(self.0))
+    }
+
     /// Scale the length by a given amount.
     #[inline]
     pub fn scale_by(self, scale: CSSFloat) -> Self {
diff --git a/components/style/values/computed/length_percentage.rs b/components/style/values/computed/length_percentage.rs
index 1889481ad84..22fd9b5f8c3 100644
--- a/components/style/values/computed/length_percentage.rs
+++ b/components/style/values/computed/length_percentage.rs
@@ -263,10 +263,10 @@ impl LengthPercentage {
             CalcNode::Leaf(l) => {
                 return match l {
                     CalcLengthPercentageLeaf::Length(l) => {
-                        Self::new_length(Length::new(clamping_mode.clamp(l.px())))
+                        Self::new_length(Length::new(clamping_mode.clamp(l.px())).normalized())
                     },
                     CalcLengthPercentageLeaf::Percentage(p) => {
-                        Self::new_percent(Percentage(clamping_mode.clamp(p.0)))
+                        Self::new_percent(Percentage(clamping_mode.clamp(crate::values::normalize(p.0))))
                     },
                 }
             },
@@ -378,7 +378,7 @@ impl LengthPercentage {
     pub fn resolve(&self, basis: Length) -> Length {
         match self.unpack() {
             Unpacked::Length(l) => l,
-            Unpacked::Percentage(p) => Length::new(basis.px() * p.0),
+            Unpacked::Percentage(p) => (basis * p.0).normalized(),
             Unpacked::Calc(ref c) => c.resolve(basis),
         }
     }
@@ -707,7 +707,7 @@ impl CalcLengthPercentage {
                 })
             })
             .unwrap();
-        Length::new(self.clamping_mode.clamp(px))
+        Length::new(self.clamping_mode.clamp(px)).normalized()
     }
 }
 
diff --git a/components/style/values/mod.rs b/components/style/values/mod.rs
index 6c088535d7f..9587b52648d 100644
--- a/components/style/values/mod.rs
+++ b/components/style/values/mod.rs
@@ -35,6 +35,17 @@ pub mod specified;
 /// A CSS float value.
 pub type CSSFloat = f32;
 
+/// Normalizes a float value to zero after a set of operations that might turn
+/// it into NaN.
+#[inline]
+pub fn normalize(v: CSSFloat) -> CSSFloat {
+    if v.is_nan() {
+        0.0
+    } else {
+        v
+    }
+}
+
 /// A CSS integer value.
 pub type CSSInteger = i32;
 
diff --git a/components/style/values/specified/calc.rs b/components/style/values/specified/calc.rs
index fa5415ee3b8..eb8b2fe4217 100644
--- a/components/style/values/specified/calc.rs
+++ b/components/style/values/specified/calc.rs
@@ -482,7 +482,7 @@ impl CalcNode {
             Leaf::Time(ref t) => Ok(t.seconds()),
             _ => Err(()),
         })?;
-        Ok(Time::from_calc(seconds))
+        Ok(Time::from_calc(crate::values::normalize(seconds)))
     }
 
     /// Tries to simplify this expression into an `Angle` value.
@@ -491,7 +491,7 @@ impl CalcNode {
             Leaf::Angle(ref angle) => Ok(angle.degrees()),
             _ => Err(()),
         })?;
-        Ok(Angle::from_calc(degrees))
+        Ok(Angle::from_calc(crate::values::normalize(degrees)))
     }
 
     /// Tries to simplify this expression into a `<number>` value.
@@ -555,6 +555,7 @@ impl CalcNode {
     ) -> Result<CSSFloat, ParseError<'i>> {
         Self::parse(context, input, function, CalcUnit::Percentage)?
             .to_percentage()
+            .map(crate::values::normalize)
             .map_err(|()| input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
     }
 
@@ -578,6 +579,7 @@ impl CalcNode {
     ) -> Result<CSSFloat, ParseError<'i>> {
         Self::parse(context, input, function, CalcUnit::Number)?
             .to_number()
+            .map(crate::values::normalize)
             .map_err(|()| input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
     }
 

From 3a64fa200636dd13a2947be0665398aadc4dff40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 10 Feb 2021 15:30:40 +0000
Subject: [PATCH 120/156] style: Normalize NaN in some other font-related
 lengths etc.

Depends on D104563

Differential Revision: https://phabricator.services.mozilla.com/D104565
---
 components/style/values/specified/font.rs   | 2 +-
 components/style/values/specified/length.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 175b0681750..93b00b27751 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -933,7 +933,7 @@ impl FontSize {
                 // If the parent font was keyword-derived, this is too.
                 // Tack the % onto the factor
                 info = compose_keyword(pc.0);
-                base_size.resolve(context) * pc.0
+                (base_size.resolve(context) * pc.0).normalized()
             },
             FontSize::Length(LengthPercentage::Calc(ref calc)) => {
                 let calc = calc.to_computed_value_zoomed(context, base_size);
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
index 4fc841aea93..2eafa9fbd60 100644
--- a/components/style/values/specified/length.rs
+++ b/components/style/values/specified/length.rs
@@ -135,7 +135,7 @@ impl FontRelativeLength {
         base_size: FontBaseSize,
     ) -> computed::Length {
         let (reference_size, length) = self.reference_font_size_and_length(context, base_size);
-        reference_size * length
+        (reference_size * length).normalized()
     }
 
     /// Return reference font size.

From 75d6be45f2584b4d38309d8ecd71225e7c4d7d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 11 Feb 2021 16:36:54 +0000
Subject: [PATCH 121/156] style: Make Linux tab bar use the darker of the
 highlight / highlighttext colors.

Some GTK themes use very soft colors for selection backgrounds, using
darker colors for the text. This makes the tab and focus outlines in the
tab bar not have sufficient contrast with usual backgrounds.

I needed to do this for bug 1690778, but it seems worth doing it on the
front-end as well.

Differential Revision: https://phabricator.services.mozilla.com/D104547
---
 components/style/values/specified/color.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/style/values/specified/color.rs b/components/style/values/specified/color.rs
index e44568fb5bf..e6491049619 100644
--- a/components/style/values/specified/color.rs
+++ b/components/style/values/specified/color.rs
@@ -227,6 +227,14 @@ pub enum SystemColor {
     MozMacActiveSourceListSelection,
     MozMacTooltip,
 
+    /// Theme accent color.
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozAccentColor,
+
+    /// Foreground for the accent color.
+    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
+    MozAccentColorForeground,
+
     /// Accent color for title bar.
     MozWinAccentcolor,
     /// Color from drawing text over the accent color.

From 4cb0a781d14c942bde404d669b1e8de20731122c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 12 Feb 2021 15:42:38 +0000
Subject: [PATCH 122/156] style: Minor cleanup of our @page rule setup.

Actually, there's not so much we can improve right now, in the sense
that:

 * We need the ::-moz-page-content pseudo-element to be able to set
 `display` on the page, since that's a style rule rather than a @page
 rule. We could get away without it.

 * Keeping the current code-path (slightly cleaned up) is less code, for
 now at least. We can have a separate code-path or what not that
 actually performs the @page rule selector-matching and what not if
 needed when we get to named pages or other page selectors. Selectors
 like :first should be pretty trivial to implement, actually.

We make some paged mode anon boxes non-inheriting anon boxes. This
allows us to share the styles and is generally nicer. They don't need to
inherit from anywhere.

We could remove the origin handling and don't look at UA rules or what
not, but it seems pretty harmless to do that.

We also fix the name of the pseudo-elements to match the capitalization.

Differential Revision: https://phabricator.services.mozilla.com/D104772
---
 components/style/stylist.rs | 42 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index 418a86bc5e0..9a2134450de 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -669,7 +669,7 @@ impl Stylist {
     {
         debug_assert!(pseudo.is_precomputed());
 
-        let rule_node = self.rule_node_for_precomputed_pseudo(guards, pseudo, None);
+        let rule_node = self.rule_node_for_precomputed_pseudo(guards, pseudo, vec![]);
 
         self.precomputed_values_for_pseudo_with_rule_node::<E>(
             guards,
@@ -709,42 +709,40 @@ impl Stylist {
         )
     }
 
-    /// Returns the rule node for given precomputed pseudo-element.
+    /// Returns the rule node for a given precomputed pseudo-element.
     ///
-    /// If we want to include extra declarations to this precomputed pseudo-element,
-    /// we can provide a vector of ApplicableDeclarationBlock to extra_declarations
-    /// argument. This is useful for providing extra @page rules.
+    /// If we want to include extra declarations to this precomputed
+    /// pseudo-element, we can provide a vector of ApplicableDeclarationBlocks
+    /// to extra_declarations. This is useful for @page rules.
     pub fn rule_node_for_precomputed_pseudo(
         &self,
         guards: &StylesheetGuards,
         pseudo: &PseudoElement,
-        extra_declarations: Option<Vec<ApplicableDeclarationBlock>>,
+        mut extra_declarations: Vec<ApplicableDeclarationBlock>,
     ) -> StrongRuleNode {
-        let mut decl;
+        let mut declarations_with_extra;
         let declarations = match self
             .cascade_data
             .user_agent
             .precomputed_pseudo_element_decls
             .get(pseudo)
         {
-            Some(declarations) => match extra_declarations {
-                Some(mut extra_decls) => {
-                    decl = declarations.clone();
-                    decl.append(&mut extra_decls);
-                    Some(&decl)
-                },
-                None => Some(declarations),
+            Some(declarations) => {
+                if !extra_declarations.is_empty() {
+                    declarations_with_extra = declarations.clone();
+                    declarations_with_extra.append(&mut extra_declarations);
+                    &*declarations_with_extra
+                } else {
+                    &**declarations
+                }
             },
-            None => extra_declarations.as_ref(),
+            None => &[],
         };
 
-        match declarations {
-            Some(decls) => self.rule_tree.insert_ordered_rules_with_important(
-                decls.into_iter().map(|a| a.clone().for_rule_tree()),
-                guards,
-            ),
-            None => self.rule_tree.root().clone(),
-        }
+        self.rule_tree.insert_ordered_rules_with_important(
+            declarations.into_iter().map(|a| a.clone().for_rule_tree()),
+            guards,
+        )
     }
 
     /// Returns the style for an anonymous box of the given type.

From 48db30f6e28d4b90d80fbf065d6bf7fa1d579fbd Mon Sep 17 00:00:00 2001
From: Pierre TALLOTTE <pierre.tallotte@viacesi.fr>
Date: Fri, 12 Feb 2021 15:45:48 +0000
Subject: [PATCH 123/156] style: Hide non-standard values of caption-side.

Differential Revision: https://phabricator.services.mozilla.com/D104321
---
 components/style/values/specified/table.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/components/style/values/specified/table.rs b/components/style/values/specified/table.rs
index cd2bfa96c5d..79136b12ca1 100644
--- a/components/style/values/specified/table.rs
+++ b/components/style/values/specified/table.rs
@@ -4,6 +4,8 @@
 
 //! Specified types for CSS values related to tables.
 
+use crate::parser::ParserContext;
+
 /// Specified values for the `caption-side` property.
 ///
 /// Note that despite having "physical" names, these are actually interpreted
@@ -12,6 +14,11 @@
 /// line-start and -end.
 ///
 /// https://drafts.csswg.org/css-tables/#propdef-caption-side
+#[cfg(feature = "gecko")]
+fn caption_side_non_standard_enabled(_context: &ParserContext) -> bool {
+    static_prefs::pref!("layout.css.caption-side-non-standard.enabled")
+}
+
 #[allow(missing_docs)]
 #[derive(
     Clone,
@@ -35,11 +42,15 @@ pub enum CaptionSide {
     Top,
     Bottom,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "caption_side_non_standard_enabled")]
     Right,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "caption_side_non_standard_enabled")]
     Left,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "caption_side_non_standard_enabled")]
     TopOutside,
     #[cfg(feature = "gecko")]
+    #[parse(condition = "caption_side_non_standard_enabled")]
     BottomOutside,
 }

From 36e6c68c9f9a40b86d9a882f5c0bd8f59858c47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 16 Feb 2021 13:38:08 +0000
Subject: [PATCH 124/156] style: Rustfmt cascade.rs.

Differential Revision: https://phabricator.services.mozilla.com/D105186
---
 components/style/properties/cascade.rs | 152 ++++++++++++-------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 8fbccd1d97f..2fefd0ba0fd 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -10,21 +10,23 @@ use crate::dom::TElement;
 use crate::font_metrics::FontMetricsProvider;
 use crate::logical_geometry::WritingMode;
 use crate::media_queries::Device;
-use crate::properties::{ComputedValues, StyleBuilder, Importance};
-use crate::properties::{LonghandId, LonghandIdSet, CSSWideKeyword, PropertyFlags};
-use crate::properties::{PropertyDeclaration, PropertyDeclarationId, DeclarationImportanceIterator};
-use crate::properties::{CASCADE_PROPERTY, ComputedValueFlags};
+use crate::properties::{CSSWideKeyword, LonghandId, LonghandIdSet, PropertyFlags};
+use crate::properties::{ComputedValueFlags, CASCADE_PROPERTY};
+use crate::properties::{ComputedValues, Importance, StyleBuilder};
+use crate::properties::{
+    DeclarationImportanceIterator, PropertyDeclaration, PropertyDeclarationId,
+};
 use crate::rule_cache::{RuleCache, RuleCacheConditions};
 use crate::rule_tree::StrongRuleNode;
 use crate::selector_parser::PseudoElement;
-use crate::stylesheets::{Origin, PerOrigin};
-use servo_arc::Arc;
 use crate::shared_lock::StylesheetGuards;
+use crate::style_adjuster::StyleAdjuster;
+use crate::stylesheets::{Origin, PerOrigin};
+use crate::values::{computed, specified};
+use servo_arc::Arc;
 use smallvec::SmallVec;
 use std::borrow::Cow;
 use std::cell::RefCell;
-use crate::style_adjuster::StyleAdjuster;
-use crate::values::{computed, specified};
 
 /// We split the cascade in two phases: 'early' properties, and 'late'
 /// properties.
@@ -121,7 +123,11 @@ struct DeclarationIterator<'a> {
 
 impl<'a> DeclarationIterator<'a> {
     #[inline]
-    fn new(rule_node: &'a StrongRuleNode, guards: &'a StylesheetGuards, pseudo: Option<&PseudoElement>) -> Self {
+    fn new(
+        rule_node: &'a StrongRuleNode,
+        guards: &'a StylesheetGuards,
+        pseudo: Option<&PseudoElement>,
+    ) -> Self {
         let restriction = pseudo.and_then(|p| p.property_restriction());
         let mut iter = Self {
             guards,
@@ -148,7 +154,6 @@ impl<'a> DeclarationIterator<'a> {
             None => DeclarationImportanceIterator::default(),
         };
     }
-
 }
 
 impl<'a> Iterator for DeclarationIterator<'a> {
@@ -282,10 +287,7 @@ where
 
     let mut declarations = SmallVec::<[(&_, Origin); 32]>::new();
     let custom_properties = {
-        let mut builder = CustomPropertiesBuilder::new(
-            inherited_style.custom_properties(),
-            device,
-        );
+        let mut builder = CustomPropertiesBuilder::new(inherited_style.custom_properties(), device);
 
         for (declaration, origin) in iter {
             declarations.push((declaration, origin));
@@ -297,9 +299,7 @@ where
         builder.build()
     };
 
-
-    let is_root_element =
-        pseudo.is_none() && element.map_or(false, |e| e.is_root());
+    let is_root_element = pseudo.is_none() && element.map_or(false, |e| e.is_root());
 
     let mut context = computed::Context {
         // We'd really like to own the rules here to avoid refcount traffic, but
@@ -326,8 +326,10 @@ where
     let using_cached_reset_properties = {
         let mut cascade = Cascade::new(&mut context, cascade_mode);
 
-        cascade
-            .apply_properties::<EarlyProperties, _>(ApplyResetProperties::Yes, declarations.iter().cloned());
+        cascade.apply_properties::<EarlyProperties, _>(
+            ApplyResetProperties::Yes,
+            declarations.iter().cloned(),
+        );
 
         cascade.compute_visited_style_if_needed(
             element,
@@ -376,7 +378,7 @@ where
 /// given initial value if nothing in other origins did override it.
 ///
 /// This is a bit of a clunky way of achieving this.
-type DeclarationsToApplyUnlessOverriden = SmallVec::<[PropertyDeclaration; 2]>;
+type DeclarationsToApplyUnlessOverriden = SmallVec<[PropertyDeclaration; 2]>;
 
 fn tweak_when_ignoring_colors(
     builder: &StyleBuilder,
@@ -399,7 +401,9 @@ fn tweak_when_ignoring_colors(
     // Don't override background-color on ::-moz-color-swatch. It is set as an
     // author style (via the style attribute), but it's pretty important for it
     // to show up for obvious reasons :)
-    if builder.pseudo.map_or(false, |p| p.is_color_swatch()) && longhand_id == LonghandId::BackgroundColor {
+    if builder.pseudo.map_or(false, |p| p.is_color_swatch()) &&
+        longhand_id == LonghandId::BackgroundColor
+    {
         return;
     }
 
@@ -442,11 +446,10 @@ fn tweak_when_ignoring_colors(
             if alpha != 0 {
                 let mut color = builder.device.default_background_color();
                 color.alpha = alpha;
-                declarations_to_apply_unless_overriden.push(
-                    PropertyDeclaration::BackgroundColor(color.into())
-                )
+                declarations_to_apply_unless_overriden
+                    .push(PropertyDeclaration::BackgroundColor(color.into()))
             }
-        }
+        },
         PropertyDeclaration::Color(ref color) => {
             // We honor color: transparent, and "revert-or-initial" otherwise.
             if alpha_channel(&color.0) == 0 {
@@ -457,9 +460,9 @@ fn tweak_when_ignoring_colors(
             // the default color. Otherwise just let it inherit through.
             if builder.get_parent_inherited_text().clone_color().alpha == 0 {
                 let color = builder.device.default_color();
-                declarations_to_apply_unless_overriden.push(
-                    PropertyDeclaration::Color(specified::ColorPropertyValue(color.into()))
-                )
+                declarations_to_apply_unless_overriden.push(PropertyDeclaration::Color(
+                    specified::ColorPropertyValue(color.into()),
+                ))
             }
         },
         // We honor url background-images if backplating.
@@ -475,8 +478,8 @@ fn tweak_when_ignoring_colors(
         _ => {},
     }
 
-    *declaration.to_mut() = PropertyDeclaration::css_wide_keyword(longhand_id, CSSWideKeyword::Revert);
-
+    *declaration.to_mut() =
+        PropertyDeclaration::css_wide_keyword(longhand_id, CSSWideKeyword::Revert);
 }
 
 struct Cascade<'a, 'b: 'a> {
@@ -542,11 +545,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
     }
 
     #[inline(always)]
-    fn apply_declaration(
-        &mut self,
-        longhand_id: LonghandId,
-        declaration: &PropertyDeclaration,
-    ) {
+    fn apply_declaration(&mut self, longhand_id: LonghandId, declaration: &PropertyDeclaration) {
         // We could (and used to) use a pattern match here, but that bloats this
         // function to over 100K of compiled code!
         //
@@ -574,8 +573,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         );
 
         let ignore_colors = !self.context.builder.device.use_document_colors();
-        let mut declarations_to_apply_unless_overriden =
-            DeclarationsToApplyUnlessOverriden::new();
+        let mut declarations_to_apply_unless_overriden = DeclarationsToApplyUnlessOverriden::new();
 
         for (declaration, origin) in declarations {
             let declaration_id = declaration.id();
@@ -604,7 +602,11 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 continue;
             }
 
-            if self.reverted.borrow_for_origin(&origin).contains(physical_longhand_id) {
+            if self
+                .reverted
+                .borrow_for_origin(&origin)
+                .contains(physical_longhand_id)
+            {
                 continue;
             }
 
@@ -654,13 +656,11 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 self.author_specified.insert(physical_longhand_id);
             }
 
-            let unset = css_wide_keyword.map_or(false, |css_wide_keyword| {
-                match css_wide_keyword {
-                    CSSWideKeyword::Unset => true,
-                    CSSWideKeyword::Inherit => inherited,
-                    CSSWideKeyword::Initial => !inherited,
-                    CSSWideKeyword::Revert => unreachable!(),
-                }
+            let unset = css_wide_keyword.map_or(false, |css_wide_keyword| match css_wide_keyword {
+                CSSWideKeyword::Unset => true,
+                CSSWideKeyword::Inherit => inherited,
+                CSSWideKeyword::Initial => !inherited,
+                CSSWideKeyword::Revert => unreachable!(),
             });
 
             if unset {
@@ -756,7 +756,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             // styles, we cache the unvisited style instead. We still do
             // need to set the caching dependencies properly if present
             // though, so the cache conditions need to match.
-            /* rule_cache = */ None,
+            None, // rule_cache
             &mut *self.context.rule_cache_conditions.borrow_mut(),
             element,
         );
@@ -775,13 +775,18 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             if let Some(svg) = builder.get_svg_if_mutated() {
                 svg.fill_arrays();
             }
-
         }
 
-        if self.author_specified.contains_any(LonghandIdSet::border_background_properties()) {
+        if self
+            .author_specified
+            .contains_any(LonghandIdSet::border_background_properties())
+        {
             builder.add_flags(ComputedValueFlags::HAS_AUTHOR_SPECIFIED_BORDER_BACKGROUND);
         }
-        if self.author_specified.contains_any(LonghandIdSet::padding_properties()) {
+        if self
+            .author_specified
+            .contains_any(LonghandIdSet::padding_properties())
+        {
             builder.add_flags(ComputedValueFlags::HAS_AUTHOR_SPECIFIED_PADDING);
         }
 
@@ -818,8 +823,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         //
         // Note that all the properties involved are non-inherited, so we don't
         // need to do anything else other than just copying the bits over.
-        let reset_props_bits =
-            ComputedValueFlags::HAS_AUTHOR_SPECIFIED_BORDER_BACKGROUND |
+        let reset_props_bits = ComputedValueFlags::HAS_AUTHOR_SPECIFIED_BORDER_BACKGROUND |
             ComputedValueFlags::HAS_AUTHOR_SPECIFIED_PADDING;
         builder.add_flags(cached_style.flags & reset_props_bits);
 
@@ -838,8 +842,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         use crate::gecko_bindings::bindings;
         use crate::values::computed::font::GenericFontFamily;
 
-        if !self.seen.contains(LonghandId::XLang) &&
-           !self.seen.contains(LonghandId::FontFamily) {
+        if !self.seen.contains(LonghandId::XLang) && !self.seen.contains(LonghandId::FontFamily) {
             return;
         }
 
@@ -851,7 +854,10 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             // System fonts are all right, and should have the default font type
             // set to none already, so bail out early.
             if font.mFont.systemFont {
-                debug_assert_eq!(font.mFont.fontlist.mDefaultFontType, GenericFontFamily::None);
+                debug_assert_eq!(
+                    font.mFont.fontlist.mDefaultFontType,
+                    GenericFontFamily::None
+                );
                 return;
             }
 
@@ -867,13 +873,12 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             // and we don't have a generic family already (or we're using
             // cursive or fantasy, since they're ignored, see bug 789788), and
             // we have a generic family to actually replace it with.
-            let prioritize_user_fonts =
-                !use_document_fonts &&
+            let prioritize_user_fonts = !use_document_fonts &&
                 matches!(
                     font.mGenericID,
                     GenericFontFamily::None |
-                    GenericFontFamily::Fantasy |
-                    GenericFontFamily::Cursive
+                        GenericFontFamily::Fantasy |
+                        GenericFontFamily::Cursive
                 ) &&
                 default_font_type != GenericFontFamily::None;
 
@@ -887,9 +892,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         let font = builder.mutate_font().gecko_mut();
         font.mFont.fontlist.mDefaultFontType = default_font_type;
         if prioritize_user_fonts {
-            unsafe {
-                bindings::Gecko_nsStyleFont_PrioritizeUserFonts(font, default_font_type)
-            }
+            unsafe { bindings::Gecko_nsStyleFont_PrioritizeUserFonts(font, default_font_type) }
         }
     }
 
@@ -899,8 +902,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         use crate::values::computed::ToComputedValue;
         use crate::values::specified;
 
-        if !self.seen.contains(LonghandId::XLang) &&
-           !self.seen.contains(LonghandId::FontFamily) {
+        if !self.seen.contains(LonghandId::XLang) && !self.seen.contains(LonghandId::FontFamily) {
             return;
         }
 
@@ -912,7 +914,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 _ => {
                     self.context.for_non_inherited_property = None;
                     specified::FontSize::Keyword(info).to_computed_value(self.context)
-                }
+                },
             };
 
             if font.gecko().mScriptUnconstrainedSize == new_size.size {
@@ -933,9 +935,10 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         use crate::values::generics::NonNegative;
 
         if !self.seen.contains(LonghandId::XLang) &&
-           !self.seen.contains(LonghandId::FontFamily) &&
-           !self.seen.contains(LonghandId::MozMinFontSizeRatio) &&
-           !self.seen.contains(LonghandId::FontSize) {
+            !self.seen.contains(LonghandId::FontFamily) &&
+            !self.seen.contains(LonghandId::MozMinFontSizeRatio) &&
+            !self.seen.contains(LonghandId::FontSize)
+        {
             return;
         }
 
@@ -943,10 +946,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         let min_font_size = {
             let font = builder.get_font().gecko();
             let min_font_size = unsafe {
-                bindings::Gecko_nsStyleFont_ComputeMinSize(
-                    font,
-                    builder.device.document(),
-                )
+                bindings::Gecko_nsStyleFont_ComputeMinSize(font, builder.device.document())
             };
 
             if font.mFont.size.0 >= min_font_size {
@@ -998,8 +998,9 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         use crate::values::generics::NonNegative;
 
         if !self.seen.contains(LonghandId::MathDepth) &&
-           !self.seen.contains(LonghandId::MozScriptMinSize) &&
-           !self.seen.contains(LonghandId::MozScriptSizeMultiplier) {
+            !self.seen.contains(LonghandId::MozScriptMinSize) &&
+            !self.seen.contains(LonghandId::MozScriptSizeMultiplier)
+        {
             return;
         }
 
@@ -1013,8 +1014,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             let font = builder.get_font().gecko();
             let parent_font = builder.get_parent_font().gecko();
 
-            let delta =
-                font.mMathDepth.saturating_sub(parent_font.mMathDepth);
+            let delta = font.mMathDepth.saturating_sub(parent_font.mMathDepth);
 
             if delta == 0 {
                 return;
@@ -1049,7 +1049,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 // of em units), use that instead.
                 (
                     new_size.min(new_unconstrained_size.max(min)),
-                    new_unconstrained_size
+                    new_unconstrained_size,
                 )
             }
         };

From 1b18b06186a5a69c5f7cbbfade1cdc61a23a7ebc Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Tue, 16 Feb 2021 21:36:57 +0000
Subject: [PATCH 125/156] style: Switch properties to use a bitfield to
 determine validity in rules.

This doesn't use a full bitmap for every single rule type, as we only expect
that keyframe, page, and style rules will be checked.

Differential Revision: https://phabricator.services.mozilla.com/D104949
---
 components/style/properties/data.py           | 54 ++++++++++---------
 .../style/properties/longhands/box.mako.rs    | 15 +++---
 .../style/properties/longhands/margin.mako.rs |  4 +-
 .../style/properties/properties.mako.rs       | 20 ++++---
 .../style/properties/shorthands/box.mako.rs   |  2 +-
 .../properties/shorthands/margin.mako.rs      |  3 +-
 6 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 2dccca68790..0c64658c13f 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -37,6 +37,32 @@ SYSTEM_FONT_LONGHANDS = """font_family font_size font_style
                            font_feature_settings font_variation_settings
                            font_optical_sizing""".split()
 
+# Bitfield values for all rule types which can have property declarations.
+STYLE_RULE = 1 << 0
+PAGE_RULE = 1 << 1
+KEYFRAME_RULE = 1 << 2
+
+ALL_RULES = STYLE_RULE | PAGE_RULE | KEYFRAME_RULE
+DEFAULT_RULES = STYLE_RULE | KEYFRAME_RULE
+DEFAULT_RULES_AND_PAGE = DEFAULT_RULES | PAGE_RULE
+DEFAULT_RULES_EXCEPT_KEYFRAME = STYLE_RULE
+
+# Rule name to value dict
+RULE_VALUES = {
+    "Style": STYLE_RULE,
+    "Page": PAGE_RULE,
+    "Keyframe": KEYFRAME_RULE,
+}
+
+
+def rule_values_from_arg(that):
+    if isinstance(that, int):
+        return that
+    mask = 0
+    for rule in that.split():
+        mask |= RULE_VALUES[rule]
+    return mask
+
 
 def maybe_moz_logical_alias(engine, side, prop):
     if engine == "gecko" and side[1]:
@@ -214,7 +240,7 @@ class Longhand(object):
         need_index=False,
         gecko_ffi_name=None,
         has_effect_on_gecko_scrollbars=None,
-        allowed_in_keyframe_block=True,
+        rule_types_allowed=DEFAULT_RULES,
         cast_type="u8",
         logical=False,
         logical_group=None,
@@ -222,7 +248,6 @@ class Longhand(object):
         extra_prefixes=None,
         boxed=False,
         flags=None,
-        allowed_in_page_rule=False,
         allow_quirks="No",
         ignored_when_colors_disabled=False,
         simple_vector_bindings=False,
@@ -270,20 +295,11 @@ class Longhand(object):
         self.extra_prefixes = parse_property_aliases(extra_prefixes)
         self.boxed = arg_to_bool(boxed)
         self.flags = flags.split() if flags else []
-        self.allowed_in_page_rule = arg_to_bool(allowed_in_page_rule)
         self.allow_quirks = allow_quirks
         self.ignored_when_colors_disabled = ignored_when_colors_disabled
         self.is_vector = vector
         self.simple_vector_bindings = simple_vector_bindings
 
-        # https://drafts.csswg.org/css-animations/#keyframes
-        # > The <declaration-list> inside of <keyframe-block> accepts any CSS property
-        # > except those defined in this specification,
-        # > but does accept the `animation-play-state` property and interprets it specially.
-        self.allowed_in_keyframe_block = (
-            allowed_in_keyframe_block and allowed_in_keyframe_block != "False"
-        )
-
         # This is done like this since just a plain bool argument seemed like
         # really random.
         if animation_value_type is None:
@@ -487,10 +503,9 @@ class Shorthand(object):
         servo_2020_pref=None,
         gecko_pref=None,
         enabled_in="content",
-        allowed_in_keyframe_block=True,
+        rule_types_allowed=DEFAULT_RULES,
         alias=None,
         extra_prefixes=None,
-        allowed_in_page_rule=False,
         flags=None,
     ):
         self.name = name
@@ -507,17 +522,9 @@ class Shorthand(object):
         self.enabled_in = enabled_in
         self.alias = parse_property_aliases(alias)
         self.extra_prefixes = parse_property_aliases(extra_prefixes)
-        self.allowed_in_page_rule = arg_to_bool(allowed_in_page_rule)
+        self.rule_types_allowed = rule_values_from_arg(rule_types_allowed)
         self.flags = flags.split() if flags else []
 
-        # https://drafts.csswg.org/css-animations/#keyframes
-        # > The <declaration-list> inside of <keyframe-block> accepts any CSS property
-        # > except those defined in this specification,
-        # > but does accept the `animation-play-state` property and interprets it specially.
-        self.allowed_in_keyframe_block = (
-            allowed_in_keyframe_block and allowed_in_keyframe_block != "False"
-        )
-
     def get_animatable(self):
         for sub in self.sub_properties:
             if sub.animatable:
@@ -575,8 +582,7 @@ class Alias(object):
         self.servo_2020_pref = original.servo_2020_pref
         self.gecko_pref = gecko_pref
         self.transitionable = original.transitionable
-        self.allowed_in_page_rule = original.allowed_in_page_rule
-        self.allowed_in_keyframe_block = original.allowed_in_keyframe_block
+        self.rule_types_allowed = original.rule_types_allowed
 
     @staticmethod
     def type():
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 810368be155..77755db8b15 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 <%namespace name="helpers" file="/helpers.mako.rs" />
-<% from data import ALL_AXES, Keyword, Method, to_rust_ident, to_camel_case%>
+<% from data import ALL_AXES, DEFAULT_RULES_EXCEPT_KEYFRAME, Keyword, Method, to_rust_ident, to_camel_case%>
 
 <% data.new_style_struct("Box",
                          inherited=False,
@@ -217,7 +217,7 @@ ${helpers.predefined_type(
     need_index=True,
     animation_value_type="none",
     extra_prefixes=animation_extra_prefixes,
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-name",
 )}
 
@@ -247,7 +247,6 @@ ${helpers.predefined_type(
     need_index=True,
     animation_value_type="none",
     extra_prefixes=animation_extra_prefixes,
-    allowed_in_keyframe_block=True,
     spec="https://drafts.csswg.org/css-transitions/#propdef-animation-timing-function",
 )}
 
@@ -261,7 +260,7 @@ ${helpers.predefined_type(
     need_index=True,
     animation_value_type="none",
     extra_prefixes=animation_extra_prefixes,
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-iteration-count",
 )}
 
@@ -278,7 +277,7 @@ ${helpers.single_keyword(
     extra_prefixes=animation_extra_prefixes,
     gecko_inexhaustive=True,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-direction",
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
 )}
 
 ${helpers.single_keyword(
@@ -291,7 +290,7 @@ ${helpers.single_keyword(
     extra_prefixes=animation_extra_prefixes,
     gecko_enum_prefix="StyleAnimationPlayState",
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-play-state",
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
 )}
 
 ${helpers.single_keyword(
@@ -305,7 +304,7 @@ ${helpers.single_keyword(
     extra_prefixes=animation_extra_prefixes,
     gecko_inexhaustive=True,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-fill-mode",
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
 )}
 
 ${helpers.predefined_type(
@@ -319,7 +318,7 @@ ${helpers.predefined_type(
     animation_value_type="none",
     extra_prefixes=animation_extra_prefixes,
     spec="https://drafts.csswg.org/css-animations/#propdef-animation-delay",
-    allowed_in_keyframe_block=False,
+    rule_types_allowed=DEFAULT_RULES_EXCEPT_KEYFRAME,
 )}
 
 <% transform_extra_prefixes = "moz:layout.css.prefixes.transforms webkit" %>
diff --git a/components/style/properties/longhands/margin.mako.rs b/components/style/properties/longhands/margin.mako.rs
index 80c765faab7..c28ca5f6560 100644
--- a/components/style/properties/longhands/margin.mako.rs
+++ b/components/style/properties/longhands/margin.mako.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 <%namespace name="helpers" file="/helpers.mako.rs" />
-<% from data import ALL_SIDES, maybe_moz_logical_alias %>
+<% from data import ALL_SIDES, DEFAULT_RULES_AND_PAGE, maybe_moz_logical_alias %>
 <% data.new_style_struct("Margin", inherited=False) %>
 
 % for side in ALL_SIDES:
@@ -23,7 +23,7 @@
         logical=side[1],
         logical_group="margin",
         spec=spec,
-        allowed_in_page_rule=True,
+        rule_types_allowed=DEFAULT_RULES_AND_PAGE,
         servo_restyle_damage="reflow"
     )}
 % endfor
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 505068b8556..98276d36027 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -54,7 +54,7 @@ pub use self::cascade::*;
 
 <%!
     from collections import defaultdict
-    from data import Method, PropertyRestrictions, Keyword, to_rust_ident, to_camel_case, SYSTEM_FONT_LONGHANDS
+    from data import Method, PropertyRestrictions, Keyword, to_rust_ident, to_camel_case, RULE_VALUES, SYSTEM_FONT_LONGHANDS
     import os.path
 %>
 
@@ -553,17 +553,15 @@ impl NonCustomPropertyId {
             "Declarations are only expected inside a keyframe, page, or style rule."
         );
 
-        ${static_non_custom_property_id_set(
-            "DISALLOWED_IN_KEYFRAME_BLOCK",
-            lambda p: not p.allowed_in_keyframe_block
-        )}
-        ${static_non_custom_property_id_set(
-            "DISALLOWED_IN_PAGE_RULE",
-            lambda p: not p.allowed_in_page_rule
-        )}
+        static MAP: [u8; NON_CUSTOM_PROPERTY_ID_COUNT] = [
+            % for property in data.longhands + data.shorthands + data.all_aliases():
+            ${property.rule_types_allowed},
+            % endfor
+        ];
         match rule_type {
-            CssRuleType::Keyframe => !DISALLOWED_IN_KEYFRAME_BLOCK.contains(self),
-            CssRuleType::Page => !DISALLOWED_IN_PAGE_RULE.contains(self),
+            % for name in RULE_VALUES:
+                CssRuleType::${name} => MAP[self.0] & ${RULE_VALUES[name]} != 0,
+            % endfor
             _ => true
         }
     }
diff --git a/components/style/properties/shorthands/box.mako.rs b/components/style/properties/shorthands/box.mako.rs
index 24cb850b971..851232545c9 100644
--- a/components/style/properties/shorthands/box.mako.rs
+++ b/components/style/properties/shorthands/box.mako.rs
@@ -190,7 +190,7 @@ macro_rules! try_parse_one {
                                     animation-timing-function animation-delay
                                     animation-iteration-count animation-direction
                                     animation-fill-mode animation-play-state"
-                    allowed_in_keyframe_block="False"
+                    rule_types_allowed="Style"
                     spec="https://drafts.csswg.org/css-animations/#propdef-animation">
     <%
         props = "name duration timing_function delay iteration_count \
diff --git a/components/style/properties/shorthands/margin.mako.rs b/components/style/properties/shorthands/margin.mako.rs
index 128fc5fb303..6b5bf7e467b 100644
--- a/components/style/properties/shorthands/margin.mako.rs
+++ b/components/style/properties/shorthands/margin.mako.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 <%namespace name="helpers" file="/helpers.mako.rs" />
+<% from data import DEFAULT_RULES_AND_PAGE %>
 
 ${helpers.four_sides_shorthand(
     "margin",
@@ -10,7 +11,7 @@ ${helpers.four_sides_shorthand(
     "specified::LengthPercentageOrAuto::parse",
     engines="gecko servo-2013 servo-2020",
     spec="https://drafts.csswg.org/css-box/#propdef-margin",
-    allowed_in_page_rule=True,
+    rule_types_allowed=DEFAULT_RULES_AND_PAGE,
     allow_quirks="Yes",
 )}
 

From b0d05d1a5d88e2915081cc6a69d43883683851b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 17 Feb 2021 00:21:36 +0000
Subject: [PATCH 126/156] style: Cache substituted values from shorthand
 properties during the cascade.

This brings the time down to 1.6ms from 4.8ms on the test-case in the
bug. This should be improvable too, but I think this is a nice
improvement for regular styling as well.

Differential Revision: https://phabricator.services.mozilla.com/D105187
---
 components/style/properties/cascade.rs        |  32 +++--
 .../style/properties/declaration_block.rs     |   1 +
 .../helpers/animated_properties.mako.rs       |   2 +
 .../style/properties/properties.mako.rs       | 115 +++++++++++-------
 4 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 2fefd0ba0fd..36e6ee4cf9b 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -10,11 +10,10 @@ use crate::dom::TElement;
 use crate::font_metrics::FontMetricsProvider;
 use crate::logical_geometry::WritingMode;
 use crate::media_queries::Device;
-use crate::properties::{CSSWideKeyword, LonghandId, LonghandIdSet, PropertyFlags};
-use crate::properties::{ComputedValueFlags, CASCADE_PROPERTY};
-use crate::properties::{ComputedValues, Importance, StyleBuilder};
 use crate::properties::{
-    DeclarationImportanceIterator, PropertyDeclaration, PropertyDeclarationId,
+    CSSWideKeyword, ComputedValueFlags, ComputedValues, DeclarationImportanceIterator, Importance,
+    LonghandId, LonghandIdSet, PropertyDeclaration, PropertyDeclarationId, PropertyFlags,
+    ShorthandsWithPropertyReferencesCache, StyleBuilder, CASCADE_PROPERTY,
 };
 use crate::rule_cache::{RuleCache, RuleCacheConditions};
 use crate::rule_tree::StrongRuleNode;
@@ -325,10 +324,12 @@ where
 
     let using_cached_reset_properties = {
         let mut cascade = Cascade::new(&mut context, cascade_mode);
+        let mut shorthand_cache = ShorthandsWithPropertyReferencesCache::default();
 
         cascade.apply_properties::<EarlyProperties, _>(
             ApplyResetProperties::Yes,
             declarations.iter().cloned(),
+            &mut shorthand_cache,
         );
 
         cascade.compute_visited_style_if_needed(
@@ -348,7 +349,11 @@ where
             ApplyResetProperties::Yes
         };
 
-        cascade.apply_properties::<LateProperties, _>(apply_reset, declarations.iter().cloned());
+        cascade.apply_properties::<LateProperties, _>(
+            apply_reset,
+            declarations.iter().cloned(),
+            &mut shorthand_cache,
+        );
 
         using_cached_reset_properties
     };
@@ -501,10 +506,14 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         }
     }
 
-    fn substitute_variables_if_needed<'decl>(
+    fn substitute_variables_if_needed<'decl, 'cache>(
         &mut self,
         declaration: &'decl PropertyDeclaration,
-    ) -> Cow<'decl, PropertyDeclaration> {
+        cache: &'cache mut ShorthandsWithPropertyReferencesCache,
+    ) -> Cow<'decl, PropertyDeclaration>
+    where
+        'cache: 'decl,
+    {
         let declaration = match *declaration {
             PropertyDeclaration::WithVariables(ref declaration) => declaration,
             ref d => return Cow::Borrowed(d),
@@ -536,12 +545,13 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
             }
         }
 
-        Cow::Owned(declaration.value.substitute_variables(
+        declaration.value.substitute_variables(
             declaration.id,
             self.context.builder.custom_properties.as_ref(),
             self.context.quirks_mode,
             self.context.device(),
-        ))
+            cache,
+        )
     }
 
     #[inline(always)]
@@ -559,6 +569,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
         &mut self,
         apply_reset: ApplyResetProperties,
         declarations: I,
+        mut shorthand_cache: &mut ShorthandsWithPropertyReferencesCache,
     ) where
         Phase: CascadePhase,
         I: Iterator<Item = (&'decls PropertyDeclaration, Origin)>,
@@ -619,7 +630,8 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
                 continue;
             }
 
-            let mut declaration = self.substitute_variables_if_needed(declaration);
+            let mut declaration =
+                self.substitute_variables_if_needed(declaration, &mut shorthand_cache);
 
             // When document colors are disabled, do special handling of
             // properties that are marked as ignored in that mode.
diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index 9170f6e650d..2cee5eb7322 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -837,6 +837,7 @@ impl PropertyDeclarationBlock {
                         custom_properties.as_ref(),
                         QuirksMode::NoQuirks,
                         device,
+                        &mut Default::default()
                     )
                     .to_css(dest)
             },
diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs
index f2fc745c57b..8b91b35a139 100644
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@@ -367,6 +367,7 @@ impl AnimationValue {
                 }
             },
             PropertyDeclaration::WithVariables(ref declaration) => {
+                let mut cache = Default::default();
                 let substituted = {
                     let custom_properties =
                         extra_custom_properties.or_else(|| context.style().custom_properties());
@@ -376,6 +377,7 @@ impl AnimationValue {
                         custom_properties,
                         context.quirks_mode,
                         context.device(),
+                        &mut cache,
                     )
                 };
                 return AnimationValue::from_declaration(
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 98276d36027..abbd7992dd9 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -29,11 +29,11 @@ use crate::context::QuirksMode;
 use crate::logical_geometry::WritingMode;
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
 use crate::computed_value_flags::*;
+use crate::hash::FxHashMap;
 use crate::media_queries::Device;
 use crate::parser::ParserContext;
 use crate::properties::longhands::system_font::SystemFont;
 use crate::selector_parser::PseudoElement;
-use selectors::parser::SelectorParseErrorKind;
 #[cfg(feature = "servo")] use servo_config::prefs;
 use style_traits::{CssWriter, KeywordsCollectFn, ParseError, ParsingMode};
 use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss};
@@ -1634,23 +1634,44 @@ impl ToCss for UnparsedValue {
     }
 }
 
+/// A simple cache for properties that come from a shorthand and have variable
+/// references.
+///
+/// This cache works because of the fact that you can't have competing values
+/// for a given longhand coming from the same shorthand (but note that this is
+/// why the shorthand needs to be part of the cache key).
+pub type ShorthandsWithPropertyReferencesCache =
+    FxHashMap<(ShorthandId, LonghandId), PropertyDeclaration>;
+
 impl UnparsedValue {
-    fn substitute_variables(
+    fn substitute_variables<'cache>(
         &self,
         longhand_id: LonghandId,
         custom_properties: Option<<&Arc<crate::custom_properties::CustomPropertiesMap>>,
         quirks_mode: QuirksMode,
         device: &Device,
-    ) -> PropertyDeclaration {
+        shorthand_cache: &'cache mut ShorthandsWithPropertyReferencesCache,
+    ) -> Cow<'cache, PropertyDeclaration> {
         let invalid_at_computed_value_time = || {
             let keyword = if longhand_id.inherited() {
                 CSSWideKeyword::Inherit
             } else {
                 CSSWideKeyword::Initial
             };
-            PropertyDeclaration::css_wide_keyword(longhand_id, keyword)
+            Cow::Owned(PropertyDeclaration::css_wide_keyword(longhand_id, keyword))
         };
 
+        if let Some(shorthand_id) = self.from_shorthand {
+            let key = (shorthand_id, longhand_id);
+            if shorthand_cache.contains_key(&key) {
+                // FIXME: This double lookup should be avoidable, but rustc
+                // doesn't like that, see:
+                //
+                // https://github.com/rust-lang/rust/issues/82146
+                return Cow::Borrowed(&shorthand_cache[&key]);
+            }
+        }
+
         let css = match crate::custom_properties::substitute(
             &self.css,
             self.first_token_type,
@@ -1685,53 +1706,59 @@ impl UnparsedValue {
         let mut input = Parser::new(&mut input);
         input.skip_whitespace();  // Unnecessary for correctness, but may help try() rewind less.
         if let Ok(keyword) = input.try_parse(CSSWideKeyword::parse) {
-            return PropertyDeclaration::css_wide_keyword(longhand_id, keyword);
+            return Cow::Owned(PropertyDeclaration::css_wide_keyword(longhand_id, keyword));
         }
 
-        let declaration = input.parse_entirely(|input| {
-            match self.from_shorthand {
-                None => longhand_id.parse_value(&context, input),
-                Some(ShorthandId::All) => {
-                    // No need to parse the 'all' shorthand as anything other
-                    // than a CSS-wide keyword, after variable substitution.
-                    Err(input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent("all".into())))
+        let shorthand = match self.from_shorthand {
+            None => {
+                return match input.parse_entirely(|input| longhand_id.parse_value(&context, input)) {
+                    Ok(decl) => Cow::Owned(decl),
+                    Err(..) => invalid_at_computed_value_time(),
                 }
-                % for shorthand in data.shorthands_except_all():
-                Some(ShorthandId::${shorthand.camel_case}) => {
-                    shorthands::${shorthand.ident}::parse_value(&context, input)
-                    .map(|longhands| {
-                        match longhand_id {
-                            <% seen = set() %>
-                            % for property in shorthand.sub_properties:
-                            // When animating logical properties, we end up
-                            // physicalizing the value during the animation, but
-                            // the value still comes from the logical shorthand.
-                            //
-                            // So we need to handle the physical properties too.
-                            % for prop in [property] + property.all_physical_mapped_properties(data):
-                            % if prop.camel_case not in seen:
-                            LonghandId::${prop.camel_case} => {
-                                PropertyDeclaration::${prop.camel_case}(
-                                    longhands.${property.ident}
-                                )
-                            }
-                            <% seen.add(prop.camel_case) %>
+            },
+            Some(shorthand) => shorthand,
+        };
+
+        match shorthand {
+            ShorthandId::All => {
+                // No need to parse the 'all' shorthand as anything other
+                // than a CSS-wide keyword, after variable substitution.
+                return invalid_at_computed_value_time();
+            }
+            % for shorthand in data.shorthands_except_all():
+            ShorthandId::${shorthand.camel_case} => {
+                let longhands = match input.parse_entirely(|input| shorthands::${shorthand.ident}::parse_value(&context, input)) {
+                    Ok(l) => l,
+                    _ => return invalid_at_computed_value_time(),
+                };
+
+                <% seen = set() %>
+                % for property in shorthand.sub_properties:
+                // When animating logical properties, we end up
+                // physicalizing the value during the animation, but the
+                // value still comes from the logical shorthand.
+                //
+                // So we need to handle the physical properties too.
+                % for prop in property.all_physical_mapped_properties(data) + [property]:
+                % if prop.ident not in seen:
+                    shorthand_cache.insert(
+                        (shorthand, LonghandId::${prop.camel_case}),
+                        PropertyDeclaration::${prop.camel_case}(
+                            longhands.${property.ident}
+                            % if prop.ident != property.ident:
+                            .clone()
                             % endif
-                            % endfor
-                            % endfor
-                            <% del seen %>
-                            _ => unreachable!()
-                        }
-                    })
-                }
+                        )
+                    );
+                % endif
+                <% seen.add(prop.ident) %>
+                % endfor
                 % endfor
             }
-        });
-
-        match declaration {
-            Ok(decl) => decl,
-            Err(..) => invalid_at_computed_value_time(),
+            % endfor
         }
+
+        Cow::Borrowed(&shorthand_cache[&(shorthand, longhand_id)])
     }
 }
 

From 490db1e2bd071388ce781a6b07af706f90421ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 17 Feb 2021 00:21:36 +0000
Subject: [PATCH 127/156] style: Reduce the amount of code generated by
 UnparsedValues::substitute_variables.

This reduces the amount of assembly instructions generated by this
function from 18k+ to ~800.

This should make reasoning about its stack space usage sane, and should
fix the ASAN stack overflows, but also we should take this regardless,
because it's saner and makes reading it simpler.

I also think that the writing_mode shenanigans is fixing a bug (I think
before this, we'd pick the first physical value which mapped to any of
the properties, which is wrong), but I haven't bothered looking for a
test-case that fails before my patch. The relevant WPTs
(css/css-logical/animation*) still pass.

Differential Revision: https://phabricator.services.mozilla.com/D105342
---
 components/style/properties/cascade.rs        |   1 +
 .../style/properties/declaration_block.rs     |   3 +-
 components/style/properties/helpers.mako.rs   |   6 +-
 .../helpers/animated_properties.mako.rs       |   3 +-
 .../style/properties/properties.mako.rs       | 103 +++++++++---------
 5 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/components/style/properties/cascade.rs b/components/style/properties/cascade.rs
index 36e6ee4cf9b..acfdfc51457 100644
--- a/components/style/properties/cascade.rs
+++ b/components/style/properties/cascade.rs
@@ -547,6 +547,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
 
         declaration.value.substitute_variables(
             declaration.id,
+            self.context.builder.writing_mode,
             self.context.builder.custom_properties.as_ref(),
             self.context.quirks_mode,
             self.context.device(),
diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs
index 2cee5eb7322..fd41c1141cb 100644
--- a/components/style/properties/declaration_block.rs
+++ b/components/style/properties/declaration_block.rs
@@ -829,11 +829,12 @@ impl PropertyDeclarationBlock {
             // getKeyframes() implementation for CSS animations, if
             // |computed_values| is supplied, we use it to expand such variable
             // declarations. This will be fixed properly in Gecko bug 1391537.
-            (&PropertyDeclaration::WithVariables(ref declaration), Some(ref _computed_values)) => {
+            (&PropertyDeclaration::WithVariables(ref declaration), Some(ref computed_values)) => {
                 declaration
                     .value
                     .substitute_variables(
                         declaration.id,
+                        computed_values.writing_mode,
                         custom_properties.as_ref(),
                         QuirksMode::NoQuirks,
                         device,
diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs
index 3b8e10b5125..caa941df1ff 100644
--- a/components/style/properties/helpers.mako.rs
+++ b/components/style/properties/helpers.mako.rs
@@ -948,7 +948,7 @@
             input.parse_entirely(|input| parse_value(context, input)).map(|longhands| {
                 % for sub_property in shorthand.sub_properties:
                 % if sub_property.may_be_disabled_in(shorthand, engine):
-                if NonCustomPropertyId::from(LonghandId::${sub_property.camel_case}).allowed_in(context) {
+                if NonCustomPropertyId::from(LonghandId::${sub_property.camel_case}).allowed_in_ignoring_rule_type(context) {
                 % endif
                     declarations.push(PropertyDeclaration::${sub_property.camel_case}(
                         longhands.${sub_property.ident}
@@ -980,7 +980,7 @@
     #[allow(unused_imports)]
     use crate::values::specified;
 
-    pub fn parse_value<'i, 't>(
+    fn parse_value<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Longhands, ParseError<'i>> {
@@ -1024,7 +1024,7 @@
         #[allow(unused_imports)]
         use crate::values::specified;
 
-        pub fn parse_value<'i, 't>(
+        fn parse_value<'i, 't>(
             context: &ParserContext,
             input: &mut Parser<'i, 't>,
         ) -> Result<Longhands, ParseError<'i>> {
diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs
index 8b91b35a139..2f9e692f740 100644
--- a/components/style/properties/helpers/animated_properties.mako.rs
+++ b/components/style/properties/helpers/animated_properties.mako.rs
@@ -248,7 +248,7 @@ impl AnimationValue {
         decl: &PropertyDeclaration,
         context: &mut Context,
         extra_custom_properties: Option<<&Arc<crate::custom_properties::CustomPropertiesMap>>,
-        initial: &ComputedValues
+        initial: &ComputedValues,
     ) -> Option<Self> {
         use super::PropertyDeclarationVariantRepr;
 
@@ -374,6 +374,7 @@ impl AnimationValue {
 
                     declaration.value.substitute_variables(
                         declaration.id,
+                        context.builder.writing_mode,
                         custom_properties,
                         context.quirks_mode,
                         context.device(),
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index abbd7992dd9..31da5e8a700 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -1194,20 +1194,18 @@ impl LonghandId {
         }
     }
 
-    // TODO(emilio): Should we use a function table like CASCADE_PROPERTY does
-    // to avoid blowing up code-size here?
     fn parse_value<'i, 't>(
         &self,
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<PropertyDeclaration, ParseError<'i>> {
-        match *self {
-            % for property in data.longhands:
-                LonghandId::${property.camel_case} => {
-                    longhands::${property.ident}::parse_declared(context, input)
-                }
-            % endfor
-        }
+        type ParsePropertyFn = for<'i, 't> fn(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<PropertyDeclaration, ParseError<'i>>;
+        static PARSE_PROPERTY: [ParsePropertyFn; ${len(data.longhands)}] = [
+        % for property in data.longhands:
+            longhands::${property.ident}::parse_declared,
+        % endfor
+        ];
+        (PARSE_PROPERTY[*self as usize])(context, input)
     }
 
     /// Returns whether this property is animatable.
@@ -1596,15 +1594,36 @@ impl ShorthandId {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<(), ParseError<'i>> {
-        match *self {
-            % for shorthand in data.shorthands_except_all():
-                ShorthandId::${shorthand.camel_case} => {
-                    shorthands::${shorthand.ident}::parse_into(declarations, context, input)
-                }
-            % endfor
-            // 'all' accepts no value other than CSS-wide keywords
-            ShorthandId::All => Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
+        type ParseIntoFn = for<'i, 't> fn(
+            declarations: &mut SourcePropertyDeclaration,
+            context: &ParserContext,
+            input: &mut Parser<'i, 't>,
+        ) -> Result<(), ParseError<'i>>;
+
+        fn unreachable<'i, 't>(
+            _: &mut SourcePropertyDeclaration,
+            _: &ParserContext,
+            _: &mut Parser<'i, 't>
+        ) -> Result<(), ParseError<'i>> {
+            unreachable!()
         }
+
+        // 'all' accepts no value other than CSS-wide keywords
+        if *self == ShorthandId::All {
+            return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError));
+        }
+
+        static PARSE_INTO: [ParseIntoFn; ${len(data.shorthands)}] = [
+            % for shorthand in data.shorthands:
+            % if shorthand.ident == "all":
+            unreachable,
+            % else:
+            shorthands::${shorthand.ident}::parse_into,
+            % endif
+            % endfor
+        ];
+
+        (PARSE_INTO[*self as usize])(declarations, context, input)
     }
 }
 
@@ -1647,6 +1666,7 @@ impl UnparsedValue {
     fn substitute_variables<'cache>(
         &self,
         longhand_id: LonghandId,
+        writing_mode: WritingMode,
         custom_properties: Option<<&Arc<crate::custom_properties::CustomPropertiesMap>>,
         quirks_mode: QuirksMode,
         device: &Device,
@@ -1719,43 +1739,18 @@ impl UnparsedValue {
             Some(shorthand) => shorthand,
         };
 
-        match shorthand {
-            ShorthandId::All => {
-                // No need to parse the 'all' shorthand as anything other
-                // than a CSS-wide keyword, after variable substitution.
-                return invalid_at_computed_value_time();
-            }
-            % for shorthand in data.shorthands_except_all():
-            ShorthandId::${shorthand.camel_case} => {
-                let longhands = match input.parse_entirely(|input| shorthands::${shorthand.ident}::parse_value(&context, input)) {
-                    Ok(l) => l,
-                    _ => return invalid_at_computed_value_time(),
-                };
+        let mut decls = SourcePropertyDeclaration::new();
+        // parse_into takes care of doing `parse_entirely` for us.
+        if shorthand.parse_into(&mut decls, &context, &mut input).is_err() {
+            return invalid_at_computed_value_time();
+        }
 
-                <% seen = set() %>
-                % for property in shorthand.sub_properties:
-                // When animating logical properties, we end up
-                // physicalizing the value during the animation, but the
-                // value still comes from the logical shorthand.
-                //
-                // So we need to handle the physical properties too.
-                % for prop in property.all_physical_mapped_properties(data) + [property]:
-                % if prop.ident not in seen:
-                    shorthand_cache.insert(
-                        (shorthand, LonghandId::${prop.camel_case}),
-                        PropertyDeclaration::${prop.camel_case}(
-                            longhands.${property.ident}
-                            % if prop.ident != property.ident:
-                            .clone()
-                            % endif
-                        )
-                    );
-                % endif
-                <% seen.add(prop.ident) %>
-                % endfor
-                % endfor
+        for declaration in decls.declarations.drain(..) {
+            let longhand = declaration.id().as_longhand().unwrap();
+            if longhand.is_logical() {
+                shorthand_cache.insert((shorthand, longhand.to_physical(writing_mode)), declaration.clone());
             }
-            % endfor
+            shorthand_cache.insert((shorthand, longhand), declaration);
         }
 
         Cow::Borrowed(&shorthand_cache[&(shorthand, longhand_id)])
@@ -2469,7 +2464,7 @@ impl PropertyDeclaration {
                             id,
                             value: Arc::new(UnparsedValue {
                                 css: css.into_owned(),
-                                first_token_type: first_token_type,
+                                first_token_type,
                                 url_data: context.url_data.clone(),
                                 from_shorthand: None,
                             }),
@@ -2506,7 +2501,7 @@ impl PropertyDeclaration {
                             crate::custom_properties::parse_non_custom_with_var(input)?;
                         let unparsed = Arc::new(UnparsedValue {
                             css: css.into_owned(),
-                            first_token_type: first_token_type,
+                            first_token_type,
                             url_data: context.url_data.clone(),
                             from_shorthand: Some(id),
                         });

From e6aaafdda596290d809d34ea6b30dfca3bb146e2 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Wed, 17 Feb 2021 01:40:04 +0000
Subject: [PATCH 128/156] style: Remove -moz-mac-fullscreen-button value.

Depends on D105379

Differential Revision: https://phabricator.services.mozilla.com/D105380
---
 components/style/values/specified/box.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs
index 2c56a32be54..b3a49d17bb0 100644
--- a/components/style/values/specified/box.rs
+++ b/components/style/values/specified/box.rs
@@ -1788,9 +1788,6 @@ pub enum Appearance {
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MozWinExcludeGlass,
 
-    /// Titlebar elements on the Mac.
-    #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
-    MozMacFullscreenButton,
     /// Mac help button.
     #[parse(condition = "ParserContext::in_ua_or_chrome_sheet")]
     MozMacHelpButton,

From 742c5e0d17fd733534a730f09a4333aca9dc090d Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Fri, 19 Feb 2021 18:29:32 +0000
Subject: [PATCH 129/156] style: Use a base class for Shorthand and Longhand

Differential Revision: https://phabricator.services.mozilla.com/D105797
---
 components/style/properties/data.py | 164 +++++++++++++++-------------
 1 file changed, 89 insertions(+), 75 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 0c64658c13f..4da703bef87 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -224,7 +224,67 @@ def to_phys(name, logical, physical):
     return name.replace(logical, physical).replace("inset-", "")
 
 
-class Longhand(object):
+class Property(object):
+    def __init__(
+        self,
+        name,
+        spec,
+        servo_2013_pref,
+        servo_2020_pref,
+        gecko_pref,
+        enabled_in,
+        rule_types_allowed,
+        alias,
+        extra_prefixes,
+        flags,
+    ):
+        self.name = name
+        if not spec:
+            raise TypeError("Spec should be specified for " + name)
+        self.spec = spec
+        self.ident = to_rust_ident(name)
+        self.camel_case = to_camel_case(self.ident)
+        self.servo_2013_pref = servo_2013_pref
+        self.servo_2020_pref = servo_2020_pref
+        self.gecko_pref = gecko_pref
+        self.rule_types_allowed = rule_values_from_arg(rule_types_allowed)
+        # For enabled_in, the setup is as follows:
+        # It needs to be one of the four values: ["", "ua", "chrome", "content"]
+        #  * "chrome" implies "ua", and implies that they're explicitly
+        #    enabled.
+        #  * "" implies the property will never be parsed.
+        #  * "content" implies the property is accessible unconditionally,
+        #    modulo a pref, set via servo_pref / gecko_pref.
+        assert enabled_in in ("", "ua", "chrome", "content")
+        self.enabled_in = enabled_in
+        self.alias = parse_property_aliases(alias)
+        self.extra_prefixes = parse_property_aliases(extra_prefixes)
+        self.flags = flags.split() if flags else []
+
+    def experimental(self, engine):
+        if engine == "gecko":
+            return bool(self.gecko_pref)
+        elif engine == "servo-2013":
+            return bool(self.servo_2013_pref)
+        elif engine == "servo-2020":
+            return bool(self.servo_2020_pref)
+        else:
+            raise Exception("Bad engine: " + engine)
+
+    def explicitly_enabled_in_ua_sheets(self):
+        return self.enabled_in in ("ua", "chrome")
+
+    def explicitly_enabled_in_chrome(self):
+        return self.enabled_in == "chrome"
+
+    def enabled_in_content(self):
+        return self.enabled_in == "content"
+
+    def nscsspropertyid(self):
+        return "nsCSSPropertyID::eCSSProperty_" + self.ident
+
+
+class Longhand(Property):
     def __init__(
         self,
         style_struct,
@@ -254,18 +314,23 @@ class Longhand(object):
         vector=False,
         servo_restyle_damage="repaint",
     ):
-        self.name = name
-        if not spec:
-            raise TypeError("Spec should be specified for %s" % name)
-        self.spec = spec
+        Property.__init__(
+            self,
+            name=name,
+            spec=spec,
+            servo_2013_pref=servo_2013_pref,
+            servo_2020_pref=servo_2020_pref,
+            gecko_pref=gecko_pref,
+            enabled_in=enabled_in,
+            rule_types_allowed=rule_types_allowed,
+            alias=alias,
+            extra_prefixes=extra_prefixes,
+            flags=flags,
+        )
+
         self.keyword = keyword
         self.predefined_type = predefined_type
-        self.ident = to_rust_ident(name)
-        self.camel_case = to_camel_case(self.ident)
         self.style_struct = style_struct
-        self.servo_2013_pref = servo_2013_pref
-        self.servo_2020_pref = servo_2020_pref
-        self.gecko_pref = gecko_pref
         self.has_effect_on_gecko_scrollbars = has_effect_on_gecko_scrollbars
         assert (
             has_effect_on_gecko_scrollbars in [None, False, True]
@@ -291,10 +356,7 @@ class Longhand(object):
         if self.logical:
             assert logical_group, "Property " + name + " must have a logical group"
 
-        self.alias = parse_property_aliases(alias)
-        self.extra_prefixes = parse_property_aliases(extra_prefixes)
         self.boxed = arg_to_bool(boxed)
-        self.flags = flags.split() if flags else []
         self.allow_quirks = allow_quirks
         self.ignored_when_colors_disabled = ignored_when_colors_disabled
         self.is_vector = vector
@@ -350,26 +412,6 @@ class Longhand(object):
             for physical_side in physical
         ]
 
-    def experimental(self, engine):
-        if engine == "gecko":
-            return bool(self.gecko_pref)
-        elif engine == "servo-2013":
-            return bool(self.servo_2013_pref)
-        elif engine == "servo-2020":
-            return bool(self.servo_2020_pref)
-        else:
-            raise Exception("Bad engine: " + engine)
-
-    # FIXME(emilio): Shorthand and Longhand should really share a base class.
-    def explicitly_enabled_in_ua_sheets(self):
-        return self.enabled_in in ["ua", "chrome"]
-
-    def explicitly_enabled_in_chrome(self):
-        return self.enabled_in == "chrome"
-
-    def enabled_in_content(self):
-        return self.enabled_in == "content"
-
     def may_be_disabled_in(self, shorthand, engine):
         if engine == "gecko":
             return self.gecko_pref and self.gecko_pref != shorthand.gecko_pref
@@ -489,11 +531,8 @@ class Longhand(object):
             return computed
         return "<{} as ToAnimatedValue>::AnimatedValue".format(computed)
 
-    def nscsspropertyid(self):
-        return "nsCSSPropertyID::eCSSProperty_%s" % self.ident
 
-
-class Shorthand(object):
+class Shorthand(Property):
     def __init__(
         self,
         name,
@@ -508,22 +547,20 @@ class Shorthand(object):
         extra_prefixes=None,
         flags=None,
     ):
-        self.name = name
-        if not spec:
-            raise TypeError("Spec should be specified for %s" % name)
-        self.spec = spec
-        self.ident = to_rust_ident(name)
-        self.camel_case = to_camel_case(self.ident)
-        self.servo_2013_pref = servo_2013_pref
-        self.servo_2020_pref = servo_2020_pref
-        self.gecko_pref = gecko_pref
+        Property.__init__(
+            self,
+            name=name,
+            spec=spec,
+            servo_2013_pref=servo_2013_pref,
+            servo_2020_pref=servo_2020_pref,
+            gecko_pref=gecko_pref,
+            enabled_in=enabled_in,
+            rule_types_allowed=rule_types_allowed,
+            alias=alias,
+            extra_prefixes=extra_prefixes,
+            flags=flags,
+        )
         self.sub_properties = sub_properties
-        assert enabled_in in ["", "ua", "chrome", "content"]
-        self.enabled_in = enabled_in
-        self.alias = parse_property_aliases(alias)
-        self.extra_prefixes = parse_property_aliases(extra_prefixes)
-        self.rule_types_allowed = rule_values_from_arg(rule_types_allowed)
-        self.flags = flags.split() if flags else []
 
     def get_animatable(self):
         for sub in self.sub_properties:
@@ -546,29 +583,6 @@ class Shorthand(object):
     def type():
         return "shorthand"
 
-    def experimental(self, engine):
-        if engine == "gecko":
-            return bool(self.gecko_pref)
-        elif engine == "servo-2013":
-            return bool(self.servo_2013_pref)
-        elif engine == "servo-2020":
-            return bool(self.servo_2020_pref)
-        else:
-            raise Exception("Bad engine: " + engine)
-
-    # FIXME(emilio): Shorthand and Longhand should really share a base class.
-    def explicitly_enabled_in_ua_sheets(self):
-        return self.enabled_in in ["ua", "chrome"]
-
-    def explicitly_enabled_in_chrome(self):
-        return self.enabled_in == "chrome"
-
-    def enabled_in_content(self):
-        return self.enabled_in == "content"
-
-    def nscsspropertyid(self):
-        return "nsCSSPropertyID::eCSSProperty_%s" % self.ident
-
 
 class Alias(object):
     def __init__(self, name, original, gecko_pref):

From 4dc475d3a1c247464251f73b0537af2bf27f5dc0 Mon Sep 17 00:00:00 2001
From: Emily McDonough <emcdonough@mozilla.com>
Date: Fri, 19 Feb 2021 18:29:33 +0000
Subject: [PATCH 130/156] style: Rename alias to aliases in Longhand and
 Shorthand

Differential Revision: https://phabricator.services.mozilla.com/D105810
---
 components/style/properties/data.py           | 22 +++++++++----------
 .../style/properties/longhands/border.mako.rs |  6 ++---
 .../style/properties/longhands/box.mako.rs    |  4 ++--
 .../longhands/inherited_text.mako.rs          |  4 ++--
 .../style/properties/longhands/margin.mako.rs |  2 +-
 .../properties/longhands/padding.mako.rs      |  2 +-
 .../properties/longhands/position.mako.rs     |  4 ++--
 .../style/properties/longhands/xul.mako.rs    | 12 +++++-----
 .../style/properties/properties.mako.rs       |  4 ++--
 .../properties/shorthands/border.mako.rs      |  2 +-
 .../properties/shorthands/position.mako.rs    |  2 +-
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 4da703bef87..714e3ced604 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -234,7 +234,7 @@ class Property(object):
         gecko_pref,
         enabled_in,
         rule_types_allowed,
-        alias,
+        aliases,
         extra_prefixes,
         flags,
     ):
@@ -257,7 +257,7 @@ class Property(object):
         #    modulo a pref, set via servo_pref / gecko_pref.
         assert enabled_in in ("", "ua", "chrome", "content")
         self.enabled_in = enabled_in
-        self.alias = parse_property_aliases(alias)
+        self.aliases = parse_property_aliases(aliases)
         self.extra_prefixes = parse_property_aliases(extra_prefixes)
         self.flags = flags.split() if flags else []
 
@@ -304,7 +304,7 @@ class Longhand(Property):
         cast_type="u8",
         logical=False,
         logical_group=None,
-        alias=None,
+        aliases=None,
         extra_prefixes=None,
         boxed=False,
         flags=None,
@@ -323,7 +323,7 @@ class Longhand(Property):
             gecko_pref=gecko_pref,
             enabled_in=enabled_in,
             rule_types_allowed=rule_types_allowed,
-            alias=alias,
+            aliases=aliases,
             extra_prefixes=extra_prefixes,
             flags=flags,
         )
@@ -543,7 +543,7 @@ class Shorthand(Property):
         gecko_pref=None,
         enabled_in="content",
         rule_types_allowed=DEFAULT_RULES,
-        alias=None,
+        aliases=None,
         extra_prefixes=None,
         flags=None,
     ):
@@ -556,7 +556,7 @@ class Shorthand(Property):
             gecko_pref=gecko_pref,
             enabled_in=enabled_in,
             rule_types_allowed=rule_types_allowed,
-            alias=alias,
+            aliases=aliases,
             extra_prefixes=extra_prefixes,
             flags=flags,
         )
@@ -692,7 +692,7 @@ class PropertiesData(object):
         #       See servo/servo#14941.
         if self.engine == "gecko":
             for (prefix, pref) in property.extra_prefixes:
-                property.alias.append(("-%s-%s" % (prefix, property.name), pref))
+                property.aliases.append(("-%s-%s" % (prefix, property.name), pref))
 
     def declare_longhand(self, name, engines=None, **kwargs):
         engines = engines.split()
@@ -701,8 +701,8 @@ class PropertiesData(object):
 
         longhand = Longhand(self.current_style_struct, name, **kwargs)
         self.add_prefixed_aliases(longhand)
-        longhand.alias = [Alias(xp[0], longhand, xp[1]) for xp in longhand.alias]
-        self.longhand_aliases += longhand.alias
+        longhand.aliases = [Alias(xp[0], longhand, xp[1]) for xp in longhand.aliases]
+        self.longhand_aliases += longhand.aliases
         self.current_style_struct.longhands.append(longhand)
         self.longhands.append(longhand)
         self.longhands_by_name[name] = longhand
@@ -721,8 +721,8 @@ class PropertiesData(object):
         sub_properties = [self.longhands_by_name[s] for s in sub_properties]
         shorthand = Shorthand(name, sub_properties, *args, **kwargs)
         self.add_prefixed_aliases(shorthand)
-        shorthand.alias = [Alias(xp[0], shorthand, xp[1]) for xp in shorthand.alias]
-        self.shorthand_aliases += shorthand.alias
+        shorthand.aliases = [Alias(xp[0], shorthand, xp[1]) for xp in shorthand.aliases]
+        self.shorthand_aliases += shorthand.aliases
         self.shorthands.append(shorthand)
         self.shorthands_by_name[name] = shorthand
         return shorthand
diff --git a/components/style/properties/longhands/border.mako.rs b/components/style/properties/longhands/border.mako.rs
index 11ed63a438a..82fbfe9c1c7 100644
--- a/components/style/properties/longhands/border.mako.rs
+++ b/components/style/properties/longhands/border.mako.rs
@@ -24,7 +24,7 @@
         "border-%s-color" % side_name, "Color",
         "computed_value::T::currentcolor()",
         engines="gecko servo-2013 servo-2020",
-        alias=maybe_moz_logical_alias(engine, side, "-moz-border-%s-color"),
+        aliases=maybe_moz_logical_alias(engine, side, "-moz-border-%s-color"),
         spec=maybe_logical_spec(side, "color"),
         animation_value_type="AnimatedColor",
         logical=is_logical,
@@ -37,7 +37,7 @@
         "border-%s-style" % side_name, "BorderStyle",
         "specified::BorderStyle::None",
         engines="gecko servo-2013 servo-2020",
-        alias=maybe_moz_logical_alias(engine, side, "-moz-border-%s-style"),
+        aliases=maybe_moz_logical_alias(engine, side, "-moz-border-%s-style"),
         spec=maybe_logical_spec(side, "style"),
         animation_value_type="discrete" if not is_logical else "none",
         logical=is_logical,
@@ -50,7 +50,7 @@
         "crate::values::computed::NonNegativeLength::new(3.)",
         engines="gecko servo-2013 servo-2020",
         computed_type="crate::values::computed::NonNegativeLength",
-        alias=maybe_moz_logical_alias(engine, side, "-moz-border-%s-width"),
+        aliases=maybe_moz_logical_alias(engine, side, "-moz-border-%s-width"),
         spec=maybe_logical_spec(side, "width"),
         animation_value_type="NonNegativeLength",
         logical=is_logical,
diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 77755db8b15..73a2ec87065 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -505,7 +505,7 @@ ${helpers.predefined_type(
     "BreakWithin",
     "computed::BreakWithin::Auto",
     engines="gecko",
-    alias="page-break-inside",
+    aliases="page-break-inside",
     spec="https://drafts.csswg.org/css-break/#propdef-break-inside",
     animation_value_type="discrete",
 )}
@@ -607,7 +607,7 @@ ${helpers.predefined_type(
     "Appearance",
     "computed::Appearance::None",
     engines="gecko",
-    alias="-moz-appearance -webkit-appearance",
+    aliases="-moz-appearance -webkit-appearance",
     spec="https://drafts.csswg.org/css-ui-4/#propdef-appearance",
     animation_value_type="discrete",
     gecko_ffi_name="mAppearance",
diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs
index 3720119ce88..bb43a0a86de 100644
--- a/components/style/properties/longhands/inherited_text.mako.rs
+++ b/components/style/properties/longhands/inherited_text.mako.rs
@@ -57,7 +57,7 @@ ${helpers.single_keyword(
     gecko_ffi_name="mTextSizeAdjust",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-size-adjust/#adjustment-control",
-    alias="-webkit-text-size-adjust",
+    aliases="-webkit-text-size-adjust",
 )}
 
 ${helpers.predefined_type(
@@ -82,7 +82,7 @@ ${helpers.predefined_type(
     servo_2020_pref="layout.2020.unimplemented",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap",
-    alias="word-wrap",
+    aliases="word-wrap",
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
diff --git a/components/style/properties/longhands/margin.mako.rs b/components/style/properties/longhands/margin.mako.rs
index c28ca5f6560..75d16a3cccd 100644
--- a/components/style/properties/longhands/margin.mako.rs
+++ b/components/style/properties/longhands/margin.mako.rs
@@ -17,7 +17,7 @@
         "LengthPercentageOrAuto",
         "computed::LengthPercentageOrAuto::zero()",
         engines="gecko servo-2013 servo-2020",
-        alias=maybe_moz_logical_alias(engine, side, "-moz-margin-%s"),
+        aliases=maybe_moz_logical_alias(engine, side, "-moz-margin-%s"),
         allow_quirks="No" if side[1] else "Yes",
         animation_value_type="ComputedValue",
         logical=side[1],
diff --git a/components/style/properties/longhands/padding.mako.rs b/components/style/properties/longhands/padding.mako.rs
index 79668df7bbf..84683412f2c 100644
--- a/components/style/properties/longhands/padding.mako.rs
+++ b/components/style/properties/longhands/padding.mako.rs
@@ -17,7 +17,7 @@
         "NonNegativeLengthPercentage",
         "computed::NonNegativeLengthPercentage::zero()",
         engines="gecko servo-2013 servo-2020",
-        alias=maybe_moz_logical_alias(engine, side, "-moz-padding-%s"),
+        aliases=maybe_moz_logical_alias(engine, side, "-moz-padding-%s"),
         animation_value_type="NonNegativeLengthPercentage",
         logical=side[1],
         logical_group="padding",
diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs
index e5afe7b2883..4500b7d911f 100644
--- a/components/style/properties/longhands/position.mako.rs
+++ b/components/style/properties/longhands/position.mako.rs
@@ -432,7 +432,7 @@ ${helpers.predefined_type(
     "length::NonNegativeLengthPercentageOrNormal",
     "computed::length::NonNegativeLengthPercentageOrNormal::normal()",
     engines="gecko servo-2013",
-    alias="grid-column-gap" if engine == "gecko" else "",
+    aliases="grid-column-gap" if engine == "gecko" else "",
     extra_prefixes="moz:layout.css.prefixes.columns",
     servo_2013_pref="layout.columns.enabled",
     spec="https://drafts.csswg.org/css-align-3/#propdef-column-gap",
@@ -446,7 +446,7 @@ ${helpers.predefined_type(
     "length::NonNegativeLengthPercentageOrNormal",
     "computed::length::NonNegativeLengthPercentageOrNormal::normal()",
     engines="gecko",
-    alias="grid-row-gap",
+    aliases="grid-row-gap",
     spec="https://drafts.csswg.org/css-align-3/#propdef-row-gap",
     animation_value_type="NonNegativeLengthPercentageOrNormal",
     servo_restyle_damage="reflow",
diff --git a/components/style/properties/longhands/xul.mako.rs b/components/style/properties/longhands/xul.mako.rs
index a981f5ba795..a939b018920 100644
--- a/components/style/properties/longhands/xul.mako.rs
+++ b/components/style/properties/longhands/xul.mako.rs
@@ -15,7 +15,7 @@ ${helpers.single_keyword(
     gecko_ffi_name="mBoxAlign",
     gecko_enum_prefix="StyleBoxAlign",
     animation_value_type="discrete",
-    alias="-webkit-box-align",
+    aliases="-webkit-box-align",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-align)",
 )}
 
@@ -26,7 +26,7 @@ ${helpers.single_keyword(
     gecko_ffi_name="mBoxDirection",
     gecko_enum_prefix="StyleBoxDirection",
     animation_value_type="discrete",
-    alias="-webkit-box-direction",
+    aliases="-webkit-box-direction",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-direction)",
 )}
 
@@ -37,7 +37,7 @@ ${helpers.predefined_type(
     engines="gecko",
     gecko_ffi_name="mBoxFlex",
     animation_value_type="NonNegativeNumber",
-    alias="-webkit-box-flex",
+    aliases="-webkit-box-flex",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex)",
 )}
 
@@ -49,7 +49,7 @@ ${helpers.single_keyword(
     gecko_aliases="inline-axis=horizontal block-axis=vertical",
     gecko_enum_prefix="StyleBoxOrient",
     animation_value_type="discrete",
-    alias="-webkit-box-orient",
+    aliases="-webkit-box-orient",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-orient)",
 )}
 
@@ -60,7 +60,7 @@ ${helpers.single_keyword(
     gecko_ffi_name="mBoxPack",
     gecko_enum_prefix="StyleBoxPack",
     animation_value_type="discrete",
-    alias="-webkit-box-pack",
+    aliases="-webkit-box-pack",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)",
 )}
 
@@ -72,7 +72,7 @@ ${helpers.predefined_type(
     "1",
     engines="gecko",
     parse_method="parse_non_negative",
-    alias="-webkit-box-ordinal-group",
+    aliases="-webkit-box-ordinal-group",
     gecko_ffi_name="mBoxOrdinal",
     animation_value_type="discrete",
     spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-box-ordinal-group)",
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 31da5e8a700..a3430526458 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -1948,7 +1948,7 @@ impl PropertyId {
                 % for (kind, properties) in [("Longhand", data.longhands), ("Shorthand", data.shorthands)]:
                 % for property in properties:
                 "${property.name}" => StaticId::${kind}(${kind}Id::${property.camel_case}),
-                % for alias in property.alias:
+                % for alias in property.aliases:
                 "${alias.name}" => {
                     StaticId::${kind}Alias(
                         ${kind}Id::${property.camel_case},
@@ -4089,7 +4089,7 @@ macro_rules! css_properties_accessors {
             % for kind, props in [("Longhand", data.longhands), ("Shorthand", data.shorthands)]:
                 % for property in props:
                     % if property.enabled_in_content():
-                        % for prop in [property] + property.alias:
+                        % for prop in [property] + property.aliases:
                             % if '-' in prop.name:
                                 [${prop.ident.capitalize()}, Set${prop.ident.capitalize()},
                                  PropertyId::${kind}(${kind}Id::${property.camel_case})],
diff --git a/components/style/properties/shorthands/border.mako.rs b/components/style/properties/shorthands/border.mako.rs
index c204c878444..b8c5a7f2e16 100644
--- a/components/style/properties/shorthands/border.mako.rs
+++ b/components/style/properties/shorthands/border.mako.rs
@@ -112,7 +112,7 @@ pub fn parse_border<'i, 't>(
             'border-%s-%s' % (side, prop)
             for prop in ['color', 'style', 'width']
         )}"
-        alias="${maybe_moz_logical_alias(engine, (side, logical), '-moz-border-%s')}"
+        aliases="${maybe_moz_logical_alias(engine, (side, logical), '-moz-border-%s')}"
         spec="${spec}">
 
     pub fn parse_value<'i, 't>(
diff --git a/components/style/properties/shorthands/position.mako.rs b/components/style/properties/shorthands/position.mako.rs
index 0dacdc4c7cf..28343b8a562 100644
--- a/components/style/properties/shorthands/position.mako.rs
+++ b/components/style/properties/shorthands/position.mako.rs
@@ -115,7 +115,7 @@
 <%helpers:shorthand
     name="gap"
     engines="gecko"
-    alias="grid-gap"
+    aliases="grid-gap"
     sub_properties="row-gap column-gap"
     spec="https://drafts.csswg.org/css-align-3/#gap-shorthand"
 >

From b90f5f099f0b882cf979287e2a3c66b214b60a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 23 Feb 2021 00:46:36 +0000
Subject: [PATCH 131/156] style: Hide :-moz-submit-invalid behind a pref.

No other browser supports anything like this and we don't even have
internal users. Only uses of this I've found on the wild were just
resetting the box shadow internal styling we added in bug 582277 (and
since removed in bug 600151).

Differential Revision: https://phabricator.services.mozilla.com/D105955
---
 components/style/gecko/selector_parser.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 7010de45c7f..dbb9ac4db0d 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -140,6 +140,9 @@ impl NonTSPseudoClass {
         if let NonTSPseudoClass::Autofill = *self {
             return static_prefs::pref!("layout.css.autofill.enabled");
         }
+        if let NonTSPseudoClass::MozSubmitInvalid = *self {
+            return static_prefs::pref!("layout.css.moz-submit-invalid.enabled");
+        }
         !self.has_any_flag(NonTSPseudoClassFlag::PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME)
     }
 

From 786b08a669a7b3f661e1f0b2a7db2ce4dfaa4a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 23 Feb 2021 10:43:03 +0000
Subject: [PATCH 132/156] style: Increase custom property size limit a bit.

Differential Revision: https://phabricator.services.mozilla.com/D105978
---
 components/style/custom_properties.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs
index 4a0bf5bed7a..0d0a4322333 100644
--- a/components/style/custom_properties.rs
+++ b/components/style/custom_properties.rs
@@ -174,11 +174,11 @@ impl VariableValue {
         /// Prevent values from getting terribly big since you can use custom
         /// properties exponentially.
         ///
-        /// This number (1MB) is somewhat arbitrary, but silly enough that no
-        /// sane page would hit it. We could limit by number of total
+        /// This number (2MB) is somewhat arbitrary, but silly enough that no
+        /// reasonable page should hit it. We could limit by number of total
         /// substitutions, but that was very easy to work around in practice
         /// (just choose a larger initial value and boom).
-        const MAX_VALUE_LENGTH_IN_BYTES: usize = 1024 * 1024;
+        const MAX_VALUE_LENGTH_IN_BYTES: usize = 2 * 1024 * 1024;
 
         if self.css.len() + css.len() > MAX_VALUE_LENGTH_IN_BYTES {
             return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError));

From 35b080e021f80ee2c0b343641ca8dbdca42834c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 24 Feb 2021 01:11:40 +0000
Subject: [PATCH 133/156] style: Implement :user-valid and :user-invalid.

And alias :-moz-ui-valid and :-moz-ui-invalid to them.

There are CSSWG resolutions for these for quite a while, and spec for
user-invalid.

Differential Revision: https://phabricator.services.mozilla.com/D105966
---
 components/style/gecko/non_ts_pseudo_class_list.rs | 4 ++--
 components/style/gecko/selector_parser.rs          | 2 ++
 components/style/gecko/wrapper.rs                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/style/gecko/non_ts_pseudo_class_list.rs b/components/style/gecko/non_ts_pseudo_class_list.rs
index 1fff5d19050..317cbfb83fe 100644
--- a/components/style/gecko/non_ts_pseudo_class_list.rs
+++ b/components/style/gecko/non_ts_pseudo_class_list.rs
@@ -77,8 +77,8 @@ macro_rules! apply_non_ts_list {
                 ("read-only", ReadOnly, IN_READONLY_STATE, _),
                 ("read-write", ReadWrite, IN_READWRITE_STATE, _),
                 ("-moz-submit-invalid", MozSubmitInvalid, IN_MOZ_SUBMITINVALID_STATE, _),
-                ("-moz-ui-valid", MozUIValid, IN_MOZ_UI_VALID_STATE, _),
-                ("-moz-ui-invalid", MozUIInvalid, IN_MOZ_UI_INVALID_STATE, _),
+                ("user-valid", UserValid, IN_MOZ_UI_VALID_STATE, _),
+                ("user-invalid", UserInvalid, IN_MOZ_UI_INVALID_STATE, _),
                 ("-moz-meter-optimum", MozMeterOptimum, IN_OPTIMUM_STATE, _),
                 ("-moz-meter-sub-optimum", MozMeterSubOptimum, IN_SUB_OPTIMUM_STATE, _),
                 ("-moz-meter-sub-sub-optimum", MozMeterSubSubOptimum, IN_SUB_SUB_OPTIMUM_STATE, _),
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index dbb9ac4db0d..4e552e439e9 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -103,6 +103,8 @@ impl NonTSPseudoClass {
                     "-moz-read-only" => Some(NonTSPseudoClass::ReadOnly),
                     "-moz-read-write" => Some(NonTSPseudoClass::ReadWrite),
                     "-moz-focusring" => Some(NonTSPseudoClass::FocusVisible),
+                    "-moz-ui-valid" => Some(NonTSPseudoClass::UserValid),
+                    "-moz-ui-invalid" => Some(NonTSPseudoClass::UserInvalid),
                     "-webkit-autofill" => Some(NonTSPseudoClass::Autofill),
                     _ => None,
                 }
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 80a2478e94c..1813c225c57 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -2030,7 +2030,6 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::Target |
             NonTSPseudoClass::Valid |
             NonTSPseudoClass::Invalid |
-            NonTSPseudoClass::MozUIValid |
             NonTSPseudoClass::MozBroken |
             NonTSPseudoClass::MozLoading |
             NonTSPseudoClass::Required |
@@ -2047,7 +2046,8 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
             NonTSPseudoClass::OutOfRange |
             NonTSPseudoClass::Default |
             NonTSPseudoClass::MozSubmitInvalid |
-            NonTSPseudoClass::MozUIInvalid |
+            NonTSPseudoClass::UserValid |
+            NonTSPseudoClass::UserInvalid |
             NonTSPseudoClass::MozMeterOptimum |
             NonTSPseudoClass::MozMeterSubOptimum |
             NonTSPseudoClass::MozMeterSubSubOptimum |

From 52d39fc1bc436e41a2e74583bfaee6120ddd4128 Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Thu, 25 Feb 2021 01:50:55 +0000
Subject: [PATCH 134/156] style: Move Ratio into independent files.

Based on https://drafts.csswg.org/css-values/#ratios, <ratio> should be
a general types in css values, and now the media query and the position use
this type, so let's move it into the independent files.

Differential Revision: https://phabricator.services.mozilla.com/D106218
---
 components/style/gecko/media_features.rs      |  2 +-
 .../style/media_queries/media_feature.rs      |  2 +-
 .../media_queries/media_feature_expression.rs | 15 ++----
 components/style/values/computed/mod.rs       |  2 +
 components/style/values/computed/position.rs  | 33 +-----------
 components/style/values/computed/ratio.rs     | 39 ++++++++++++++
 components/style/values/generics/mod.rs       |  4 +-
 components/style/values/generics/position.rs  | 47 +---------------
 components/style/values/generics/ratio.rs     | 53 +++++++++++++++++++
 components/style/values/specified/mod.rs      |  2 +
 components/style/values/specified/position.rs | 26 ++-------
 components/style/values/specified/ratio.rs    | 32 +++++++++++
 12 files changed, 142 insertions(+), 115 deletions(-)
 create mode 100644 components/style/values/computed/ratio.rs
 create mode 100644 components/style/values/generics/ratio.rs
 create mode 100644 components/style/values/specified/ratio.rs

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 03fea6e51e4..0e010f7a0cb 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -10,8 +10,8 @@ use crate::media_queries::media_feature::{AllowsRanges, ParsingRequirements};
 use crate::media_queries::media_feature::{Evaluator, MediaFeatureDescription};
 use crate::media_queries::media_feature_expression::RangeOrOperator;
 use crate::media_queries::{Device, MediaType};
-use crate::values::computed::position::Ratio;
 use crate::values::computed::CSSPixelLength;
+use crate::values::computed::Ratio;
 use crate::values::computed::Resolution;
 use crate::Atom;
 use app_units::Au;
diff --git a/components/style/media_queries/media_feature.rs b/components/style/media_queries/media_feature.rs
index cad695413c3..e6edff3f68a 100644
--- a/components/style/media_queries/media_feature.rs
+++ b/components/style/media_queries/media_feature.rs
@@ -7,7 +7,7 @@
 use super::media_feature_expression::RangeOrOperator;
 use super::Device;
 use crate::parser::ParserContext;
-use crate::values::computed::position::Ratio;
+use crate::values::computed::Ratio;
 use crate::values::computed::{CSSPixelLength, Resolution};
 use crate::Atom;
 use cssparser::Parser;
diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs
index 08b13136ef9..41be485d5c0 100644
--- a/components/style/media_queries/media_feature_expression.rs
+++ b/components/style/media_queries/media_feature_expression.rs
@@ -15,8 +15,7 @@ use crate::parser::{Parse, ParserContext};
 #[cfg(feature = "servo")]
 use crate::servo::media_queries::MEDIA_FEATURES;
 use crate::str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
-use crate::values::computed::position::Ratio;
-use crate::values::computed::{self, ToComputedValue};
+use crate::values::computed::{self, Ratio, ToComputedValue};
 use crate::values::specified::{Integer, Length, Number, Resolution};
 use crate::values::{serialize_atom_identifier, CSSFloat};
 use crate::{Atom, Zero};
@@ -498,15 +497,9 @@ impl MediaExpressionValue {
                 MediaExpressionValue::Float(number.get())
             },
             Evaluator::NumberRatio(..) => {
-                use crate::values::generics::position::Ratio as GenericRatio;
-                use crate::values::generics::NonNegative;
-                use crate::values::specified::position::Ratio;
-
-                let ratio = Ratio::parse(context, input)?;
-                MediaExpressionValue::NumberRatio(GenericRatio(
-                    NonNegative(ratio.0.get()),
-                    NonNegative(ratio.1.get()),
-                ))
+                use crate::values::specified::Ratio as SpecifiedRatio;
+                let ratio = SpecifiedRatio::parse(context, input)?;
+                MediaExpressionValue::NumberRatio(Ratio::new(ratio.0.get(), ratio.1.get()))
             },
             Evaluator::Resolution(..) => {
                 MediaExpressionValue::Resolution(Resolution::parse(context, input)?)
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 9ac147c8279..38ed9cbb90a 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -77,6 +77,7 @@ pub use self::position::AspectRatio;
 pub use self::position::{
     GridAutoFlow, GridTemplateAreas, MasonryAutoFlow, Position, PositionOrAuto, ZIndex,
 };
+pub use self::ratio::Ratio;
 pub use self::rect::NonNegativeLengthOrNumberRect;
 pub use self::resolution::Resolution;
 pub use self::svg::MozContextProperties;
@@ -122,6 +123,7 @@ pub mod outline;
 pub mod page;
 pub mod percentage;
 pub mod position;
+pub mod ratio;
 pub mod rect;
 pub mod resolution;
 pub mod svg;
diff --git a/components/style/values/computed/position.rs b/components/style/values/computed/position.rs
index f5e586fdfa4..6d09e327e63 100644
--- a/components/style/values/computed/position.rs
+++ b/components/style/values/computed/position.rs
@@ -12,11 +12,9 @@ use crate::values::generics::position::AspectRatio as GenericAspectRatio;
 use crate::values::generics::position::Position as GenericPosition;
 use crate::values::generics::position::PositionComponent as GenericPositionComponent;
 use crate::values::generics::position::PositionOrAuto as GenericPositionOrAuto;
-use crate::values::generics::position::Ratio as GenericRatio;
 use crate::values::generics::position::ZIndex as GenericZIndex;
 pub use crate::values::specified::position::{GridAutoFlow, GridTemplateAreas, MasonryAutoFlow};
-use crate::{One, Zero};
-use std::cmp::{Ordering, PartialOrd};
+use crate::Zero;
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
 
@@ -72,34 +70,5 @@ impl GenericPositionComponent for LengthPercentage {
 /// A computed value for the `z-index` property.
 pub type ZIndex = GenericZIndex<Integer>;
 
-/// A computed <ratio> value.
-pub type Ratio = GenericRatio<NonNegativeNumber>;
-
-impl PartialOrd for Ratio {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        f64::partial_cmp(
-            &((self.0).0 as f64 * (other.1).0 as f64),
-            &((self.1).0 as f64 * (other.0).0 as f64),
-        )
-    }
-}
-
-impl Ratio {
-    /// Returns a new Ratio.
-    pub fn new(a: f32, b: f32) -> Self {
-        GenericRatio(a.into(), b.into())
-    }
-
-    /// Returns the used value. A ratio of 0/0 behaves as the ratio 1/0.
-    /// https://drafts.csswg.org/css-values-4/#ratios
-    pub fn used_value(self) -> Self {
-        if self.0.is_zero() && self.1.is_zero() {
-            Ratio::new(One::one(), Zero::zero())
-        } else {
-            self
-        }
-    }
-}
-
 /// A computed value for the `aspect-ratio` property.
 pub type AspectRatio = GenericAspectRatio<NonNegativeNumber>;
diff --git a/components/style/values/computed/ratio.rs b/components/style/values/computed/ratio.rs
new file mode 100644
index 00000000000..b1786f3983f
--- /dev/null
+++ b/components/style/values/computed/ratio.rs
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! `<ratio>` computed values.
+
+use crate::values::computed::NonNegativeNumber;
+use crate::values::generics::ratio::Ratio as GenericRatio;
+use crate::{One, Zero};
+use std::cmp::{Ordering, PartialOrd};
+
+/// A computed <ratio> value.
+pub type Ratio = GenericRatio<NonNegativeNumber>;
+
+impl PartialOrd for Ratio {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        f64::partial_cmp(
+            &((self.0).0 as f64 * (other.1).0 as f64),
+            &((self.1).0 as f64 * (other.0).0 as f64),
+        )
+    }
+}
+
+impl Ratio {
+    /// Returns a new Ratio.
+    pub fn new(a: f32, b: f32) -> Self {
+        GenericRatio(a.into(), b.into())
+    }
+
+    /// Returns the used value. A ratio of 0/0 behaves as the ratio 1/0.
+    /// https://drafts.csswg.org/css-values-4/#ratios
+    pub fn used_value(self) -> Self {
+        if self.0.is_zero() && self.1.is_zero() {
+            Ratio::new(One::one(), Zero::zero())
+        } else {
+            self
+        }
+    }
+}
diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs
index 1bcfa23352d..b1536bb7f33 100644
--- a/components/style/values/generics/mod.rs
+++ b/components/style/values/generics/mod.rs
@@ -11,8 +11,7 @@ use crate::parser::{Parse, ParserContext};
 use crate::Zero;
 use cssparser::Parser;
 use std::ops::Add;
-use style_traits::{KeywordsCollectFn, ParseError};
-use style_traits::{SpecifiedValueInfo, StyleParseErrorKind};
+use style_traits::{KeywordsCollectFn, ParseError, SpecifiedValueInfo, StyleParseErrorKind};
 
 pub mod background;
 pub mod basic_shape;
@@ -33,6 +32,7 @@ pub mod length;
 pub mod motion;
 pub mod page;
 pub mod position;
+pub mod ratio;
 pub mod rect;
 pub mod size;
 pub mod svg;
diff --git a/components/style/values/generics/position.rs b/components/style/values/generics/position.rs
index 76e5c94e056..7a909ccfc90 100644
--- a/components/style/values/generics/position.rs
+++ b/components/style/values/generics/position.rs
@@ -5,8 +5,7 @@
 //! Generic types for CSS handling of specified and computed values of
 //! [`position`](https://drafts.csswg.org/css-backgrounds-3/#position)
 
-use std::fmt::{self, Write};
-use style_traits::{CssWriter, ToCss};
+use crate::values::generics::ratio::Ratio;
 
 /// A generic type for representing a CSS [position](https://drafts.csswg.org/css-values/#position).
 #[derive(
@@ -154,50 +153,6 @@ impl<Integer> ZIndex<Integer> {
     }
 }
 
-/// A generic value for the `<ratio>` value.
-#[derive(
-    Animate,
-    Clone,
-    ComputeSquaredDistance,
-    Copy,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    SpecifiedValueInfo,
-    ToAnimatedZero,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-)]
-#[repr(C)]
-pub struct Ratio<N>(pub N, pub N);
-
-impl<N> ToCss for Ratio<N>
-where
-    N: ToCss
-{
-    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
-    where
-        W: Write,
-    {
-        self.0.to_css(dest)?;
-        // Even though 1 could be omitted, we don't per
-        // https://drafts.csswg.org/css-values-4/#ratio-value:
-        //
-        //     The second <number> is optional, defaulting to 1. However,
-        //     <ratio> is always serialized with both components.
-        //
-        // And for compat reasons, see bug 1669742.
-        //
-        // We serialize with spaces for consistency with all other
-        // slash-delimited things, see
-        // https://github.com/w3c/csswg-drafts/issues/4282
-        dest.write_str(" / ")?;
-        self.1.to_css(dest)?;
-        Ok(())
-    }
-}
-
 /// Ratio or None.
 #[derive(
     Animate,
diff --git a/components/style/values/generics/ratio.rs b/components/style/values/generics/ratio.rs
new file mode 100644
index 00000000000..ea3354f9828
--- /dev/null
+++ b/components/style/values/generics/ratio.rs
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Generic types for CSS values related to <ratio>.
+//! https://drafts.csswg.org/css-values/#ratios
+
+use std::fmt::{self, Write};
+use style_traits::{CssWriter, ToCss};
+
+/// A generic value for the `<ratio>` value.
+#[derive(
+    Animate,
+    Clone,
+    ComputeSquaredDistance,
+    Copy,
+    Debug,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToAnimatedZero,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+#[repr(C)]
+pub struct Ratio<N>(pub N, pub N);
+
+impl<N> ToCss for Ratio<N>
+where
+    N: ToCss,
+{
+    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
+    where
+        W: Write,
+    {
+        self.0.to_css(dest)?;
+        // Even though 1 could be omitted, we don't per
+        // https://drafts.csswg.org/css-values-4/#ratio-value:
+        //
+        //     The second <number> is optional, defaulting to 1. However,
+        //     <ratio> is always serialized with both components.
+        //
+        // And for compat reasons, see bug 1669742.
+        //
+        // We serialize with spaces for consistency with all other
+        // slash-delimited things, see
+        // https://github.com/w3c/csswg-drafts/issues/4282
+        dest.write_str(" / ")?;
+        self.1.to_css(dest)?;
+        Ok(())
+    }
+}
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index f5183993f64..d60c5d87f1f 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -77,6 +77,7 @@ pub use self::position::{
     GridAutoFlow, GridTemplateAreas, MasonryAutoFlow, Position, PositionOrAuto,
 };
 pub use self::position::{PositionComponent, ZIndex};
+pub use self::ratio::Ratio;
 pub use self::rect::NonNegativeLengthOrNumberRect;
 pub use self::resolution::Resolution;
 pub use self::svg::MozContextProperties;
@@ -124,6 +125,7 @@ pub mod outline;
 pub mod percentage;
 pub mod page;
 pub mod position;
+pub mod ratio;
 pub mod rect;
 pub mod resolution;
 pub mod source_size_list;
diff --git a/components/style/values/specified/position.rs b/components/style/values/specified/position.rs
index 9810959f3a6..26359c155c6 100644
--- a/components/style/values/specified/position.rs
+++ b/components/style/values/specified/position.rs
@@ -16,10 +16,9 @@ use crate::values::generics::position::AspectRatio as GenericAspectRatio;
 use crate::values::generics::position::Position as GenericPosition;
 use crate::values::generics::position::PositionComponent as GenericPositionComponent;
 use crate::values::generics::position::PositionOrAuto as GenericPositionOrAuto;
-use crate::values::generics::position::Ratio as GenericRatio;
 use crate::values::generics::position::ZIndex as GenericZIndex;
 use crate::values::specified::{AllowQuirks, Integer, LengthPercentage, NonNegativeNumber};
-use crate::{Atom, One, Zero};
+use crate::{Atom, Zero};
 use cssparser::Parser;
 use selectors::parser::SelectorParseErrorKind;
 use servo_arc::Arc;
@@ -900,6 +899,7 @@ impl Parse for AspectRatio {
         input: &mut Parser<'i, 't>,
     ) -> Result<Self, ParseError<'i>> {
         use crate::values::generics::position::PreferredRatio;
+        use crate::values::specified::Ratio;
 
         let location = input.current_source_location();
         let mut auto = input.try_parse(|i| i.expect_ident_matching("auto"));
@@ -926,31 +926,13 @@ impl AspectRatio {
     /// Returns Self by a valid ratio.
     pub fn from_mapped_ratio(w: f32, h: f32) -> Self {
         use crate::values::generics::position::PreferredRatio;
+        use crate::values::generics::ratio::Ratio;
         AspectRatio {
             auto: true,
-            ratio: PreferredRatio::Ratio(GenericRatio(
+            ratio: PreferredRatio::Ratio(Ratio(
                 NonNegativeNumber::new(w),
                 NonNegativeNumber::new(h),
             )),
         }
     }
 }
-
-/// A specified <ratio> value.
-pub type Ratio = GenericRatio<NonNegativeNumber>;
-
-// https://drafts.csswg.org/css-values-4/#ratios
-impl Parse for Ratio {
-    fn parse<'i, 't>(
-        context: &ParserContext,
-        input: &mut Parser<'i, 't>,
-    ) -> Result<Self, ParseError<'i>> {
-        let a = NonNegativeNumber::parse(context, input)?;
-        let b = match input.try_parse(|input| input.expect_delim('/')) {
-            Ok(()) => NonNegativeNumber::parse(context, input)?,
-            _ => One::one(),
-        };
-
-        Ok(GenericRatio(a, b))
-    }
-}
diff --git a/components/style/values/specified/ratio.rs b/components/style/values/specified/ratio.rs
new file mode 100644
index 00000000000..4cdddd452ed
--- /dev/null
+++ b/components/style/values/specified/ratio.rs
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! Specified types for <ratio>.
+//!
+//! [ratio]: https://drafts.csswg.org/css-values/#ratios
+
+use crate::parser::{Parse, ParserContext};
+use crate::values::generics::ratio::Ratio as GenericRatio;
+use crate::values::specified::NonNegativeNumber;
+use crate::One;
+use cssparser::Parser;
+use style_traits::ParseError;
+
+/// A specified <ratio> value.
+pub type Ratio = GenericRatio<NonNegativeNumber>;
+
+impl Parse for Ratio {
+    fn parse<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+    ) -> Result<Self, ParseError<'i>> {
+        let a = NonNegativeNumber::parse(context, input)?;
+        let b = match input.try_parse(|input| input.expect_delim('/')) {
+            Ok(()) => NonNegativeNumber::parse(context, input)?,
+            _ => One::one(),
+        };
+
+        Ok(GenericRatio(a, b))
+    }
+}

From 0ef2410ea07b5a3443e14d6a3d3ce5b3b4d59fbb Mon Sep 17 00:00:00 2001
From: Boris Chiou <boris.chiou@gmail.com>
Date: Thu, 25 Feb 2021 01:50:55 +0000
Subject: [PATCH 135/156] style: Implement Animate trait and
 ComputeSquaredDistance trait for <ratio>.

I also update the wpt becasue it seems the original one lets <ratio>
support the addition. However, the spec says "Addition of <ratio>s is not
possible".

Differential Revision: https://phabricator.services.mozilla.com/D106219
---
 .../properties/longhands/position.mako.rs     |  2 +-
 components/style/values/computed/ratio.rs     | 66 +++++++++++++++++++
 components/style/values/generics/position.rs  | 19 +++++-
 components/style/values/generics/ratio.rs     |  3 -
 4 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs
index 4500b7d911f..56c60a71ce9 100644
--- a/components/style/properties/longhands/position.mako.rs
+++ b/components/style/properties/longhands/position.mako.rs
@@ -457,7 +457,7 @@ ${helpers.predefined_type(
     "AspectRatio",
     "computed::AspectRatio::auto()",
     engines="gecko servo-2013",
-    animation_value_type="discrete",
+    animation_value_type="ComputedValue",
     spec="https://drafts.csswg.org/css-sizing-4/#aspect-ratio",
     gecko_pref="layout.css.aspect-ratio.enabled",
     servo_restyle_damage="reflow",
diff --git a/components/style/values/computed/ratio.rs b/components/style/values/computed/ratio.rs
index b1786f3983f..ba40039eae1 100644
--- a/components/style/values/computed/ratio.rs
+++ b/components/style/values/computed/ratio.rs
@@ -4,7 +4,9 @@
 
 //! `<ratio>` computed values.
 
+use crate::values::animated::{Animate, Procedure};
 use crate::values::computed::NonNegativeNumber;
+use crate::values::distance::{ComputeSquaredDistance, SquaredDistance};
 use crate::values::generics::ratio::Ratio as GenericRatio;
 use crate::{One, Zero};
 use std::cmp::{Ordering, PartialOrd};
@@ -21,8 +23,58 @@ impl PartialOrd for Ratio {
     }
 }
 
+/// https://drafts.csswg.org/css-values/#combine-ratio
+impl Animate for Ratio {
+    fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
+        // If either <ratio> is degenerate, the values cannot be interpolated.
+        if self.is_degenerate() || other.is_degenerate() {
+            return Err(());
+        }
+
+        // Addition of <ratio>s is not possible, and based on
+        // https://drafts.csswg.org/css-values-4/#not-additive,
+        // we simply use the first value as the result value.
+        // Besides, the procedure for accumulation should be identical to addition here.
+        if matches!(procedure, Procedure::Add | Procedure::Accumulate { .. }) {
+            return Ok(self.clone());
+        }
+
+        // The interpolation of a <ratio> is defined by converting each <ratio> to a number by
+        // dividing the first value by the second (so a ratio of 3 / 2 would become 1.5), taking
+        // the logarithm of that result (so the 1.5 would become approximately 0.176), then
+        // interpolating those values.
+        //
+        // The result during the interpolation is converted back to a <ratio> by inverting the
+        // logarithm, then interpreting the result as a <ratio> with the result as the first value
+        // and 1 as the second value.
+        let start = self.to_f32().ln();
+        let end = other.to_f32().ln();
+        let e = std::f32::consts::E;
+        let result = e.powf(start.animate(&end, procedure)?);
+        // The range of the result is [0, inf), based on the easing function.
+        if result.is_zero() || result.is_infinite() {
+            return Err(());
+        }
+        Ok(Ratio::new(result, 1.0f32))
+    }
+}
+
+impl ComputeSquaredDistance for Ratio {
+    fn compute_squared_distance(&self, other: &Self) -> Result<SquaredDistance, ()> {
+        if self.is_degenerate() || other.is_degenerate() {
+            return Err(());
+        }
+        // Use the distance of their logarithm values. (This is used by testing, so don't need to
+        // care about the base. Here we use the same base as that in animate().)
+        self.to_f32()
+            .ln()
+            .compute_squared_distance(&other.to_f32().ln())
+    }
+}
+
 impl Ratio {
     /// Returns a new Ratio.
+    #[inline]
     pub fn new(a: f32, b: f32) -> Self {
         GenericRatio(a.into(), b.into())
     }
@@ -36,4 +88,18 @@ impl Ratio {
             self
         }
     }
+
+    /// Returns true if this is a degenerate ratio.
+    /// https://drafts.csswg.org/css-values/#degenerate-ratio
+    #[inline]
+    pub fn is_degenerate(&self) -> bool {
+        self.0.is_zero() || self.1.is_zero()
+    }
+
+    /// Returns the f32 value by dividing the first value by the second one.
+    #[inline]
+    fn to_f32(&self) -> f32 {
+        debug_assert!(!self.is_degenerate());
+        (self.0).0 / (self.1).0
+    }
 }
diff --git a/components/style/values/generics/position.rs b/components/style/values/generics/position.rs
index 7a909ccfc90..17afb1c39b1 100644
--- a/components/style/values/generics/position.rs
+++ b/components/style/values/generics/position.rs
@@ -5,6 +5,7 @@
 //! Generic types for CSS handling of specified and computed values of
 //! [`position`](https://drafts.csswg.org/css-backgrounds-3/#position)
 
+use crate::values::animated::ToAnimatedZero;
 use crate::values::generics::ratio::Ratio;
 
 /// A generic type for representing a CSS [position](https://drafts.csswg.org/css-values/#position).
@@ -163,7 +164,6 @@ impl<Integer> ZIndex<Integer> {
     MallocSizeOf,
     PartialEq,
     SpecifiedValueInfo,
-    ToAnimatedZero,
     ToComputedValue,
     ToCss,
     ToResolvedValue,
@@ -175,7 +175,12 @@ pub enum PreferredRatio<N> {
     #[css(skip)]
     None,
     /// With specified ratio
-    Ratio(#[css(field_bound)] Ratio<N>),
+    Ratio(
+        #[animation(field_bound)]
+        #[css(field_bound)]
+        #[distance(field_bound)]
+        Ratio<N>,
+    ),
 }
 
 /// A generic value for the `aspect-ratio` property, the value is `auto || <ratio>`.
@@ -188,7 +193,6 @@ pub enum PreferredRatio<N> {
     MallocSizeOf,
     PartialEq,
     SpecifiedValueInfo,
-    ToAnimatedZero,
     ToComputedValue,
     ToCss,
     ToResolvedValue,
@@ -201,7 +205,9 @@ pub struct GenericAspectRatio<N> {
     #[css(represents_keyword)]
     pub auto: bool,
     /// The preferred aspect-ratio value.
+    #[animation(field_bound)]
     #[css(field_bound)]
+    #[distance(field_bound)]
     pub ratio: PreferredRatio<N>,
 }
 
@@ -217,3 +223,10 @@ impl<N> AspectRatio<N> {
         }
     }
 }
+
+impl<N> ToAnimatedZero for AspectRatio<N> {
+    #[inline]
+    fn to_animated_zero(&self) -> Result<Self, ()> {
+        Err(())
+    }
+}
diff --git a/components/style/values/generics/ratio.rs b/components/style/values/generics/ratio.rs
index ea3354f9828..8c66fed6026 100644
--- a/components/style/values/generics/ratio.rs
+++ b/components/style/values/generics/ratio.rs
@@ -10,15 +10,12 @@ use style_traits::{CssWriter, ToCss};
 
 /// A generic value for the `<ratio>` value.
 #[derive(
-    Animate,
     Clone,
-    ComputeSquaredDistance,
     Copy,
     Debug,
     MallocSizeOf,
     PartialEq,
     SpecifiedValueInfo,
-    ToAnimatedZero,
     ToComputedValue,
     ToResolvedValue,
     ToShmem,

From a5cb6c69276a4b59b282a867734af042bf2a0e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 25 Feb 2021 18:05:08 +0000
Subject: [PATCH 136/156] style: Remove prefers-contrast: forced as per CSSWG
 resolution.

Differential Revision: https://phabricator.services.mozilla.com/D106485
---
 components/style/gecko/media_features.rs | 40 ++++++------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 0e010f7a0cb..90ee3867ea1 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -303,25 +303,11 @@ fn eval_prefers_reduced_motion(device: &Device, query_value: Option<PrefersReduc
 /// https://drafts.csswg.org/mediaqueries-5/#prefers-contrast
 #[derive(Clone, Copy, Debug, FromPrimitive, PartialEq, Parse, ToCss)]
 #[repr(u8)]
-#[allow(missing_docs)]
-enum PrefersContrast {
+pub enum PrefersContrast {
+    /// More contrast is preferred. Corresponds to an accessibility theme
+    /// being enabled or Firefox forcing high contrast colors.
     More,
-    Less,
-    NoPreference,
-    Forced,
-}
-
-/// Represents the parts of prefers-contrast that explicitly deal with
-/// contrast. Used in combination with information about rather or not
-/// forced colors are active this allows for evaluation of the
-/// prefers-contrast media query.
-#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq)]
-#[repr(u8)]
-pub enum ContrastPref {
-    /// More contrast is prefered. Corresponds to an accessibility theme
-    /// being enabled or firefox forcing high contrast colors.
-    More,
-    /// Low contrast is prefered.
+    /// Low contrast is preferred.
     Less,
     /// The default value if neither high or low contrast is enabled.
     NoPreference,
@@ -329,19 +315,11 @@ pub enum ContrastPref {
 
 /// https://drafts.csswg.org/mediaqueries-5/#prefers-contrast
 fn eval_prefers_contrast(device: &Device, query_value: Option<PrefersContrast>) -> bool {
-    let forced_colors = !device.use_document_colors();
-    let contrast_pref =
-        unsafe { bindings::Gecko_MediaFeatures_PrefersContrast(device.document(), forced_colors) };
-    if let Some(query_value) = query_value {
-        match query_value {
-            PrefersContrast::Forced => forced_colors,
-            PrefersContrast::More => contrast_pref == ContrastPref::More,
-            PrefersContrast::Less => contrast_pref == ContrastPref::Less,
-            PrefersContrast::NoPreference => contrast_pref == ContrastPref::NoPreference,
-        }
-    } else {
-        // Only prefers-contrast: no-preference evaluates to false.
-        forced_colors || (contrast_pref != ContrastPref::NoPreference)
+    let prefers_contrast =
+        unsafe { bindings::Gecko_MediaFeatures_PrefersContrast(device.document()) };
+    match query_value {
+        Some(v) => v == prefers_contrast,
+        None => prefers_contrast != PrefersContrast::NoPreference,
     }
 }
 

From a0c6628cf21db0e086603adbc1b1df98e44052f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 25 Feb 2021 18:05:08 +0000
Subject: [PATCH 137/156] Miscellaneous rebase fixes.

---
 components/style/properties/data.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/components/style/properties/data.py b/components/style/properties/data.py
index 714e3ced604..4fe90fb560b 100644
--- a/components/style/properties/data.py
+++ b/components/style/properties/data.py
@@ -335,19 +335,14 @@ class Longhand(Property):
         assert (
             has_effect_on_gecko_scrollbars in [None, False, True]
             and not style_struct.inherited
-            or (gecko_pref is None) == (has_effect_on_gecko_scrollbars is None)), (
-            "Property " + name + ": has_effect_on_gecko_scrollbars must be "
-            "specified, and must have a value of True or False, iff a "
-            "property is inherited and is behind a Gecko pref")
-        # For enabled_in, the setup is as follows:
-        # It needs to be one of the four values: ["", "ua", "chrome", "content"]
-        #  * "chrome" implies "ua", and implies that they're explicitly
-        #    enabled.
-        #  * "" implies the property will never be parsed.
-        #  * "content" implies the property is accessible unconditionally,
-        #    modulo a pref, set via servo_pref / gecko_pref.
-        assert enabled_in in ["", "ua", "chrome", "content"]
-        self.enabled_in = enabled_in
+            or (gecko_pref is None) == (has_effect_on_gecko_scrollbars is None)
+        ), (
+            "Property "
+            + name
+            + ": has_effect_on_gecko_scrollbars must be "
+            + "specified, and must have a value of True or False, iff a "
+            + "property is inherited and is behind a Gecko pref"
+        )
         self.need_index = need_index
         self.gecko_ffi_name = gecko_ffi_name or "m" + self.camel_case
         self.cast_type = cast_type

From c4ad61faa51eb12392ea7bd4877930fbdd271b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 11:31:50 +0100
Subject: [PATCH 138/156] style: Don't allow to parse image-set(none).

`none` is not technically part of the `<image>` syntax. Tests in following
patches.

Depends on D100698

Differential Revision: https://phabricator.services.mozilla.com/D100699
---
 components/style/values/specified/image.rs | 31 ++++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index b8cfeb1bbbb..2fa8d0bb1ee 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -180,7 +180,7 @@ impl Parse for Image {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Image, ParseError<'i>> {
-        Image::parse_with_cors_mode(context, input, CorsMode::None)
+        Image::parse_with_cors_mode(context, input, CorsMode::None, /* allow_none = */ true)
     }
 }
 
@@ -189,8 +189,9 @@ impl Image {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
         cors_mode: CorsMode,
+        allow_none: bool,
     ) -> Result<Image, ParseError<'i>> {
-        if input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
+        if allow_none && input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
             return Ok(generic::Image::None);
         }
         if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode)) {
@@ -249,14 +250,11 @@ impl Image {
 
     /// Provides an alternate method for parsing that associates the URL with
     /// anonymous CORS headers.
-    ///
-    /// FIXME(emilio): It'd be nicer for this to pass a `CorsMode` parameter to
-    /// a shared function instead.
     pub fn parse_with_cors_anonymous<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Image, ParseError<'i>> {
-        Self::parse_with_cors_mode(context, input, CorsMode::Anonymous)
+        Self::parse_with_cors_mode(context, input, CorsMode::Anonymous, /* allow_none = */ true)
     }
 }
 
@@ -295,17 +293,28 @@ impl CrossFadeElement {
     }
 }
 
-impl PercentOrNone {
-    fn parse_or_none<'i, 't>(
+impl CrossFadeImage {
+    fn parse<'i, 't>(
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
-    ) -> Self {
+        cors_mode: CorsMode,
+    ) -> Result<Self, ParseError<'i>> {
+        if let Ok(image) = input.try_parse(|input| Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)) {
+            return Ok(Self::Image(image))
+        }
+        Ok(Self::Color(Color::parse(context, input)?))
+    }
+}
+
+impl PercentOrNone {
+    fn parse_or_none<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Self {
         // We clamp our values here as this is the way that Safari and
         // Chrome's implementation handle out-of-bounds percentages
         // but whether or not this behavior follows the specification
         // is still being discussed. See:
         // <https://github.com/w3c/csswg-drafts/issues/5333>
-        if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input)) {
+        if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input))
+        {
             Self::Percent(percent.clamp_to_hundred())
         } else {
             Self::None
@@ -338,7 +347,7 @@ impl ImageSetItem {
     ) -> Result<Self, ParseError<'i>> {
         let image = match input.try_parse(|i| i.expect_url_or_string()) {
             Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(url.as_ref().into(), context, cors_mode)),
-            Err(..) => Image::parse(context, input)?,
+            Err(..) => Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)?,
         };
         let resolution = input.try_parse(|input| Resolution::parse(context, input)).unwrap_or(Resolution::X(1.0));
         Ok(Self {

From 80dae5bc599be3087c8fc32197bee3896091027e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 11:43:25 +0100
Subject: [PATCH 139/156] Rustfmt.

---
 components/style/gecko/media_features.rs      | 10 +++-
 components/style/gecko/media_queries.rs       |  6 +--
 components/style/gecko/selector_parser.rs     | 13 ++---
 components/style/gecko/snapshot_helpers.rs    |  2 +-
 components/style/gecko/url.rs                 | 10 ++--
 components/style/parser.rs                    |  2 +-
 components/style/selector_parser.rs           |  3 +-
 components/style/style_adjuster.rs            |  6 +--
 components/style/style_resolver.rs            |  8 +++-
 components/style/stylesheet_set.rs            | 18 +++----
 components/style/stylesheets/document_rule.rs |  8 +++-
 .../stylesheets/font_feature_values_rule.rs   |  2 +-
 .../style/stylesheets/keyframes_rule.rs       |  4 +-
 components/style/stylesheets/mod.rs           |  4 +-
 components/style/stylesheets/rule_parser.rs   | 18 +++++--
 .../style/stylesheets/rules_iterator.rs       | 10 +++-
 components/style/stylesheets/stylesheet.rs    |  7 ++-
 components/style/stylesheets/viewport_rule.rs |  2 +-
 components/style/values/computed/box.rs       |  4 +-
 components/style/values/computed/font.rs      |  2 +-
 components/style/values/computed/image.rs     |  8 ++--
 .../values/computed/length_percentage.rs      |  6 +--
 components/style/values/computed/mod.rs       |  2 +-
 components/style/values/generics/image.rs     | 34 ++------------
 components/style/values/generics/transform.rs |  4 +-
 components/style/values/specified/font.rs     |  8 +++-
 components/style/values/specified/image.rs    | 47 +++++++++++++------
 components/style/values/specified/mod.rs      |  4 +-
 28 files changed, 145 insertions(+), 107 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 90ee3867ea1..37d667896cc 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -107,7 +107,12 @@ fn eval_aspect_ratio(
     query_value: Option<Ratio>,
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
-    eval_aspect_ratio_for(device, query_value, range_or_operator, Device::au_viewport_size)
+    eval_aspect_ratio_for(
+        device,
+        query_value,
+        range_or_operator,
+        Device::au_viewport_size,
+    )
 }
 
 /// https://drafts.csswg.org/mediaqueries-4/#device-aspect-ratio
@@ -244,7 +249,8 @@ fn eval_monochrome(
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
     // For color devices we should return 0.
-    let depth = unsafe { bindings::Gecko_MediaFeatures_GetMonochromeBitsPerPixel(device.document()) };
+    let depth =
+        unsafe { bindings::Gecko_MediaFeatures_GetMonochromeBitsPerPixel(device.document()) };
     RangeOrOperator::evaluate(range_or_operator, query_value, depth)
 }
 
diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs
index 08425f22059..a116121a258 100644
--- a/components/style/gecko/media_queries.rs
+++ b/components/style/gecko/media_queries.rs
@@ -4,12 +4,12 @@
 
 //! Gecko's media-query device and expression representation.
 
+use crate::context::QuirksMode;
 use crate::custom_properties::CssEnvironment;
 use crate::gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor};
 use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs;
 use crate::media_queries::MediaType;
-use crate::context::QuirksMode;
 use crate::properties::ComputedValues;
 use crate::string_cache::Atom;
 use crate::values::computed::Length;
@@ -20,8 +20,8 @@ use cssparser::RGBA;
 use euclid::default::Size2D;
 use euclid::{Scale, SideOffsets2D};
 use servo_arc::Arc;
-use std::{cmp, fmt};
 use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
+use std::{cmp, fmt};
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel};
 
@@ -275,7 +275,7 @@ impl Device {
         };
 
         if pc.mIsRootPaginatedDocument() != 0 {
-            return self.page_size_minus_default_margin(pc)
+            return self.page_size_minus_default_margin(pc);
         }
 
         let size = &pc.mSizeForViewportUnits;
diff --git a/components/style/gecko/selector_parser.rs b/components/style/gecko/selector_parser.rs
index 4e552e439e9..a9083581234 100644
--- a/components/style/gecko/selector_parser.rs
+++ b/components/style/gecko/selector_parser.rs
@@ -184,12 +184,13 @@ impl NonTSPseudoClass {
     /// revalidation.
     pub fn needs_cache_revalidation(&self) -> bool {
         self.state_flag().is_empty() &&
-            !matches!(*self,
-                      // :dir() depends on state only, but doesn't use state_flag
-                      // because its semantics don't quite match.  Nevertheless, it
-                      // doesn't need cache revalidation, because we already compare
-                      // states for elements and candidates.
-                      NonTSPseudoClass::Dir(_) |
+            !matches!(
+                *self,
+                // :dir() depends on state only, but doesn't use state_flag
+                // because its semantics don't quite match.  Nevertheless, it
+                // doesn't need cache revalidation, because we already compare
+                // states for elements and candidates.
+                NonTSPseudoClass::Dir(_) |
                       // :-moz-is-html only depends on the state of the document and
                       // the namespace of the element; the former is invariant
                       // across all the elements involved and the latter is already
diff --git a/components/style/gecko/snapshot_helpers.rs b/components/style/gecko/snapshot_helpers.rs
index 8d99f84a958..3cb325bb6b1 100644
--- a/components/style/gecko/snapshot_helpers.rs
+++ b/components/style/gecko/snapshot_helpers.rs
@@ -52,7 +52,7 @@ unsafe fn get_class_or_part_from_attr(attr: &structs::nsAttrValue) -> Class {
             .mAtomArray
             .as_ref();
         let array = array as *const structs::nsTArray<structs::RefPtr<nsAtom>>;
-        return Class::More(&**array)
+        return Class::More(&**array);
     }
     debug_assert_eq!(base_type, structs::nsAttrValue_ValueBaseType_eStringBase);
     Class::None
diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs
index 00f4ed8266b..8cf4aa51c0a 100644
--- a/components/style/gecko/url.rs
+++ b/components/style/gecko/url.rs
@@ -109,7 +109,11 @@ impl CssUrlData {
     /// Returns true if this URL looks like a fragment.
     /// See https://drafts.csswg.org/css-values/#local-urls
     pub fn is_fragment(&self) -> bool {
-        self.as_str().as_bytes().iter().next().map_or(false, |b| *b == b'#')
+        self.as_str()
+            .as_bytes()
+            .iter()
+            .next()
+            .map_or(false, |b| *b == b'#')
     }
 
     /// Return the unresolved url as string, or the empty string if it's
@@ -291,9 +295,7 @@ impl SpecifiedImageUrl {
         cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         Ok(SpecifiedImageUrl(SpecifiedUrl::parse_with_cors_mode(
-            context,
-            input,
-            cors_mode,
+            context, input, cors_mode,
         )?))
     }
 }
diff --git a/components/style/parser.rs b/components/style/parser.rs
index f306e2f3838..837b9740024 100644
--- a/components/style/parser.rs
+++ b/components/style/parser.rs
@@ -188,7 +188,7 @@ where
 
 impl<T> Parse for Box<T>
 where
-    T: Parse
+    T: Parse,
 {
     fn parse<'i, 't>(
         context: &ParserContext,
diff --git a/components/style/selector_parser.rs b/components/style/selector_parser.rs
index 52675abf45a..e3841c15482 100644
--- a/components/style/selector_parser.rs
+++ b/components/style/selector_parser.rs
@@ -75,7 +75,8 @@ impl<'a> SelectorParser<'a> {
     /// Whether we're parsing selectors in a stylesheet that has chrome
     /// privilege.
     pub fn chrome_rules_enabled(&self) -> bool {
-        self.url_data.map_or(false, |d| d.chrome_rules_enabled()) || self.stylesheet_origin == Origin::User
+        self.url_data.map_or(false, |d| d.chrome_rules_enabled()) ||
+            self.stylesheet_origin == Origin::User
     }
 }
 
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index cc0c4a21d72..13599c6630a 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -169,14 +169,14 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     /// NOTE: If this or the pointer-events tweak is removed, then
     /// minimal-xul.css and the scrollbar style caching need to be tweaked.
     fn adjust_for_inert(&mut self) {
+        use crate::values::specified::ui::CursorKind;
+        use crate::values::specified::ui::UserSelect;
         use properties::longhands::_moz_inert::computed_value::T as Inert;
         use properties::longhands::_moz_user_focus::computed_value::T as UserFocus;
         use properties::longhands::_moz_user_input::computed_value::T as UserInput;
         use properties::longhands::_moz_user_modify::computed_value::T as UserModify;
-        use properties::longhands::pointer_events::computed_value::T as PointerEvents;
         use properties::longhands::cursor::computed_value::T as Cursor;
-        use crate::values::specified::ui::CursorKind;
-        use crate::values::specified::ui::UserSelect;
+        use properties::longhands::pointer_events::computed_value::T as PointerEvents;
 
         let needs_update = {
             let ui = self.style.get_inherited_ui();
diff --git a/components/style/style_resolver.rs b/components/style/style_resolver.rs
index 70ac1b3b4d3..7c28e001403 100644
--- a/components/style/style_resolver.rs
+++ b/components/style/style_resolver.rs
@@ -139,13 +139,17 @@ fn eager_pseudo_is_definitely_not_generated(
         return false;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE) &&
+    if !style
+        .flags
+        .intersects(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE) &&
         style.get_box().clone_display() == Display::None
     {
         return true;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE) &&
+    if !style
+        .flags
+        .intersects(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE) &&
         style.ineffective_content_property()
     {
         return true;
diff --git a/components/style/stylesheet_set.rs b/components/style/stylesheet_set.rs
index fe743025419..9e858a4566c 100644
--- a/components/style/stylesheet_set.rs
+++ b/components/style/stylesheet_set.rs
@@ -5,11 +5,13 @@
 //! A centralized set of stylesheets for a document.
 
 use crate::dom::TElement;
-use crate::invalidation::stylesheets::{StylesheetInvalidationSet, RuleChangeKind};
+use crate::invalidation::stylesheets::{RuleChangeKind, StylesheetInvalidationSet};
 use crate::media_queries::Device;
 use crate::selector_parser::SnapshotMap;
 use crate::shared_lock::SharedRwLockReadGuard;
-use crate::stylesheets::{CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument};
+use crate::stylesheets::{
+    CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument,
+};
 use std::{mem, slice};
 
 /// Entry for a StylesheetSet.
@@ -465,9 +467,9 @@ macro_rules! sheet_set_methods {
                 // Insertion / Removals need to rebuild both the cascade and
                 // invalidation data. For generic changes this is conservative,
                 // could be optimized on a per-case basis.
-                RuleChangeKind::Generic |
-                RuleChangeKind::Insertion |
-                RuleChangeKind::Removal => DataValidity::FullyInvalid,
+                RuleChangeKind::Generic | RuleChangeKind::Insertion | RuleChangeKind::Removal => {
+                    DataValidity::FullyInvalid
+                },
                 // TODO(emilio): This, in theory, doesn't need to invalidate
                 // style data, if the rule we're modifying is actually in the
                 // CascadeData already.
@@ -536,9 +538,9 @@ where
     /// Returns whether the given set has changed from the last flush.
     pub fn has_changed(&self) -> bool {
         !self.invalidations.is_empty() ||
-        self.collections
-            .iter_origins()
-            .any(|(collection, _)| collection.dirty)
+            self.collections
+                .iter_origins()
+                .any(|(collection, _)| collection.dirty)
     }
 
     /// Flush the current set, unmarking it as dirty, and returns a
diff --git a/components/style/stylesheets/document_rule.rs b/components/style/stylesheets/document_rule.rs
index 736dddb502e..c4e70855801 100644
--- a/components/style/stylesheets/document_rule.rs
+++ b/components/style/stylesheets/document_rule.rs
@@ -206,8 +206,12 @@ impl DocumentMatchingFunction {
             DocumentMatchingFunction::MediaDocument(_) => {
                 GeckoDocumentMatchingFunction::MediaDocument
             },
-            DocumentMatchingFunction::PlainTextDocument(..) => GeckoDocumentMatchingFunction::PlainTextDocument,
-            DocumentMatchingFunction::UnobservableDocument(..) => GeckoDocumentMatchingFunction::UnobservableDocument,
+            DocumentMatchingFunction::PlainTextDocument(..) => {
+                GeckoDocumentMatchingFunction::PlainTextDocument
+            },
+            DocumentMatchingFunction::UnobservableDocument(..) => {
+                GeckoDocumentMatchingFunction::UnobservableDocument
+            },
         };
 
         let pattern = nsCStr::from(match *self {
diff --git a/components/style/stylesheets/font_feature_values_rule.rs b/components/style/stylesheets/font_feature_values_rule.rs
index 8417497acba..98eef923f7e 100644
--- a/components/style/stylesheets/font_feature_values_rule.rs
+++ b/components/style/stylesheets/font_feature_values_rule.rs
@@ -20,7 +20,7 @@ use crate::values::serialize_atom_identifier;
 use crate::Atom;
 use cssparser::{AtRuleParser, AtRuleType, BasicParseErrorKind, CowRcStr};
 use cssparser::{DeclarationListParser, DeclarationParser, Parser};
-use cssparser::{QualifiedRuleParser, RuleListParser, SourceLocation, ParserState, Token};
+use cssparser::{ParserState, QualifiedRuleParser, RuleListParser, SourceLocation, Token};
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
 
diff --git a/components/style/stylesheets/keyframes_rule.rs b/components/style/stylesheets/keyframes_rule.rs
index a35d3d2d623..ad53ac6d667 100644
--- a/components/style/stylesheets/keyframes_rule.rs
+++ b/components/style/stylesheets/keyframes_rule.rs
@@ -17,7 +17,9 @@ use crate::str::CssStringWriter;
 use crate::stylesheets::rule_parser::VendorPrefix;
 use crate::stylesheets::{CssRuleType, StylesheetContents};
 use crate::values::{serialize_percentage, KeyframesName};
-use cssparser::{parse_one_rule, DeclarationListParser, DeclarationParser, ParserState, SourceLocation, Token};
+use cssparser::{
+    parse_one_rule, DeclarationListParser, DeclarationParser, ParserState, SourceLocation, Token,
+};
 use cssparser::{AtRuleParser, CowRcStr, Parser, ParserInput, QualifiedRuleParser, RuleListParser};
 use servo_arc::Arc;
 use std::fmt::{self, Write};
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index 724a54ff127..fd9be56b5b5 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -57,7 +57,9 @@ pub use self::page_rule::PageRule;
 pub use self::rule_list::{CssRules, CssRulesHelpers};
 pub use self::rule_parser::{InsertRuleContext, State, TopLevelRuleParser};
 pub use self::rules_iterator::{AllRules, EffectiveRules};
-pub use self::rules_iterator::{NestedRuleIterationCondition, EffectiveRulesIterator, RulesIterator};
+pub use self::rules_iterator::{
+    EffectiveRulesIterator, NestedRuleIterationCondition, RulesIterator,
+};
 pub use self::style_rule::StyleRule;
 pub use self::stylesheet::{AllowImportRules, SanitizationData, SanitizationKind};
 pub use self::stylesheet::{DocumentStyleSheet, Namespaces, Stylesheet};
diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs
index 4150f9936f1..df4a2c0631c 100644
--- a/components/style/stylesheets/rule_parser.rs
+++ b/components/style/stylesheets/rule_parser.rs
@@ -27,7 +27,7 @@ use crate::values::computed::font::FamilyName;
 use crate::values::{CssUrl, CustomIdent, KeyframesName};
 use crate::{Namespace, Prefix};
 use cssparser::{AtRuleParser, AtRuleType, Parser, QualifiedRuleParser, RuleListParser};
-use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, SourcePosition, ParserState};
+use cssparser::{BasicParseError, BasicParseErrorKind, CowRcStr, ParserState, SourcePosition};
 use selectors::SelectorList;
 use servo_arc::Arc;
 use style_traits::{ParseError, StyleParseErrorKind};
@@ -482,7 +482,12 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                 );
 
                 Ok(CssRule::FontFeatureValues(Arc::new(self.shared_lock.wrap(
-                    FontFeatureValuesRule::parse(&context, input, family_names, start.source_location()),
+                    FontFeatureValuesRule::parse(
+                        &context,
+                        input,
+                        family_names,
+                        start.source_location(),
+                    ),
                 ))))
             },
             AtRuleBlockPrelude::CounterStyle(name) => {
@@ -492,9 +497,12 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
                     self.namespaces,
                 );
 
-                Ok(CssRule::CounterStyle(Arc::new(self.shared_lock.wrap(
-                    parse_counter_style_body(name, &context, input, start.source_location())?.into(),
-                ))))
+                Ok(CssRule::CounterStyle(Arc::new(
+                    self.shared_lock.wrap(
+                        parse_counter_style_body(name, &context, input, start.source_location())?
+                            .into(),
+                    ),
+                )))
             },
             AtRuleBlockPrelude::Media(media_queries) => {
                 Ok(CssRule::Media(Arc::new(self.shared_lock.wrap(MediaRule {
diff --git a/components/style/stylesheets/rules_iterator.rs b/components/style/stylesheets/rules_iterator.rs
index ad3aa97590d..cc52a9550be 100644
--- a/components/style/stylesheets/rules_iterator.rs
+++ b/components/style/stylesheets/rules_iterator.rs
@@ -130,7 +130,13 @@ where
             };
 
             let mut effective = true;
-            let children = children_of_rule::<C>(rule, self.device, self.quirks_mode, self.guard, &mut effective);
+            let children = children_of_rule::<C>(
+                rule,
+                self.device,
+                self.quirks_mode,
+                self.guard,
+                &mut effective,
+            );
             if !effective {
                 continue;
             }
@@ -197,7 +203,7 @@ impl EffectiveRules {
     ) -> bool {
         match *rule {
             CssRule::Import(ref import_rule) => {
-            let import_rule = import_rule.read_with(guard);
+                let import_rule = import_rule.read_with(guard);
                 Self::process_import(guard, device, quirks_mode, import_rule)
             },
             CssRule::Document(ref doc_rule) => {
diff --git a/components/style/stylesheets/stylesheet.rs b/components/style/stylesheets/stylesheet.rs
index 8a9fd7db7cd..41c80c3cc66 100644
--- a/components/style/stylesheets/stylesheet.rs
+++ b/components/style/stylesheets/stylesheet.rs
@@ -243,7 +243,12 @@ pub trait StylesheetInDocument: ::std::fmt::Debug {
     where
         C: NestedRuleIterationCondition,
     {
-        RulesIterator::new(device, self.quirks_mode(guard), guard, self.rules(guard).iter())
+        RulesIterator::new(
+            device,
+            self.quirks_mode(guard),
+            guard,
+            self.rules(guard).iter(),
+        )
     }
 
     /// Returns whether the style-sheet applies for the current device.
diff --git a/components/style/stylesheets/viewport_rule.rs b/components/style/stylesheets/viewport_rule.rs
index b4edeadd4bc..a62b7a5bbf1 100644
--- a/components/style/stylesheets/viewport_rule.rs
+++ b/components/style/stylesheets/viewport_rule.rs
@@ -16,8 +16,8 @@ use crate::properties::StyleBuilder;
 use crate::rule_cache::RuleCacheConditions;
 use crate::shared_lock::{SharedRwLockReadGuard, StylesheetGuards, ToCssWithGuard};
 use crate::str::CssStringWriter;
-use crate::stylesheets::{Origin, StylesheetInDocument};
 use crate::stylesheets::cascading_at_rule::DescriptorDeclaration;
+use crate::stylesheets::{Origin, StylesheetInDocument};
 use crate::values::computed::{Context, ToComputedValue};
 use crate::values::generics::length::LengthPercentageOrAuto;
 use crate::values::generics::NonNegative;
diff --git a/components/style/values/computed/box.rs b/components/style/values/computed/box.rs
index 6dbdcf497de..22f5e306976 100644
--- a/components/style/values/computed/box.rs
+++ b/components/style/values/computed/box.rs
@@ -11,9 +11,9 @@ use crate::values::generics::box_::Perspective as GenericPerspective;
 use crate::values::generics::box_::VerticalAlign as GenericVerticalAlign;
 use crate::values::specified::box_ as specified;
 
+pub use crate::values::specified::box_::Clear as SpecifiedClear;
 pub use crate::values::specified::box_::{AnimationName, Appearance, BreakBetween, BreakWithin};
-pub use crate::values::specified::box_::{Clear as SpecifiedClear};
-pub use crate::values::specified::box_::{Float as SpecifiedFloat, Contain, Display, Overflow};
+pub use crate::values::specified::box_::{Contain, Display, Float as SpecifiedFloat, Overflow};
 pub use crate::values::specified::box_::{OverflowAnchor, OverflowClipBox, OverscrollBehavior};
 pub use crate::values::specified::box_::{
     ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType,
diff --git a/components/style/values/computed/font.rs b/components/style/values/computed/font.rs
index e0d6f689c31..df6a8ed667e 100644
--- a/components/style/values/computed/font.rs
+++ b/components/style/values/computed/font.rs
@@ -35,9 +35,9 @@ use style_traits::{CssWriter, ParseError, ToCss};
 use to_shmem::{self, SharedMemoryBuilder, ToShmem};
 
 pub use crate::values::computed::Length as MozScriptMinSize;
-pub use crate::values::specified::Integer as SpecifiedInteger;
 pub use crate::values::specified::font::{FontSynthesis, MozScriptSizeMultiplier};
 pub use crate::values::specified::font::{XLang, XTextZoom};
+pub use crate::values::specified::Integer as SpecifiedInteger;
 
 /// A value for the font-weight property per:
 ///
diff --git a/components/style/values/computed/image.rs b/components/style/values/computed/image.rs
index 307b7fa0c2f..5e123a07abb 100644
--- a/components/style/values/computed/image.rs
+++ b/components/style/values/computed/image.rs
@@ -7,15 +7,15 @@
 //!
 //! [image]: https://drafts.csswg.org/css-images/#image-values
 
-use crate::values::computed::position::Position;
 use crate::values::computed::percentage::Percentage;
+use crate::values::computed::position::Position;
 use crate::values::computed::url::ComputedImageUrl;
 #[cfg(feature = "gecko")]
 use crate::values::computed::NumberOrPercentage;
 use crate::values::computed::{Angle, Color, Context};
 use crate::values::computed::{
     AngleOrPercentage, LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage,
-    ToComputedValue, Resolution,
+    Resolution, ToComputedValue,
 };
 use crate::values::generics::image::{self as generic, GradientCompatMode};
 use crate::values::specified::image as specified;
@@ -26,7 +26,8 @@ use style_traits::{CssWriter, ToCss};
 
 /// Computed values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl, Color, Percentage, Resolution>;
+pub type Image =
+    generic::GenericImage<Gradient, MozImageRect, ComputedImageUrl, Color, Percentage, Resolution>;
 
 /// Computed values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
@@ -116,7 +117,6 @@ impl ToComputedValue for specified::ImageSet {
     }
 }
 
-
 /// Computed values for `-moz-image-rect(...)`.
 #[cfg(feature = "gecko")]
 pub type MozImageRect = generic::GenericMozImageRect<NumberOrPercentage, ComputedImageUrl>;
diff --git a/components/style/values/computed/length_percentage.rs b/components/style/values/computed/length_percentage.rs
index 22fd9b5f8c3..098b1abfafc 100644
--- a/components/style/values/computed/length_percentage.rs
+++ b/components/style/values/computed/length_percentage.rs
@@ -265,9 +265,9 @@ impl LengthPercentage {
                     CalcLengthPercentageLeaf::Length(l) => {
                         Self::new_length(Length::new(clamping_mode.clamp(l.px())).normalized())
                     },
-                    CalcLengthPercentageLeaf::Percentage(p) => {
-                        Self::new_percent(Percentage(clamping_mode.clamp(crate::values::normalize(p.0))))
-                    },
+                    CalcLengthPercentageLeaf::Percentage(p) => Self::new_percent(Percentage(
+                        clamping_mode.clamp(crate::values::normalize(p.0)),
+                    )),
                 }
             },
             _ => Self::new_calc_unchecked(Box::new(CalcLengthPercentage {
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index 38ed9cbb90a..a07c51fe210 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -71,7 +71,7 @@ pub use self::list::MozListReversed;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
-pub use self::page::{Orientation, PaperSize, PageSize};
+pub use self::page::{Orientation, PageSize, PaperSize};
 pub use self::percentage::{NonNegativePercentage, Percentage};
 pub use self::position::AspectRatio;
 pub use self::position::{
diff --git a/components/style/values/generics/image.rs b/components/style/values/generics/image.rs
index b4301cd1b29..bb875b9f32e 100644
--- a/components/style/values/generics/image.rs
+++ b/components/style/values/generics/image.rs
@@ -59,10 +59,10 @@ pub enum GenericImage<G, MozImageRect, ImageUrl, Color, Percentage, Resolution>
 pub use self::GenericImage as Image;
 
 /// <https://drafts.csswg.org/css-images-4/#cross-fade-function>
-#[css(comma, function = "cross-fade")]
 #[derive(
     Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss, ToComputedValue,
 )]
+#[css(comma, function = "cross-fade")]
 #[repr(C)]
 pub struct GenericCrossFade<Image, Color, Percentage> {
     /// All of the image percent pairings passed as arguments to
@@ -74,14 +74,7 @@ pub struct GenericCrossFade<Image, Color, Percentage> {
 /// A `<percent> | none` value. Represents optional percentage values
 /// assosicated with cross-fade images.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C, u8)]
 pub enum PercentOrNone<Percentage> {
@@ -94,14 +87,7 @@ pub enum PercentOrNone<Percentage> {
 
 /// An optional percent and a cross fade image.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C)]
 pub struct GenericCrossFadeElement<Image, Color, Percentage> {
@@ -115,15 +101,7 @@ pub struct GenericCrossFadeElement<Image, Color, Percentage> {
 /// An image or a color. `cross-fade` takes either when blending
 /// images together.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
-    Parse,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C, u8)]
 pub enum GenericCrossFadeImage<I, C> {
@@ -139,10 +117,8 @@ pub use self::GenericCrossFadeElement as CrossFadeElement;
 pub use self::GenericCrossFadeImage as CrossFadeImage;
 
 /// https://drafts.csswg.org/css-images-4/#image-set-notation
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss)]
 #[css(comma, function = "image-set")]
-#[derive(
-    Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss,
-)]
 #[repr(C)]
 pub struct GenericImageSet<Image, Resolution> {
     /// The index of the selected candidate. Zero for specified values.
diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs
index 21104fd44d3..141e1d056b2 100644
--- a/components/style/values/generics/transform.rs
+++ b/components/style/values/generics/transform.rs
@@ -496,9 +496,7 @@ where
                 let t = t.to_pixel_length(reference_height)? as f64;
                 Transform3D::translation(0., t, 0.)
             },
-            TranslateZ(ref z) => {
-                Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64)
-            },
+            TranslateZ(ref z) => Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64),
             Skew(theta_x, theta_y) => Transform3D::skew(
                 euclid::Angle::radians(theta_x.radians64()),
                 euclid::Angle::radians(theta_y.radians64()),
diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs
index 93b00b27751..5f45d81d83d 100644
--- a/components/style/values/specified/font.rs
+++ b/components/style/values/specified/font.rs
@@ -2325,14 +2325,18 @@ impl Parse for MathDepth {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<MathDepth, ParseError<'i>> {
-        if input.try_parse(|i| i.expect_ident_matching("auto-add")).is_ok() {
+        if input
+            .try_parse(|i| i.expect_ident_matching("auto-add"))
+            .is_ok()
+        {
             return Ok(MathDepth::AutoAdd);
         }
         if let Ok(math_depth_value) = input.try_parse(|input| Integer::parse(context, input)) {
             return Ok(MathDepth::Absolute(math_depth_value));
         }
         input.expect_function_matching("add")?;
-        let math_depth_delta_value = input.parse_nested_block(|input| Integer::parse(context, input))?;
+        let math_depth_delta_value =
+            input.parse_nested_block(|input| Integer::parse(context, input))?;
         Ok(MathDepth::Add(math_depth_delta_value))
     }
 }
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 2fa8d0bb1ee..51bacdf2ce5 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -21,7 +21,7 @@ use crate::values::specified::position::{Position, PositionComponent, Side};
 use crate::values::specified::url::SpecifiedImageUrl;
 use crate::values::specified::{
     Angle, AngleOrPercentage, Color, Length, LengthPercentage, NonNegativeLength,
-    NonNegativeLengthPercentage, Resolution
+    NonNegativeLengthPercentage, Resolution,
 };
 use crate::values::specified::{Number, NumberOrPercentage, Percentage};
 use crate::Atom;
@@ -36,7 +36,8 @@ use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss};
 
 /// Specified values for an image according to CSS-IMAGES.
 /// <https://drafts.csswg.org/css-images/#image-values>
-pub type Image = generic::Image<Gradient, MozImageRect, SpecifiedImageUrl, Color, Percentage, Resolution>;
+pub type Image =
+    generic::Image<Gradient, MozImageRect, SpecifiedImageUrl, Color, Percentage, Resolution>;
 
 /// Specified values for a CSS gradient.
 /// <https://drafts.csswg.org/css-images/#gradients>
@@ -194,7 +195,9 @@ impl Image {
         if allow_none && input.try_parse(|i| i.expect_ident_matching("none")).is_ok() {
             return Ok(generic::Image::None);
         }
-        if let Ok(url) = input.try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode)) {
+        if let Ok(url) = input
+            .try_parse(|input| SpecifiedImageUrl::parse_with_cors_mode(context, input, cors_mode))
+        {
             return Ok(generic::Image::Url(url));
         }
         if let Ok(gradient) = input.try_parse(|i| Gradient::parse(context, i)) {
@@ -218,7 +221,9 @@ impl Image {
         }
         #[cfg(feature = "gecko")]
         {
-            if let Ok(image_rect) = input.try_parse(|input| MozImageRect::parse(context, input, cors_mode)) {
+            if let Ok(image_rect) =
+                input.try_parse(|input| MozImageRect::parse(context, input, cors_mode))
+            {
                 return Ok(generic::Image::Rect(Box::new(image_rect)));
             }
             Ok(generic::Image::Element(Image::parse_element(input)?))
@@ -254,7 +259,12 @@ impl Image {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Image, ParseError<'i>> {
-        Self::parse_with_cors_mode(context, input, CorsMode::Anonymous, /* allow_none = */ true)
+        Self::parse_with_cors_mode(
+            context,
+            input,
+            CorsMode::Anonymous,
+            /* allow_none = */ true,
+        )
     }
 }
 
@@ -299,8 +309,10 @@ impl CrossFadeImage {
         input: &mut Parser<'i, 't>,
         cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
-        if let Ok(image) = input.try_parse(|input| Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)) {
-            return Ok(Self::Image(image))
+        if let Ok(image) = input.try_parse(|input| {
+            Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)
+        }) {
+            return Ok(Self::Image(image));
         }
         Ok(Self::Color(Color::parse(context, input)?))
     }
@@ -334,7 +346,7 @@ impl ImageSet {
         })?;
         Ok(Self {
             selected_index: 0,
-            items: items.into()
+            items: items.into(),
         })
     }
 }
@@ -346,14 +358,19 @@ impl ImageSetItem {
         cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
         let image = match input.try_parse(|i| i.expect_url_or_string()) {
-            Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(url.as_ref().into(), context, cors_mode)),
-            Err(..) => Image::parse_with_cors_mode(context, input, cors_mode, /* allow_none = */ false)?,
+            Ok(url) => Image::Url(SpecifiedImageUrl::parse_from_string(
+                url.as_ref().into(),
+                context,
+                cors_mode,
+            )),
+            Err(..) => Image::parse_with_cors_mode(
+                context, input, cors_mode, /* allow_none = */ false,
+            )?,
         };
-        let resolution = input.try_parse(|input| Resolution::parse(context, input)).unwrap_or(Resolution::X(1.0));
-        Ok(Self {
-            image,
-            resolution,
-        })
+        let resolution = input
+            .try_parse(|input| Resolution::parse(context, input))
+            .unwrap_or(Resolution::X(1.0));
+        Ok(Self { image, resolution })
     }
 }
 
diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs
index d60c5d87f1f..d91f9b8195f 100644
--- a/components/style/values/specified/mod.rs
+++ b/components/style/values/specified/mod.rs
@@ -70,7 +70,7 @@ pub use self::list::MozListReversed;
 pub use self::list::Quotes;
 pub use self::motion::{OffsetPath, OffsetRotate};
 pub use self::outline::OutlineStyle;
-pub use self::page::{Orientation, PaperSize, PageSize};
+pub use self::page::{Orientation, PageSize, PaperSize};
 pub use self::percentage::Percentage;
 pub use self::position::AspectRatio;
 pub use self::position::{
@@ -122,8 +122,8 @@ pub mod length;
 pub mod list;
 pub mod motion;
 pub mod outline;
-pub mod percentage;
 pub mod page;
+pub mod percentage;
 pub mod position;
 pub mod ratio;
 pub mod rect;

From 919ff06445f878bdfa2791e7cc99119a08d5637f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 11:43:54 +0100
Subject: [PATCH 140/156] style: Fix Gecko nightly warning.

---
 components/style/build_gecko.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs
index 1e93660936a..1f034cad934 100644
--- a/components/style/build_gecko.rs
+++ b/components/style/build_gecko.rs
@@ -279,7 +279,7 @@ impl<'a> BuilderWithConfig<'a> {
     fn get_builder(self) -> Builder {
         for key in self.config.keys() {
             if !self.used_keys.contains(key.as_str()) {
-                panic!(format!("Unknown key: {}", key));
+                panic!("Unknown key: {}", key);
             }
         }
         self.builder

From 9ce200a92492882082b4a5b8da05cdbe5ada2d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Wed, 12 Aug 2020 04:26:07 +0000
Subject: [PATCH 141/156] style: Implement :-moz-any() as an alias of :is().

This is strictly better and more flexible, but can change specificity so
have a pref in case it causes trouble. I doubt it will though, the
specificity rules of :is() make more sense, and my gut feeling is that
:-moz-any is not very used on the wild.

Make it early-beta-or-earlier for now to minimize risk, once this is on
nightly for a bit we can enable it everywhere.

Differential Revision: https://phabricator.services.mozilla.com/D86696
---
 components/selectors/parser.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 9980bdeeb60..8f87c785f3e 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -254,6 +254,11 @@ pub trait Parser<'i> {
         false
     }
 
+    /// Whether the given function name is an alias for the `:is()` function.
+    fn is_is_alias(&self, _name: &str) -> bool {
+        false
+    }
+
     /// Whether to parse the `:host` pseudo-class.
     fn parse_host(&self) -> bool {
         false
@@ -2302,6 +2307,10 @@ where
         _ => {}
     }
 
+    if parser.parse_is_and_where() && parser.is_is_alias(&name) {
+        return parse_is_or_where(parser, input, state, Component::Is);
+    }
+
     if !state.allows_custom_functional_pseudo_classes() {
         return Err(input.new_custom_error(SelectorParseErrorKind::InvalidState));
     }

From 639bada63a6d1c228dae96a2912fe4eb02d53731 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 26 Aug 2020 11:45:35 +0000
Subject: [PATCH 142/156] style: Replace :-moz-native-anonymous-no-specificity
 with :where(:-moz-native-anonymous).

Differential Revision: https://phabricator.services.mozilla.com/D88255
---
 components/selectors/builder.rs | 10 +++-------
 components/selectors/parser.rs  |  8 --------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/components/selectors/builder.rs b/components/selectors/builder.rs
index 4e295a1598f..0bf894a72b5 100644
--- a/components/selectors/builder.rs
+++ b/components/selectors/builder.rs
@@ -17,7 +17,7 @@
 //! is non-trivial. This module encapsulates those details and presents an
 //! easy-to-use API for the parser.
 
-use crate::parser::{Combinator, Component, NonTSPseudoClass, SelectorImpl};
+use crate::parser::{Combinator, Component, SelectorImpl};
 use crate::sink::Push;
 use servo_arc::{Arc, HeaderWithLength, ThinArc};
 use smallvec::{self, SmallVec};
@@ -322,14 +322,10 @@ where
             Component::NthLastOfType(..) |
             Component::FirstOfType |
             Component::LastOfType |
-            Component::OnlyOfType => {
+            Component::OnlyOfType |
+            Component::NonTSPseudoClass(..) => {
                 specificity.class_like_selectors += 1;
             },
-            Component::NonTSPseudoClass(ref pseudo) => {
-                if !pseudo.has_zero_specificity() {
-                    specificity.class_like_selectors += 1;
-                }
-            },
             Component::Is(ref list) => {
                 // https://drafts.csswg.org/selectors/#specificity-rules:
                 //
diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 8f87c785f3e..a1dcd119bf5 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -53,9 +53,6 @@ pub trait NonTSPseudoClass: Sized + ToCss {
     /// https://drafts.csswg.org/selectors-4/#useraction-pseudos
     fn is_user_action_state(&self) -> bool;
 
-    /// Whether this pseudo-class has zero specificity.
-    fn has_zero_specificity(&self) -> bool;
-
     fn visit<V>(&self, _visitor: &mut V) -> bool
     where
         V: SelectorVisitor<Impl = Self::Impl>,
@@ -2564,11 +2561,6 @@ pub mod tests {
         fn is_user_action_state(&self) -> bool {
             self.is_active_or_hover()
         }
-
-        #[inline]
-        fn has_zero_specificity(&self) -> bool {
-            false
-        }
     }
 
     impl ToCss for PseudoClass {

From 89c2e39dd984a2af51966e5c4de31b3356011ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 13 Sep 2020 21:57:04 +0000
Subject: [PATCH 143/156] style: Minor cleanup: Use shorthand initialization in
 selectors.

Differential Revision: https://phabricator.services.mozilla.com/D90049
---
 components/selectors/matching.rs |  6 +++---
 components/selectors/parser.rs   | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index 3414f9d6efa..75d8e367066 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -751,7 +751,7 @@ where
                 &NamespaceConstraint::Specific(&crate::parser::namespace_empty_string::<E::Impl>()),
                 local_name,
                 &AttrSelectorOperation::WithValue {
-                    operator: operator,
+                    operator,
                     case_sensitivity: case_sensitivity.to_unconditional(is_html),
                     expected_value: value,
                 },
@@ -780,9 +780,9 @@ where
                         case_sensitivity,
                         ref expected_value,
                     } => AttrSelectorOperation::WithValue {
-                        operator: operator,
+                        operator,
                         case_sensitivity: case_sensitivity.to_unconditional(is_html),
-                        expected_value: expected_value,
+                        expected_value,
                     },
                 },
             )
diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index a1dcd119bf5..da87b9bb08f 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -661,7 +661,7 @@ impl<Impl: SelectorImpl> Selector<Impl> {
     pub fn iter_from(&self, offset: usize) -> SelectorIter<Impl> {
         let iter = self.0.slice[offset..].iter();
         SelectorIter {
-            iter: iter,
+            iter,
             next_combinator: None,
         }
     }
@@ -1961,16 +1961,16 @@ where
                 return Ok(Component::AttributeOther(Box::new(
                     AttrSelectorWithOptionalNamespace {
                         namespace: Some(namespace),
-                        local_name: local_name,
-                        local_name_lower: local_name_lower,
+                        local_name,
+                        local_name_lower,
                         operation: ParsedAttrSelectorOperation::Exists,
                         never_matches: false,
                     },
                 )));
             } else {
                 return Ok(Component::AttributeInNoNamespaceExists {
-                    local_name: local_name,
-                    local_name_lower: local_name_lower,
+                    local_name,
+                    local_name_lower,
                 });
             }
         },
@@ -2034,19 +2034,19 @@ where
                 local_name_lower,
                 never_matches,
                 operation: ParsedAttrSelectorOperation::WithValue {
-                    operator: operator,
-                    case_sensitivity: case_sensitivity,
+                    operator,
+                    case_sensitivity,
                     expected_value: value,
                 },
             },
         )))
     } else {
         Ok(Component::AttributeInNoNamespace {
-            local_name: local_name,
-            operator: operator,
-            value: value,
-            case_sensitivity: case_sensitivity,
-            never_matches: never_matches,
+            local_name,
+            operator,
+            value,
+            case_sensitivity,
+            never_matches,
         })
     }
 }

From 59805251392895c036ad950270db7b4a9c969c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Sep 2020 15:04:22 +0000
Subject: [PATCH 144/156] style: Allow :is() and :where() to have better error
 recovery.

Adjust is-where-parsing.html to work with both the new and old behavior,
and add a test for the new behavior.

Depends on D90049

Differential Revision: https://phabricator.services.mozilla.com/D90050
---
 components/selectors/parser.rs | 59 ++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 13 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index da87b9bb08f..9156bb496f7 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -251,6 +251,11 @@ pub trait Parser<'i> {
         false
     }
 
+    /// The error recovery that selector lists inside :is() and :where() have.
+    fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
+        ParseErrorRecovery::IgnoreInvalidSelector
+    }
+
     /// Whether the given function name is an alias for the `:is()` function.
     fn is_is_alias(&self, _name: &str) -> bool {
         false
@@ -329,6 +334,17 @@ pub struct SelectorList<Impl: SelectorImpl>(
     #[shmem(field_bound)] pub SmallVec<[Selector<Impl>; 1]>,
 );
 
+/// How to treat invalid selectors in a selector list.
+pub enum ParseErrorRecovery {
+    /// Discard the entire selector list, this is the default behavior for
+    /// almost all of CSS.
+    DiscardList,
+    /// Ignore invalid selectors, potentially creating an empty selector list.
+    ///
+    /// This is the error recovery mode of :is() and :where()
+    IgnoreInvalidSelector,
+}
+
 impl<Impl: SelectorImpl> SelectorList<Impl> {
     /// Parse a comma-separated list of Selectors.
     /// <https://drafts.csswg.org/selectors/#grouping>
@@ -341,26 +357,42 @@ impl<Impl: SelectorImpl> SelectorList<Impl> {
     where
         P: Parser<'i, Impl = Impl>,
     {
-        Self::parse_with_state(parser, input, SelectorParsingState::empty())
+        Self::parse_with_state(parser, input, SelectorParsingState::empty(), ParseErrorRecovery::DiscardList)
     }
 
+    #[inline]
     fn parse_with_state<'i, 't, P>(
         parser: &P,
         input: &mut CssParser<'i, 't>,
         state: SelectorParsingState,
+        recovery: ParseErrorRecovery,
     ) -> Result<Self, ParseError<'i, P::Error>>
     where
         P: Parser<'i, Impl = Impl>,
     {
         let mut values = SmallVec::new();
         loop {
-            values.push(input.parse_until_before(Delimiter::Comma, |input| {
+            let selector = input.parse_until_before(Delimiter::Comma, |input| {
                 parse_selector(parser, input, state)
-            })?);
-            match input.next() {
-                Err(_) => return Ok(SelectorList(values)),
-                Ok(&Token::Comma) => continue,
-                Ok(_) => unreachable!(),
+            });
+
+            let was_ok = selector.is_ok();
+            match selector {
+                Ok(selector) => values.push(selector),
+                Err(err) => match recovery {
+                    ParseErrorRecovery::DiscardList => return Err(err),
+                    ParseErrorRecovery::IgnoreInvalidSelector => {},
+                },
+            }
+
+            loop {
+                match input.next() {
+                    Err(_) => return Ok(SelectorList(values)),
+                    Ok(&Token::Comma) => break,
+                    Ok(_) => {
+                        debug_assert!(!was_ok, "Shouldn't have got a selector if getting here");
+                    }
+                }
             }
         }
     }
@@ -1251,18 +1283,18 @@ impl<Impl: SelectorImpl> Debug for LocalName<Impl> {
     }
 }
 
-fn serialize_selector_list<'a, Impl, I, W>(mut iter: I, dest: &mut W) -> fmt::Result
+fn serialize_selector_list<'a, Impl, I, W>(iter: I, dest: &mut W) -> fmt::Result
 where
     Impl: SelectorImpl,
     I: Iterator<Item = &'a Selector<Impl>>,
     W: fmt::Write,
 {
-    let first = iter
-        .next()
-        .expect("Empty SelectorList, should contain at least one selector");
-    first.to_css(dest)?;
+    let mut first = true;
     for selector in iter {
-        dest.write_str(", ")?;
+        if !first {
+            dest.write_str(", ")?;
+        }
+        first = false;
         selector.to_css(dest)?;
     }
     Ok(())
@@ -2266,6 +2298,7 @@ where
         parser,
         input,
         state | SelectorParsingState::DISALLOW_PSEUDOS,
+        parser.is_and_where_error_recovery(),
     )?;
     Ok(component(inner.0.into_vec().into_boxed_slice()))
 }

From 6728aad0c63a7003d5c789296a7025c7b949f493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Sep 2020 17:37:36 +0200
Subject: [PATCH 145/156] style: Fix selectors unit tests.

MANUAL PUSH: Fix BR bustage. CLOSED TREE
---
 components/selectors/parser.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 9156bb496f7..4416461f46e 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -2691,6 +2691,10 @@ pub mod tests {
             true
         }
 
+        fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
+            ParseErrorRecovery::DiscardList
+        }
+
         fn parse_part(&self) -> bool {
             true
         }

From b1dbbb296905f96d675ff5aaac109cbf84fc3fb1 Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Mon, 14 Sep 2020 20:32:50 +0300
Subject: [PATCH 146/156] Backed out 2 changesets (bug 1664718) for causing wpt
 and bc failures.

CLOSED TREE

Backed out changeset 62e71d3b6b32 (bug 1664718)
Backed out changeset c8a8791a26ed (bug 1664718)
---
 components/selectors/parser.rs | 63 +++++++---------------------------
 1 file changed, 13 insertions(+), 50 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 4416461f46e..da87b9bb08f 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -251,11 +251,6 @@ pub trait Parser<'i> {
         false
     }
 
-    /// The error recovery that selector lists inside :is() and :where() have.
-    fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
-        ParseErrorRecovery::IgnoreInvalidSelector
-    }
-
     /// Whether the given function name is an alias for the `:is()` function.
     fn is_is_alias(&self, _name: &str) -> bool {
         false
@@ -334,17 +329,6 @@ pub struct SelectorList<Impl: SelectorImpl>(
     #[shmem(field_bound)] pub SmallVec<[Selector<Impl>; 1]>,
 );
 
-/// How to treat invalid selectors in a selector list.
-pub enum ParseErrorRecovery {
-    /// Discard the entire selector list, this is the default behavior for
-    /// almost all of CSS.
-    DiscardList,
-    /// Ignore invalid selectors, potentially creating an empty selector list.
-    ///
-    /// This is the error recovery mode of :is() and :where()
-    IgnoreInvalidSelector,
-}
-
 impl<Impl: SelectorImpl> SelectorList<Impl> {
     /// Parse a comma-separated list of Selectors.
     /// <https://drafts.csswg.org/selectors/#grouping>
@@ -357,42 +341,26 @@ impl<Impl: SelectorImpl> SelectorList<Impl> {
     where
         P: Parser<'i, Impl = Impl>,
     {
-        Self::parse_with_state(parser, input, SelectorParsingState::empty(), ParseErrorRecovery::DiscardList)
+        Self::parse_with_state(parser, input, SelectorParsingState::empty())
     }
 
-    #[inline]
     fn parse_with_state<'i, 't, P>(
         parser: &P,
         input: &mut CssParser<'i, 't>,
         state: SelectorParsingState,
-        recovery: ParseErrorRecovery,
     ) -> Result<Self, ParseError<'i, P::Error>>
     where
         P: Parser<'i, Impl = Impl>,
     {
         let mut values = SmallVec::new();
         loop {
-            let selector = input.parse_until_before(Delimiter::Comma, |input| {
+            values.push(input.parse_until_before(Delimiter::Comma, |input| {
                 parse_selector(parser, input, state)
-            });
-
-            let was_ok = selector.is_ok();
-            match selector {
-                Ok(selector) => values.push(selector),
-                Err(err) => match recovery {
-                    ParseErrorRecovery::DiscardList => return Err(err),
-                    ParseErrorRecovery::IgnoreInvalidSelector => {},
-                },
-            }
-
-            loop {
-                match input.next() {
-                    Err(_) => return Ok(SelectorList(values)),
-                    Ok(&Token::Comma) => break,
-                    Ok(_) => {
-                        debug_assert!(!was_ok, "Shouldn't have got a selector if getting here");
-                    }
-                }
+            })?);
+            match input.next() {
+                Err(_) => return Ok(SelectorList(values)),
+                Ok(&Token::Comma) => continue,
+                Ok(_) => unreachable!(),
             }
         }
     }
@@ -1283,18 +1251,18 @@ impl<Impl: SelectorImpl> Debug for LocalName<Impl> {
     }
 }
 
-fn serialize_selector_list<'a, Impl, I, W>(iter: I, dest: &mut W) -> fmt::Result
+fn serialize_selector_list<'a, Impl, I, W>(mut iter: I, dest: &mut W) -> fmt::Result
 where
     Impl: SelectorImpl,
     I: Iterator<Item = &'a Selector<Impl>>,
     W: fmt::Write,
 {
-    let mut first = true;
+    let first = iter
+        .next()
+        .expect("Empty SelectorList, should contain at least one selector");
+    first.to_css(dest)?;
     for selector in iter {
-        if !first {
-            dest.write_str(", ")?;
-        }
-        first = false;
+        dest.write_str(", ")?;
         selector.to_css(dest)?;
     }
     Ok(())
@@ -2298,7 +2266,6 @@ where
         parser,
         input,
         state | SelectorParsingState::DISALLOW_PSEUDOS,
-        parser.is_and_where_error_recovery(),
     )?;
     Ok(component(inner.0.into_vec().into_boxed_slice()))
 }
@@ -2691,10 +2658,6 @@ pub mod tests {
             true
         }
 
-        fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
-            ParseErrorRecovery::DiscardList
-        }
-
         fn parse_part(&self) -> bool {
             true
         }

From 7e6d70f3149ba917d8a972f8ee6a53c50fd1215f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 14 Sep 2020 22:33:01 +0000
Subject: [PATCH 147/156] style: Allow :is() and :where() to have better error
 recovery.

Adjust is-where-parsing.html to work with both the new and old behavior,
and add a test for the new behavior.

Depends on D90049

Differential Revision: https://phabricator.services.mozilla.com/D90050
---
 components/selectors/parser.rs | 63 +++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index da87b9bb08f..4416461f46e 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -251,6 +251,11 @@ pub trait Parser<'i> {
         false
     }
 
+    /// The error recovery that selector lists inside :is() and :where() have.
+    fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
+        ParseErrorRecovery::IgnoreInvalidSelector
+    }
+
     /// Whether the given function name is an alias for the `:is()` function.
     fn is_is_alias(&self, _name: &str) -> bool {
         false
@@ -329,6 +334,17 @@ pub struct SelectorList<Impl: SelectorImpl>(
     #[shmem(field_bound)] pub SmallVec<[Selector<Impl>; 1]>,
 );
 
+/// How to treat invalid selectors in a selector list.
+pub enum ParseErrorRecovery {
+    /// Discard the entire selector list, this is the default behavior for
+    /// almost all of CSS.
+    DiscardList,
+    /// Ignore invalid selectors, potentially creating an empty selector list.
+    ///
+    /// This is the error recovery mode of :is() and :where()
+    IgnoreInvalidSelector,
+}
+
 impl<Impl: SelectorImpl> SelectorList<Impl> {
     /// Parse a comma-separated list of Selectors.
     /// <https://drafts.csswg.org/selectors/#grouping>
@@ -341,26 +357,42 @@ impl<Impl: SelectorImpl> SelectorList<Impl> {
     where
         P: Parser<'i, Impl = Impl>,
     {
-        Self::parse_with_state(parser, input, SelectorParsingState::empty())
+        Self::parse_with_state(parser, input, SelectorParsingState::empty(), ParseErrorRecovery::DiscardList)
     }
 
+    #[inline]
     fn parse_with_state<'i, 't, P>(
         parser: &P,
         input: &mut CssParser<'i, 't>,
         state: SelectorParsingState,
+        recovery: ParseErrorRecovery,
     ) -> Result<Self, ParseError<'i, P::Error>>
     where
         P: Parser<'i, Impl = Impl>,
     {
         let mut values = SmallVec::new();
         loop {
-            values.push(input.parse_until_before(Delimiter::Comma, |input| {
+            let selector = input.parse_until_before(Delimiter::Comma, |input| {
                 parse_selector(parser, input, state)
-            })?);
-            match input.next() {
-                Err(_) => return Ok(SelectorList(values)),
-                Ok(&Token::Comma) => continue,
-                Ok(_) => unreachable!(),
+            });
+
+            let was_ok = selector.is_ok();
+            match selector {
+                Ok(selector) => values.push(selector),
+                Err(err) => match recovery {
+                    ParseErrorRecovery::DiscardList => return Err(err),
+                    ParseErrorRecovery::IgnoreInvalidSelector => {},
+                },
+            }
+
+            loop {
+                match input.next() {
+                    Err(_) => return Ok(SelectorList(values)),
+                    Ok(&Token::Comma) => break,
+                    Ok(_) => {
+                        debug_assert!(!was_ok, "Shouldn't have got a selector if getting here");
+                    }
+                }
             }
         }
     }
@@ -1251,18 +1283,18 @@ impl<Impl: SelectorImpl> Debug for LocalName<Impl> {
     }
 }
 
-fn serialize_selector_list<'a, Impl, I, W>(mut iter: I, dest: &mut W) -> fmt::Result
+fn serialize_selector_list<'a, Impl, I, W>(iter: I, dest: &mut W) -> fmt::Result
 where
     Impl: SelectorImpl,
     I: Iterator<Item = &'a Selector<Impl>>,
     W: fmt::Write,
 {
-    let first = iter
-        .next()
-        .expect("Empty SelectorList, should contain at least one selector");
-    first.to_css(dest)?;
+    let mut first = true;
     for selector in iter {
-        dest.write_str(", ")?;
+        if !first {
+            dest.write_str(", ")?;
+        }
+        first = false;
         selector.to_css(dest)?;
     }
     Ok(())
@@ -2266,6 +2298,7 @@ where
         parser,
         input,
         state | SelectorParsingState::DISALLOW_PSEUDOS,
+        parser.is_and_where_error_recovery(),
     )?;
     Ok(component(inner.0.into_vec().into_boxed_slice()))
 }
@@ -2658,6 +2691,10 @@ pub mod tests {
             true
         }
 
+        fn is_and_where_error_recovery(&self) -> ParseErrorRecovery {
+            ParseErrorRecovery::DiscardList
+        }
+
         fn parse_part(&self) -> bool {
             true
         }

From 191d5226a38ca926d1f27551431e00e8728f1825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 29 Oct 2020 18:03:54 +0000
Subject: [PATCH 148/156] style: Implement complex :not().

This fixes the failures in bug 1671573 and just works thanks to the
invalidation improvements I did for :is / :where.

Added a couple tests for invalidation which is the tricky bit. 001 is a
very straight-forward test, 002 is the :is test but with :is() replaced
by double-:not().

This also fixes default namespaces inside :is() / :where(), which are
supposed to get ignored, but aren't. Added tests for that and for the
pre-existing :not() behavior which Chrome doesn't quite get right.

Differential Revision: https://phabricator.services.mozilla.com/D94142
---
 components/selectors/Cargo.toml  |   1 -
 components/selectors/builder.rs  |   7 +-
 components/selectors/context.rs  |   4 +-
 components/selectors/lib.rs      |   1 -
 components/selectors/matching.rs |  15 +-
 components/selectors/parser.rs   | 247 ++++++++++++-------------------
 6 files changed, 107 insertions(+), 168 deletions(-)

diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
index 1763de6c0b3..0716da63752 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -27,7 +27,6 @@ phf = "0.8"
 precomputed-hash = "0.1"
 servo_arc = { version = "0.1", path = "../servo_arc" }
 smallvec = "1.0"
-thin-slice = "0.1.0"
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
 
diff --git a/components/selectors/builder.rs b/components/selectors/builder.rs
index 0bf894a72b5..eb1e6cc18b9 100644
--- a/components/selectors/builder.rs
+++ b/components/selectors/builder.rs
@@ -326,7 +326,7 @@ where
             Component::NonTSPseudoClass(..) => {
                 specificity.class_like_selectors += 1;
             },
-            Component::Is(ref list) => {
+            Component::Negation(ref list) | Component::Is(ref list) => {
                 // https://drafts.csswg.org/selectors/#specificity-rules:
                 //
                 //     The specificity of an :is() pseudo-class is replaced by the
@@ -346,11 +346,6 @@ where
             Component::Namespace(..) => {
                 // Does not affect specificity
             },
-            Component::Negation(ref negated) => {
-                for ss in negated.iter() {
-                    simple_selector_specificity(&ss, specificity);
-                }
-            },
         }
     }
 
diff --git a/components/selectors/context.rs b/components/selectors/context.rs
index 44d586c8d84..efbcbdf9230 100644
--- a/components/selectors/context.rs
+++ b/components/selectors/context.rs
@@ -238,10 +238,10 @@ where
     where
         F: FnOnce(&mut Self) -> R,
     {
-        debug_assert!(!self.in_negation, "Someone messed up parsing?");
+        let old_in_negation = self.in_negation;
         self.in_negation = true;
         let result = self.nest(f);
-        self.in_negation = false;
+        self.in_negation = old_in_negation;
         result
     }
 
diff --git a/components/selectors/lib.rs b/components/selectors/lib.rs
index 14a0986e642..a7bcb530487 100644
--- a/components/selectors/lib.rs
+++ b/components/selectors/lib.rs
@@ -18,7 +18,6 @@ extern crate phf;
 extern crate precomputed_hash;
 extern crate servo_arc;
 extern crate smallvec;
-extern crate thin_slice;
 extern crate to_shmem;
 #[macro_use]
 extern crate to_shmem_derive;
diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index 75d8e367066..d3dbdf6c6ac 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -853,14 +853,13 @@ where
             }
             false
         }),
-        Component::Negation(ref negated) => context.shared.nest_for_negation(|context| {
-            let mut local_context = LocalMatchingContext {
-                matches_hover_and_active_quirk: MatchesHoverAndActiveQuirk::No,
-                shared: context,
-            };
-            !negated
-                .iter()
-                .all(|ss| matches_simple_selector(ss, element, &mut local_context, flags_setter))
+        Component::Negation(ref list) => context.shared.nest_for_negation(|context| {
+            for selector in &**list {
+                if matches_complex_selector(selector.iter(), element, context, flags_setter) {
+                    return false;
+                }
+            }
+            true
         }),
     }
 }
diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 4416461f46e..4492369037a 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -21,7 +21,6 @@ use std::borrow::{Borrow, Cow};
 use std::fmt::{self, Debug, Display, Write};
 use std::iter::Rev;
 use std::slice;
-use thin_slice::ThinBoxedSlice;
 
 /// A trait that represents a pseudo-element.
 pub trait PseudoElement: Sized + ToCss {
@@ -76,9 +75,10 @@ fn to_ascii_lowercase(s: &str) -> Cow<str> {
 bitflags! {
     /// Flags that indicate at which point of parsing a selector are we.
     struct SelectorParsingState: u8 {
-        /// Whether we're inside a negation. If we're inside a negation, we're
-        /// not allowed to add another negation or such, for example.
-        const INSIDE_NEGATION = 1 << 0;
+        /// Whether we should avoid adding default namespaces to selectors that
+        /// aren't type or universal selectors.
+        const SKIP_DEFAULT_NAMESPACE = 1 << 0;
+
         /// Whether we've parsed a ::slotted() pseudo-element already.
         ///
         /// If so, then we can only parse a subset of pseudo-elements, and
@@ -162,7 +162,6 @@ pub enum SelectorParseErrorKind<'i> {
     NoQualifiedNameInAttributeSelector(Token<'i>),
     EmptySelector,
     DanglingCombinator,
-    NonSimpleSelectorInNegation,
     NonCompoundSelector,
     NonPseudoElementAfterSlotted,
     InvalidPseudoElementAfterSlotted,
@@ -180,7 +179,6 @@ pub enum SelectorParseErrorKind<'i> {
     InvalidQualNameInAttr(Token<'i>),
     ExplicitNamespaceUnexpectedToken(Token<'i>),
     ClassNeedsIdent(Token<'i>),
-    EmptyNegation,
 }
 
 macro_rules! with_all_bounds {
@@ -1036,16 +1034,7 @@ pub enum Component<Impl: SelectorImpl> {
     AttributeOther(Box<AttrSelectorWithOptionalNamespace<Impl>>),
 
     /// Pseudo-classes
-    ///
-    /// CSS3 Negation only takes a simple simple selector, but we still need to
-    /// treat it as a compound selector because it might be a type selector
-    /// which we represent as a namespace and a localname.
-    ///
-    /// Note: if/when we upgrade this to CSS4, which supports combinators, we
-    /// need to think about how this should interact with
-    /// visit_complex_selector, and what the consumers of those APIs should do
-    /// about the presence of combinators in negation.
-    Negation(ThinBoxedSlice<Component<Impl>>),
+    Negation(Box<[Selector<Impl>]>),
     FirstChild,
     LastChild,
     OnlyChild,
@@ -1121,10 +1110,9 @@ impl<Impl: SelectorImpl> Component<Impl> {
     pub fn maybe_allowed_after_pseudo_element(&self) -> bool {
         match *self {
             Component::NonTSPseudoClass(..) => true,
-            Component::Negation(ref components) => components
-                .iter()
-                .all(|c| c.maybe_allowed_after_pseudo_element()),
-            Component::Is(ref selectors) | Component::Where(ref selectors) => {
+            Component::Negation(ref selectors) |
+            Component::Is(ref selectors) |
+            Component::Where(ref selectors) => {
                 selectors.iter().all(|selector| {
                     selector
                         .iter_raw_match_order()
@@ -1148,9 +1136,13 @@ impl<Impl: SelectorImpl> Component<Impl> {
             *self
         );
         match *self {
-            Component::Negation(ref components) => !components
-                .iter()
-                .all(|c| c.matches_for_stateless_pseudo_element()),
+            Component::Negation(ref selectors) => {
+                !selectors.iter().all(|selector| {
+                    selector
+                        .iter_raw_match_order()
+                        .all(|c| c.matches_for_stateless_pseudo_element())
+                })
+            },
             Component::Is(ref selectors) | Component::Where(ref selectors) => {
                 selectors.iter().any(|selector| {
                     selector
@@ -1182,14 +1174,6 @@ impl<Impl: SelectorImpl> Component<Impl> {
                     return false;
                 }
             },
-            Negation(ref negated) => {
-                for component in negated.iter() {
-                    if !component.visit(visitor) {
-                        return false;
-                    }
-                }
-            },
-
             AttributeInNoNamespaceExists {
                 ref local_name,
                 ref local_name_lower,
@@ -1239,7 +1223,7 @@ impl<Impl: SelectorImpl> Component<Impl> {
                 }
             },
 
-            Is(ref list) | Where(ref list) => {
+            Negation(ref list) | Is(ref list) | Where(ref list) => {
                 if !visitor.visit_selector_list(&list) {
                     return false;
                 }
@@ -2152,44 +2136,14 @@ where
     P: Parser<'i, Impl = Impl>,
     Impl: SelectorImpl,
 {
-    let state = state | SelectorParsingState::INSIDE_NEGATION;
+    let list = SelectorList::parse_with_state(
+        parser,
+        input,
+        state | SelectorParsingState::SKIP_DEFAULT_NAMESPACE | SelectorParsingState::DISALLOW_PSEUDOS,
+        ParseErrorRecovery::DiscardList
+    )?;
 
-    // We use a sequence because a type selector may be represented as two Components.
-    let mut sequence = SmallVec::<[Component<Impl>; 2]>::new();
-
-    input.skip_whitespace();
-
-    // Get exactly one simple selector. The parse logic in the caller will verify
-    // that there are no trailing tokens after we're done.
-    let is_type_sel = match parse_type_selector(parser, input, state, &mut sequence) {
-        Ok(result) => result,
-        Err(ParseError {
-            kind: ParseErrorKind::Basic(BasicParseErrorKind::EndOfInput),
-            ..
-        }) => return Err(input.new_custom_error(SelectorParseErrorKind::EmptyNegation)),
-        Err(e) => return Err(e.into()),
-    };
-    if !is_type_sel {
-        match parse_one_simple_selector(parser, input, state)? {
-            Some(SimpleSelectorParseResult::SimpleSelector(s)) => {
-                sequence.push(s);
-            },
-            None => {
-                return Err(input.new_custom_error(SelectorParseErrorKind::EmptyNegation));
-            },
-            Some(SimpleSelectorParseResult::PseudoElement(_)) |
-            Some(SimpleSelectorParseResult::PartPseudo(_)) |
-            Some(SimpleSelectorParseResult::SlottedPseudo(_)) => {
-                let e = SelectorParseErrorKind::NonSimpleSelectorInNegation;
-                return Err(input.new_custom_error(e));
-            },
-        }
-    }
-
-    // Success.
-    Ok(Component::Negation(
-        sequence.into_vec().into_boxed_slice().into(),
-    ))
+    Ok(Component::Negation(list.0.into_vec().into_boxed_slice()))
 }
 
 /// simple_selector_sequence
@@ -2225,7 +2179,8 @@ where
             if let Some(url) = parser.default_namespace() {
                 // If there was no explicit type selector, but there is a
                 // default namespace, there is an implicit "<defaultns>|*" type
-                // selector. Except for :host, where we ignore it.
+                // selector. Except for :host() or :not() / :is() / :where(),
+                // where we ignore it.
                 //
                 // https://drafts.csswg.org/css-scoping/#host-element-in-tree:
                 //
@@ -2240,10 +2195,22 @@ where
                 //     given selector is allowed to match a featureless element,
                 //     it must do so while ignoring the default namespace.
                 //
-                if !matches!(
-                    result,
-                    SimpleSelectorParseResult::SimpleSelector(Component::Host(..))
-                ) {
+                // https://drafts.csswg.org/selectors-4/#matches
+                //
+                //     Default namespace declarations do not affect the compound
+                //     selector representing the subject of any selector within
+                //     a :is() pseudo-class, unless that compound selector
+                //     contains an explicit universal selector or type selector.
+                //
+                //     (Similar quotes for :where() / :not())
+                //
+                let ignore_default_ns =
+                    state.intersects(SelectorParsingState::SKIP_DEFAULT_NAMESPACE) ||
+                    matches!(
+                        result,
+                        SimpleSelectorParseResult::SimpleSelector(Component::Host(..))
+                    );
+                if !ignore_default_ns {
                     builder.push_simple_selector(Component::DefaultNamespace(url));
                 }
             }
@@ -2297,7 +2264,7 @@ where
     let inner = SelectorList::parse_with_state(
         parser,
         input,
-        state | SelectorParsingState::DISALLOW_PSEUDOS,
+        state | SelectorParsingState::SKIP_DEFAULT_NAMESPACE | SelectorParsingState::DISALLOW_PSEUDOS,
         parser.is_and_where_error_recovery(),
     )?;
     Ok(component(inner.0.into_vec().into_boxed_slice()))
@@ -2327,11 +2294,6 @@ where
             return Ok(Component::Host(Some(parse_inner_compound_selector(parser, input, state)?)));
         },
         "not" => {
-            if state.intersects(SelectorParsingState::INSIDE_NEGATION) {
-                return Err(input.new_custom_error(
-                    SelectorParseErrorKind::UnexpectedIdent("not".into())
-                ));
-            }
             return parse_negation(parser, input, state)
         },
         _ => {}
@@ -3080,9 +3042,13 @@ pub mod tests {
                 vec![
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
-                        vec![Component::Class(DummyAtom::from("cl"))]
-                            .into_boxed_slice()
-                            .into(),
+                        vec![
+                            Selector::from_vec(
+                                vec![Component::Class(DummyAtom::from("cl"))],
+                                specificity(0, 1, 0),
+                                Default::default(),
+                            )
+                        ].into_boxed_slice()
                     ),
                 ],
                 specificity(0, 1, 0),
@@ -3096,11 +3062,16 @@ pub mod tests {
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
                         vec![
-                            Component::DefaultNamespace(MATHML.into()),
-                            Component::ExplicitUniversalType,
+                            Selector::from_vec(
+                                vec![
+                                    Component::DefaultNamespace(MATHML.into()),
+                                    Component::ExplicitUniversalType,
+                                ],
+                                specificity(0, 0, 0),
+                                Default::default(),
+                            )
                         ]
-                        .into_boxed_slice()
-                        .into(),
+                        .into_boxed_slice(),
                     ),
                 ],
                 specificity(0, 0, 0),
@@ -3114,14 +3085,19 @@ pub mod tests {
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
                         vec![
-                            Component::DefaultNamespace(MATHML.into()),
-                            Component::LocalName(LocalName {
-                                name: DummyAtom::from("e"),
-                                lower_name: DummyAtom::from("e"),
-                            }),
+                            Selector::from_vec(
+                                vec![
+                                    Component::DefaultNamespace(MATHML.into()),
+                                    Component::LocalName(LocalName {
+                                        name: DummyAtom::from("e"),
+                                        lower_name: DummyAtom::from("e"),
+                                    }),
+                                ],
+                                specificity(0, 0, 1),
+                                Default::default(),
+                            ),
                         ]
                         .into_boxed_slice()
-                        .into(),
                     ),
                 ],
                 specificity(0, 0, 1),
@@ -3216,47 +3192,23 @@ pub mod tests {
             )]))
         );
         parser.default_ns = None;
-        assert!(parse(":not(#provel.old)").is_err());
-        assert!(parse(":not(#provel > old)").is_err());
+        assert!(parse(":not(#provel.old)").is_ok());
+        assert!(parse(":not(#provel > old)").is_ok());
         assert!(parse("table[rules]:not([rules=\"none\"]):not([rules=\"\"])").is_ok());
-        assert_eq!(
-            parse(":not(#provel)"),
-            Ok(SelectorList::from_vec(vec![Selector::from_vec(
-                vec![Component::Negation(
-                    vec![Component::ID(DummyAtom::from("provel"))]
-                        .into_boxed_slice()
-                        .into(),
-                )],
-                specificity(1, 0, 0),
-                Default::default(),
-            )]))
-        );
-        assert_eq!(
-            parse_ns(":not(svg|circle)", &parser),
-            Ok(SelectorList::from_vec(vec![Selector::from_vec(
-                vec![Component::Negation(
-                    vec![
-                        Component::Namespace(DummyAtom("svg".into()), SVG.into()),
-                        Component::LocalName(LocalName {
-                            name: DummyAtom::from("circle"),
-                            lower_name: DummyAtom::from("circle"),
-                        }),
-                    ]
-                    .into_boxed_slice()
-                    .into(),
-                )],
-                specificity(0, 0, 1),
-                Default::default(),
-            )]))
-        );
         // https://github.com/servo/servo/issues/16017
         assert_eq!(
             parse_ns(":not(*)", &parser),
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
-                    vec![Component::ExplicitUniversalType]
-                        .into_boxed_slice()
-                        .into(),
+                    vec![
+                        Selector::from_vec(
+                            vec![
+                                Component::ExplicitUniversalType
+                            ],
+                            specificity(0, 0, 0),
+                            Default::default(),
+                        )
+                    ].into_boxed_slice()
                 )],
                 specificity(0, 0, 0),
                 Default::default(),
@@ -3267,11 +3219,16 @@ pub mod tests {
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
                     vec![
-                        Component::ExplicitNoNamespace,
-                        Component::ExplicitUniversalType,
+                        Selector::from_vec(
+                            vec![
+                                Component::ExplicitNoNamespace,
+                                Component::ExplicitUniversalType,
+                            ],
+                            specificity(0, 0, 0),
+                            Default::default(),
+                        )
                     ]
-                    .into_boxed_slice()
-                    .into(),
+                    .into_boxed_slice(),
                 )],
                 specificity(0, 0, 0),
                 Default::default(),
@@ -3281,27 +3238,17 @@ pub mod tests {
         // https://github.com/servo/servo/pull/17537
         assert_eq!(
             parse_ns_expected(":not(*|*)", &parser, Some(":not(*)")),
-            Ok(SelectorList::from_vec(vec![Selector::from_vec(
-                vec![Component::Negation(
-                    vec![Component::ExplicitUniversalType]
-                        .into_boxed_slice()
-                        .into(),
-                )],
-                specificity(0, 0, 0),
-                Default::default(),
-            )]))
-        );
-
-        assert_eq!(
-            parse_ns(":not(svg|*)", &parser),
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
                     vec![
-                        Component::Namespace(DummyAtom("svg".into()), SVG.into()),
-                        Component::ExplicitUniversalType,
-                    ]
-                    .into_boxed_slice()
-                    .into(),
+                        Selector::from_vec(
+                            vec![
+                                Component::ExplicitUniversalType
+                            ],
+                            specificity(0, 0, 0),
+                            Default::default()
+                        )
+                    ].into_boxed_slice()
                 )],
                 specificity(0, 0, 0),
                 Default::default(),

From a95ce7955419ba580f00cccdc5450715c0749c2b Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Tue, 17 Nov 2020 12:02:22 +0000
Subject: [PATCH 149/156] style: Fix clippy warnings

Depends on D96634

Differential Revision: https://phabricator.services.mozilla.com/D96636
---
 components/selectors/attr.rs            |  2 +-
 components/selectors/build.rs           |  2 +-
 components/selectors/context.rs         |  2 +-
 components/selectors/matching.rs        | 11 +++++------
 components/selectors/nth_index_cache.rs |  2 +-
 components/selectors/parser.rs          | 10 ++++------
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/components/selectors/attr.rs b/components/selectors/attr.rs
index 96abbe1c132..51173cee50e 100644
--- a/components/selectors/attr.rs
+++ b/components/selectors/attr.rs
@@ -134,7 +134,7 @@ impl AttrSelectorOperator {
 }
 
 /// The definition of whitespace per CSS Selectors Level 3 § 4.
-pub static SELECTOR_WHITESPACE: &'static [char] = &[' ', '\t', '\n', '\r', '\x0C'];
+pub static SELECTOR_WHITESPACE: &[char] = &[' ', '\t', '\n', '\r', '\x0C'];
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, ToShmem)]
 pub enum ParsedCaseSensitivity {
diff --git a/components/selectors/build.rs b/components/selectors/build.rs
index 264c2da6b4b..c5c3803991e 100644
--- a/components/selectors/build.rs
+++ b/components/selectors/build.rs
@@ -27,7 +27,7 @@ fn main() {
 }
 
 /// <https://html.spec.whatwg.org/multipage/#selectors>
-static ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES: &'static str = r#"
+static ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES: &str = r#"
     accept
     accept-charset
     align
diff --git a/components/selectors/context.rs b/components/selectors/context.rs
index efbcbdf9230..9146b133e38 100644
--- a/components/selectors/context.rs
+++ b/components/selectors/context.rs
@@ -286,6 +286,6 @@ where
     /// against.
     #[inline]
     pub fn shadow_host(&self) -> Option<OpaqueElement> {
-        self.current_host.clone()
+        self.current_host
     }
 }
diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index d3dbdf6c6ac..634ed90d62f 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -334,10 +334,7 @@ where
     let result =
         matches_complex_selector_internal(iter, element, context, flags_setter, Rightmost::Yes);
 
-    match result {
-        SelectorMatchingResult::Matched => true,
-        _ => false,
-    }
+    matches!(result, SelectorMatchingResult::Matched)
 }
 
 #[inline]
@@ -915,9 +912,11 @@ where
             element,
             is_of_type,
             is_from_end,
-            cache.as_mut().map(|s| &mut **s),
+            cache.as_deref_mut(),
         );
-        cache.as_mut().map(|c| c.insert(element.opaque(), i));
+        if let Some(c) = cache.as_mut() { 
+            c.insert(element.opaque(), i) 
+        }
         i
     };
     debug_assert_eq!(
diff --git a/components/selectors/nth_index_cache.rs b/components/selectors/nth_index_cache.rs
index 8d1d479274f..979c3100175 100644
--- a/components/selectors/nth_index_cache.rs
+++ b/components/selectors/nth_index_cache.rs
@@ -37,7 +37,7 @@ pub struct NthIndexCacheInner(FxHashMap<OpaqueElement, i32>);
 impl NthIndexCacheInner {
     /// Does a lookup for a given element in the cache.
     pub fn lookup(&mut self, el: OpaqueElement) -> Option<i32> {
-        self.0.get(&el).map(|x| *x)
+        self.0.get(&el).copied()
     }
 
     /// Inserts an entry into the cache.
diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 4492369037a..955a428429b 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -493,10 +493,8 @@ where
                 // :where and :is OR their selectors, so we can't put any hash
                 // in the filter if there's more than one selector, as that'd
                 // exclude elements that may match one of the other selectors.
-                if list.len() == 1 {
-                    if !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len) {
-                        return false;
-                    }
+                if list.len() == 1 && !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len) {
+                    return false;
                 }
                 continue;
             },
@@ -2777,8 +2775,8 @@ pub mod tests {
         assert!(list.is_ok());
     }
 
-    const MATHML: &'static str = "http://www.w3.org/1998/Math/MathML";
-    const SVG: &'static str = "http://www.w3.org/2000/svg";
+    const MATHML: &str = "http://www.w3.org/1998/Math/MathML";
+    const SVG: &str = "http://www.w3.org/2000/svg";
 
     #[test]
     fn test_parsing() {

From e9c1d490a9f02ce879a535adb309e7ada182f308 Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Tue, 17 Nov 2020 14:48:54 +0200
Subject: [PATCH 150/156] style: Fix lint error in matching.rs a=lint-fix

CLOSED TREE
---
 components/selectors/matching.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index 634ed90d62f..244572b53bd 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -914,8 +914,8 @@ where
             is_from_end,
             cache.as_deref_mut(),
         );
-        if let Some(c) = cache.as_mut() { 
-            c.insert(element.opaque(), i) 
+        if let Some(c) = cache.as_mut() {
+            c.insert(element.opaque(), i)
         }
         i
     };

From 484cf5771b372d611368652e3e25e25aa52dfb2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Sun, 22 Nov 2020 01:02:22 +0000
Subject: [PATCH 151/156] style: Avoid some allocations in selector
 serialization.

The allocations in display_to_css_identifier show up in the profiles of
bug 1675628.

Differential Revision: https://phabricator.services.mozilla.com/D97856
---
 components/selectors/parser.rs | 96 +++++++++++++++++-----------------
 components/selectors/tree.rs   |  8 +--
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 955a428429b..70f66419250 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -10,15 +10,15 @@ use crate::builder::{SelectorBuilder, SelectorFlags, SpecificityAndFlags};
 use crate::context::QuirksMode;
 use crate::sink::Push;
 pub use crate::visitor::SelectorVisitor;
-use cssparser::{parse_nth, serialize_identifier};
+use cssparser::parse_nth;
 use cssparser::{BasicParseError, BasicParseErrorKind, ParseError, ParseErrorKind};
 use cssparser::{CowRcStr, Delimiter, SourceLocation};
-use cssparser::{CssStringWriter, Parser as CssParser, ToCss, Token};
+use cssparser::{Parser as CssParser, ToCss, Token};
 use precomputed_hash::PrecomputedHash;
 use servo_arc::ThinArc;
 use smallvec::SmallVec;
 use std::borrow::{Borrow, Cow};
-use std::fmt::{self, Debug, Display, Write};
+use std::fmt::{self, Debug};
 use std::iter::Rev;
 use std::slice;
 
@@ -197,8 +197,6 @@ macro_rules! with_all_bounds {
             type ExtraMatchingData: Sized + Default + 'static;
             type AttrValue: $($InSelector)*;
             type Identifier: $($InSelector)*;
-            type ClassName: $($InSelector)*;
-            type PartName: $($InSelector)*;
             type LocalName: $($InSelector)* + Borrow<Self::BorrowedLocalName>;
             type NamespaceUrl: $($CommonBounds)* + Default + Borrow<Self::BorrowedNamespaceUrl>;
             type NamespacePrefix: $($InSelector)* + Default;
@@ -218,7 +216,7 @@ macro_rules! with_all_bounds {
 macro_rules! with_bounds {
     ( [ $( $CommonBounds: tt )* ] [ $( $FromStr: tt )* ]) => {
         with_all_bounds! {
-            [$($CommonBounds)* + $($FromStr)* + Display]
+            [$($CommonBounds)* + $($FromStr)* + ToCss]
             [$($CommonBounds)*]
             [$($FromStr)*]
         }
@@ -462,7 +460,6 @@ fn collect_ancestor_hashes<Impl: SelectorImpl>(
 ) -> bool
 where
     Impl::Identifier: PrecomputedHash,
-    Impl::ClassName: PrecomputedHash,
     Impl::LocalName: PrecomputedHash,
     Impl::NamespaceUrl: PrecomputedHash,
 {
@@ -514,7 +511,6 @@ impl AncestorHashes {
     pub fn new<Impl: SelectorImpl>(selector: &Selector<Impl>, quirks_mode: QuirksMode) -> Self
     where
         Impl::Identifier: PrecomputedHash,
-        Impl::ClassName: PrecomputedHash,
         Impl::LocalName: PrecomputedHash,
         Impl::NamespaceUrl: PrecomputedHash,
     {
@@ -593,7 +589,7 @@ impl<Impl: SelectorImpl> Selector<Impl> {
     }
 
     #[inline]
-    pub fn parts(&self) -> Option<&[Impl::PartName]> {
+    pub fn parts(&self) -> Option<&[Impl::Identifier]> {
         if !self.is_part() {
             return None;
         }
@@ -1012,7 +1008,7 @@ pub enum Component<Impl: SelectorImpl> {
     LocalName(LocalName<Impl>),
 
     ID(#[shmem(field_bound)] Impl::Identifier),
-    Class(#[shmem(field_bound)] Impl::ClassName),
+    Class(#[shmem(field_bound)] Impl::Identifier),
 
     AttributeInNoNamespaceExists {
         #[shmem(field_bound)]
@@ -1061,7 +1057,7 @@ pub enum Component<Impl: SelectorImpl> {
     Slotted(Selector<Impl>),
     /// The `::part` pseudo-element.
     ///   https://drafts.csswg.org/css-shadow-parts/#part
-    Part(#[shmem(field_bound)] Box<[Impl::PartName]>),
+    Part(#[shmem(field_bound)] Box<[Impl::Identifier]>),
     /// The `:host` pseudo-class:
     ///
     /// https://drafts.csswg.org/css-scoping/#host-selector
@@ -1470,18 +1466,18 @@ impl<Impl: SelectorImpl> ToCss for Component<Impl> {
                     if i != 0 {
                         dest.write_char(' ')?;
                     }
-                    display_to_css_identifier(name, dest)?;
+                    name.to_css(dest)?;
                 }
                 dest.write_char(')')
             },
             PseudoElement(ref p) => p.to_css(dest),
             ID(ref s) => {
                 dest.write_char('#')?;
-                display_to_css_identifier(s, dest)
+                s.to_css(dest)
             },
             Class(ref s) => {
                 dest.write_char('.')?;
-                display_to_css_identifier(s, dest)
+                s.to_css(dest)
             },
             LocalName(ref s) => s.to_css(dest),
             ExplicitUniversalType => dest.write_char('*'),
@@ -1490,13 +1486,13 @@ impl<Impl: SelectorImpl> ToCss for Component<Impl> {
             ExplicitNoNamespace => dest.write_char('|'),
             ExplicitAnyNamespace => dest.write_str("*|"),
             Namespace(ref prefix, _) => {
-                display_to_css_identifier(prefix, dest)?;
+                prefix.to_css(dest)?;
                 dest.write_char('|')
             },
 
             AttributeInNoNamespaceExists { ref local_name, .. } => {
                 dest.write_char('[')?;
-                display_to_css_identifier(local_name, dest)?;
+                local_name.to_css(dest)?;
                 dest.write_char(']')
             },
             AttributeInNoNamespace {
@@ -1507,10 +1503,10 @@ impl<Impl: SelectorImpl> ToCss for Component<Impl> {
                 ..
             } => {
                 dest.write_char('[')?;
-                display_to_css_identifier(local_name, dest)?;
+                local_name.to_css(dest)?;
                 operator.to_css(dest)?;
                 dest.write_char('"')?;
-                write!(CssStringWriter::new(dest), "{}", value)?;
+                value.to_css(dest)?;
                 dest.write_char('"')?;
                 match case_sensitivity {
                     ParsedCaseSensitivity::CaseSensitive |
@@ -1582,13 +1578,13 @@ impl<Impl: SelectorImpl> ToCss for AttrSelectorWithOptionalNamespace<Impl> {
         dest.write_char('[')?;
         match self.namespace {
             Some(NamespaceConstraint::Specific((ref prefix, _))) => {
-                display_to_css_identifier(prefix, dest)?;
+                prefix.to_css(dest)?;
                 dest.write_char('|')?
             },
             Some(NamespaceConstraint::Any) => dest.write_str("*|")?,
             None => {},
         }
-        display_to_css_identifier(&self.local_name, dest)?;
+        self.local_name.to_css(dest)?;
         match self.operation {
             ParsedAttrSelectorOperation::Exists => {},
             ParsedAttrSelectorOperation::WithValue {
@@ -1598,7 +1594,7 @@ impl<Impl: SelectorImpl> ToCss for AttrSelectorWithOptionalNamespace<Impl> {
             } => {
                 operator.to_css(dest)?;
                 dest.write_char('"')?;
-                write!(CssStringWriter::new(dest), "{}", expected_value)?;
+                expected_value.to_css(dest)?;
                 dest.write_char('"')?;
                 match case_sensitivity {
                     ParsedCaseSensitivity::CaseSensitive |
@@ -1617,29 +1613,10 @@ impl<Impl: SelectorImpl> ToCss for LocalName<Impl> {
     where
         W: fmt::Write,
     {
-        display_to_css_identifier(&self.name, dest)
+        self.name.to_css(dest)
     }
 }
 
-/// Serialize the output of Display as a CSS identifier
-fn display_to_css_identifier<T: Display, W: fmt::Write>(x: &T, dest: &mut W) -> fmt::Result {
-    // FIXME(SimonSapin): it is possible to avoid this heap allocation
-    // by creating a stream adapter like cssparser::CssStringWriter
-    // that holds and writes to `&mut W` and itself implements `fmt::Write`.
-    //
-    // I haven’t done this yet because it would require somewhat complex and fragile state machine
-    // to support in `fmt::Write::write_char` cases that,
-    // in `serialize_identifier` (which has the full value as a `&str` slice),
-    // can be expressed as
-    // `string.starts_with("--")`, `string == "-"`, `string.starts_with("-")`, etc.
-    //
-    // And I don’t even know if this would be a performance win: jemalloc is good at what it does
-    // and the state machine might be slower than `serialize_identifier` as currently written.
-    let string = x.to_string();
-
-    serialize_identifier(&string, dest)
-}
-
 /// Build up a Selector.
 /// selector : simple_selector_sequence [ combinator simple_selector_sequence ]* ;
 ///
@@ -1810,7 +1787,7 @@ enum SimpleSelectorParseResult<Impl: SelectorImpl> {
     SimpleSelector(Component<Impl>),
     PseudoElement(Impl::PseudoElement),
     SlottedPseudo(Selector<Impl>),
-    PartPseudo(Box<[Impl::PartName]>),
+    PartPseudo(Box<[Impl::Identifier]>),
 }
 
 #[derive(Debug)]
@@ -2605,10 +2582,8 @@ pub mod tests {
 
     impl SelectorImpl for DummySelectorImpl {
         type ExtraMatchingData = ();
-        type AttrValue = DummyAtom;
+        type AttrValue = DummyAttrValue;
         type Identifier = DummyAtom;
-        type ClassName = DummyAtom;
-        type PartName = DummyAtom;
         type LocalName = DummyAtom;
         type NamespaceUrl = DummyAtom;
         type NamespacePrefix = DummyAtom;
@@ -2618,12 +2593,35 @@ pub mod tests {
         type PseudoElement = PseudoElement;
     }
 
+    #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
+    pub struct DummyAttrValue(String);
+
+    impl ToCss for DummyAttrValue {
+        fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+        where
+            W: fmt::Write,
+        {
+            use std::fmt::Write;
+
+            write!(cssparser::CssStringWriter::new(dest), "{}", &self.0)
+        }
+    }
+
+    impl<'a> From<&'a str> for DummyAttrValue {
+        fn from(string: &'a str) -> Self {
+            Self(string.into())
+        }
+    }
+
     #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
     pub struct DummyAtom(String);
 
-    impl fmt::Display for DummyAtom {
-        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-            <String as fmt::Display>::fmt(&self.0, fmt)
+    impl ToCss for DummyAtom {
+        fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+        where
+            W: fmt::Write,
+        {
+            serialize_identifier(&self.0, dest)
         }
     }
 
@@ -3108,7 +3106,7 @@ pub mod tests {
                 vec![Component::AttributeInNoNamespace {
                     local_name: DummyAtom::from("attr"),
                     operator: AttrSelectorOperator::DashMatch,
-                    value: DummyAtom::from("foo"),
+                    value: DummyAttrValue::from("foo"),
                     never_matches: false,
                     case_sensitivity: ParsedCaseSensitivity::CaseSensitive,
                 }],
diff --git a/components/selectors/tree.rs b/components/selectors/tree.rs
index ac90fa1f00c..47cea73a208 100644
--- a/components/selectors/tree.rs
+++ b/components/selectors/tree.rs
@@ -113,7 +113,7 @@ pub trait Element: Sized + Clone + Debug {
 
     fn has_class(
         &self,
-        name: &<Self::Impl as SelectorImpl>::ClassName,
+        name: &<Self::Impl as SelectorImpl>::Identifier,
         case_sensitivity: CaseSensitivity,
     ) -> bool;
 
@@ -121,10 +121,10 @@ pub trait Element: Sized + Clone + Debug {
     /// direction, that is, in an outer-tree -> inner-tree direction.
     fn imported_part(
         &self,
-        name: &<Self::Impl as SelectorImpl>::PartName,
-    ) -> Option<<Self::Impl as SelectorImpl>::PartName>;
+        name: &<Self::Impl as SelectorImpl>::Identifier,
+    ) -> Option<<Self::Impl as SelectorImpl>::Identifier>;
 
-    fn is_part(&self, name: &<Self::Impl as SelectorImpl>::PartName) -> bool;
+    fn is_part(&self, name: &<Self::Impl as SelectorImpl>::Identifier) -> bool;
 
     /// Returns whether this element matches `:empty`.
     ///

From 3bcde6fd91e3d60e0df5bef8105bded7ef9e48ed Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Tue, 17 Nov 2020 12:02:22 +0000
Subject: [PATCH 152/156] style: Fix clippy warnings

Depends on D96634

Differential Revision: https://phabricator.services.mozilla.com/D96636
---
 components/style_derive/to_css.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/style_derive/to_css.rs b/components/style_derive/to_css.rs
index b16d2cf7f30..40b7ee7cfec 100644
--- a/components/style_derive/to_css.rs
+++ b/components/style_derive/to_css.rs
@@ -105,7 +105,7 @@ fn derive_variant_arm(variant: &VariantInfo, generics: &mut Option<WhereClause>)
         }
     } else if let Some(function) = variant_attrs.function {
         let mut identifier = function.explicit().map_or(identifier, |name| name);
-        identifier.push_str("(");
+        identifier.push('(');
         expr = quote! {
             std::fmt::Write::write_str(dest, #identifier)?;
             #expr?;

From 5158f658104c1edbb87a94958c4ab424d3b854b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 14:44:21 +0100
Subject: [PATCH 153/156] Revert euclid update.

---
 components/style/Cargo.toml                   |  2 +-
 components/style/values/generics/transform.rs | 57 ++++++++++---------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 23cd44e99cf..3a784e19512 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -38,7 +38,7 @@ byteorder = "1.0"
 cssparser = "0.28"
 derive_more = "0.99"
 encoding_rs = { version = "0.8", optional = true }
-euclid = "0.22"
+euclid = "0.20"
 fallible = { path = "../fallible" }
 fxhash = "0.2"
 hashglobe = { path = "../hashglobe" }
diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs
index 141e1d056b2..e5739b6ef56 100644
--- a/components/style/values/generics/transform.rs
+++ b/components/style/values/generics/transform.rs
@@ -76,7 +76,7 @@ pub use self::GenericMatrix3D as Matrix3D;
 impl<T: Into<f64>> From<Matrix<T>> for Transform3D<f64> {
     #[inline]
     fn from(m: Matrix<T>) -> Self {
-        Transform3D::new(
+        Transform3D::row_major(
             m.a.into(), m.b.into(), 0.0, 0.0,
             m.c.into(), m.d.into(), 0.0, 0.0,
             0.0,        0.0,        1.0, 0.0,
@@ -89,7 +89,7 @@ impl<T: Into<f64>> From<Matrix<T>> for Transform3D<f64> {
 impl<T: Into<f64>> From<Matrix3D<T>> for Transform3D<f64> {
     #[inline]
     fn from(m: Matrix3D<T>) -> Self {
-        Transform3D::new(
+        Transform3D::row_major(
             m.m11.into(), m.m12.into(), m.m13.into(), m.m14.into(),
             m.m21.into(), m.m22.into(), m.m23.into(), m.m24.into(),
             m.m31.into(), m.m32.into(), m.m33.into(), m.m34.into(),
@@ -443,14 +443,15 @@ where
         use self::TransformOperation::*;
         use std::f64;
 
+        const TWO_PI: f64 = 2.0f64 * f64::consts::PI;
         let reference_width = reference_box.map(|v| v.size.width);
         let reference_height = reference_box.map(|v| v.size.height);
         let matrix = match *self {
             Rotate3D(ax, ay, az, theta) => {
-                let theta = theta.radians64();
+                let theta = TWO_PI - theta.radians64();
                 let (ax, ay, az, theta) =
                     get_normalized_vector_and_angle(ax.into(), ay.into(), az.into(), theta);
-                Transform3D::rotation(
+                Transform3D::create_rotation(
                     ax as f64,
                     ay as f64,
                     az as f64,
@@ -458,54 +459,56 @@ where
                 )
             },
             RotateX(theta) => {
-                let theta = euclid::Angle::radians(theta.radians64());
-                Transform3D::rotation(1., 0., 0., theta)
+                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
+                Transform3D::create_rotation(1., 0., 0., theta)
             },
             RotateY(theta) => {
-                let theta = euclid::Angle::radians(theta.radians64());
-                Transform3D::rotation(0., 1., 0., theta)
+                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
+                Transform3D::create_rotation(0., 1., 0., theta)
             },
             RotateZ(theta) | Rotate(theta) => {
-                let theta = euclid::Angle::radians(theta.radians64());
-                Transform3D::rotation(0., 0., 1., theta)
+                let theta = euclid::Angle::radians(TWO_PI - theta.radians64());
+                Transform3D::create_rotation(0., 0., 1., theta)
             },
             Perspective(ref d) => {
                 let m = create_perspective_matrix(d.to_pixel_length(None)?);
                 m.cast()
             },
-            Scale3D(sx, sy, sz) => Transform3D::scale(sx.into(), sy.into(), sz.into()),
-            Scale(sx, sy) => Transform3D::scale(sx.into(), sy.into(), 1.),
-            ScaleX(s) => Transform3D::scale(s.into(), 1., 1.),
-            ScaleY(s) => Transform3D::scale(1., s.into(), 1.),
-            ScaleZ(s) => Transform3D::scale(1., 1., s.into()),
+            Scale3D(sx, sy, sz) => Transform3D::create_scale(sx.into(), sy.into(), sz.into()),
+            Scale(sx, sy) => Transform3D::create_scale(sx.into(), sy.into(), 1.),
+            ScaleX(s) => Transform3D::create_scale(s.into(), 1., 1.),
+            ScaleY(s) => Transform3D::create_scale(1., s.into(), 1.),
+            ScaleZ(s) => Transform3D::create_scale(1., 1., s.into()),
             Translate3D(ref tx, ref ty, ref tz) => {
                 let tx = tx.to_pixel_length(reference_width)? as f64;
                 let ty = ty.to_pixel_length(reference_height)? as f64;
-                Transform3D::translation(tx, ty, tz.to_pixel_length(None)? as f64)
+                Transform3D::create_translation(tx, ty, tz.to_pixel_length(None)? as f64)
             },
             Translate(ref tx, ref ty) => {
                 let tx = tx.to_pixel_length(reference_width)? as f64;
                 let ty = ty.to_pixel_length(reference_height)? as f64;
-                Transform3D::translation(tx, ty, 0.)
+                Transform3D::create_translation(tx, ty, 0.)
             },
             TranslateX(ref t) => {
                 let t = t.to_pixel_length(reference_width)? as f64;
-                Transform3D::translation(t, 0., 0.)
+                Transform3D::create_translation(t, 0., 0.)
             },
             TranslateY(ref t) => {
                 let t = t.to_pixel_length(reference_height)? as f64;
-                Transform3D::translation(0., t, 0.)
+                Transform3D::create_translation(0., t, 0.)
             },
-            TranslateZ(ref z) => Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64),
-            Skew(theta_x, theta_y) => Transform3D::skew(
+            TranslateZ(ref z) => {
+                Transform3D::create_translation(0., 0., z.to_pixel_length(None)? as f64)
+            },
+            Skew(theta_x, theta_y) => Transform3D::create_skew(
                 euclid::Angle::radians(theta_x.radians64()),
                 euclid::Angle::radians(theta_y.radians64()),
             ),
-            SkewX(theta) => Transform3D::skew(
+            SkewX(theta) => Transform3D::create_skew(
                 euclid::Angle::radians(theta.radians64()),
                 euclid::Angle::radians(0.),
             ),
-            SkewY(theta) => Transform3D::skew(
+            SkewY(theta) => Transform3D::create_skew(
                 euclid::Angle::radians(0.),
                 euclid::Angle::radians(theta.radians64()),
             ),
@@ -544,7 +547,7 @@ impl<T: ToMatrix> Transform<T> {
         let cast_3d_transform = |m: Transform3D<f64>| -> Transform3D<CSSFloat> {
             use std::{f32, f64};
             let cast = |v: f64| { v.min(f32::MAX as f64).max(f32::MIN as f64) as f32 };
-            Transform3D::new(
+            Transform3D::row_major(
                 cast(m.m11), cast(m.m12), cast(m.m13), cast(m.m14),
                 cast(m.m21), cast(m.m22), cast(m.m23), cast(m.m24),
                 cast(m.m31), cast(m.m32), cast(m.m33), cast(m.m34),
@@ -562,7 +565,7 @@ impl<T: ToMatrix> Transform<T> {
         reference_box: Option<&Rect<ComputedLength>>,
     ) -> Result<(Transform3D<f64>, bool), ()> {
         // We intentionally use Transform3D<f64> during computation to avoid error propagation
-        // because using f32 to compute triangle functions (e.g. in rotation()) is not
+        // because using f32 to compute triangle functions (e.g. in create_rotation()) is not
         // accurate enough. In Gecko, we also use "double" to compute the triangle functions.
         // Therefore, let's use Transform3D<f64> during matrix computation and cast it into f32
         // in the end.
@@ -572,7 +575,7 @@ impl<T: ToMatrix> Transform<T> {
         for operation in &*self.0 {
             let matrix = operation.to_3d_matrix(reference_box)?;
             contain_3d |= operation.is_3d();
-            transform = matrix.then(&transform);
+            transform = transform.pre_transform(&matrix);
         }
 
         Ok((transform, contain_3d))
@@ -592,7 +595,7 @@ pub fn create_perspective_matrix(d: CSSFloat) -> Transform3D<CSSFloat> {
     if d <= 0.0 {
         Transform3D::identity()
     } else {
-        Transform3D::perspective(d)
+        Transform3D::create_perspective(d)
     }
 }
 

From 31e8e418ea888b3366128ba42a9c771780f97e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 12:40:48 +0100
Subject: [PATCH 154/156] Miscellaneous build / tidy fixes.

---
 Cargo.lock                                    |   7 +-
 components/canvas/Cargo.toml                  |   2 +-
 components/canvas_traits/Cargo.toml           |   2 +-
 components/derive_common/cg.rs                |  13 +-
 components/layout/construct.rs                |  14 +-
 components/layout/display_list/builder.rs     |   3 +
 components/layout/query.rs                    |   3 +
 components/layout_2020/Cargo.toml             |   2 +-
 components/layout_2020/display_list/mod.rs    |   3 +
 components/layout_2020/lists.rs               |  11 +-
 components/layout_thread/dom_wrapper.rs       |  43 ++---
 components/layout_thread/lib.rs               |   8 +-
 components/layout_thread_2020/dom_wrapper.rs  |  41 ++---
 components/layout_thread_2020/lib.rs          |   8 +-
 components/malloc_size_of/Cargo.toml          |   4 +-
 components/script/Cargo.toml                  |   2 +-
 components/script/dom/attr.rs                 |  31 ++--
 components/script/dom/css.rs                  |   8 +-
 components/script/dom/cssmediarule.rs         |   5 +-
 components/script/dom/cssnamespacerule.rs     |   2 +-
 components/script/dom/cssstyledeclaration.rs  |   4 +
 components/script/dom/csssupportsrule.rs      |   5 +-
 components/script/dom/document.rs             |  12 +-
 components/script/dom/element.rs              |  28 +--
 components/script/dom/htmllinkelement.rs      |   5 +-
 components/script/dom/htmlstyleelement.rs     |   3 +-
 components/script/dom/medialist.rs            |  11 +-
 components/script/dom/window.rs               |   5 +-
 components/selectors/Cargo.toml               |   2 +-
 components/selectors/matching.rs              |   7 +-
 components/selectors/parser.rs                | 154 ++++++++--------
 components/style/attr.rs                      |   3 +-
 components/style/dom_apis.rs                  |  12 +-
 components/style/element_state.rs             |   2 +-
 components/style/gecko/media_features.rs      |   4 +-
 components/style/gecko_string_cache/mod.rs    |   7 +
 .../style/gecko_string_cache/namespace.rs     |   2 +-
 components/style/invalidation/stylesheets.rs  |   2 +-
 components/style/lib.rs                       |  16 +-
 components/style/macros.rs                    |  17 ++
 components/style/properties/build.py          |   2 +-
 components/style/properties/helpers.mako.rs   |  13 +-
 .../properties/longhands/inherited_ui.mako.rs |   2 +-
 .../style/properties/longhands/list.mako.rs   |   1 +
 .../style/properties/properties.mako.rs       |   8 +-
 components/style/servo/media_queries.rs       |  11 ++
 components/style/servo/selector_parser.rs     |  35 ++--
 components/style/servo/url.rs                 |  21 +--
 components/style/str.rs                       |   8 +
 components/style/style_adjuster.rs            |   5 +-
 components/style/values/computed/mod.rs       |   5 +-
 components/style/values/generics/image.rs     |   2 +-
 components/style/values/mod.rs                | 170 ++++++++++++++++--
 components/style/values/resolved/mod.rs       |   5 +-
 components/style/values/specified/image.rs    |   9 -
 .../style/values/specified/resolution.rs      |   2 +-
 components/style/values/specified/table.rs    |   4 +-
 components/style_traits/Cargo.toml            |   2 +-
 components/style_traits/values.rs             |  10 ++
 components/to_shmem/Cargo.toml                |   2 +-
 components/url/lib.rs                         |   4 +
 tests/unit/style/Cargo.toml                   |   2 +-
 tests/unit/style/custom_properties.rs         |   2 +
 tests/unit/style/parsing/selectors.rs         |   3 +-
 tests/unit/style/stylist.rs                   |   1 +
 tests/unit/style/viewport.rs                  |  18 +-
 66 files changed, 566 insertions(+), 294 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index baaf758cb72..029cf147954 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "accountable-refcell"
 version = "0.2.0"
@@ -1171,9 +1173,9 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.27.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
+checksum = "1db8599a9761b371751fbf13e076fa03c6e1a78f8c5288e6ab9467f10a2322c1"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
@@ -5214,7 +5216,6 @@ dependencies = [
  "precomputed-hash",
  "servo_arc",
  "smallvec 1.6.1",
- "thin-slice",
  "to_shmem",
  "to_shmem_derive",
 ]
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index f5e9dbcd47a..74545af1b93 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -20,7 +20,7 @@ bitflags = "1.0"
 byteorder = "1"
 canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
-cssparser = "0.27"
+cssparser = "0.28"
 euclid = "0.20"
 font-kit = "0.10"
 fnv = "1.0"
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 8414349939c..d6d8290378e 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -16,7 +16,7 @@ xr-profile = ["webxr-api/profile", "time"]
 
 [dependencies]
 crossbeam-channel = "0.4"
-cssparser = "0.27"
+cssparser = "0.28"
 euclid = "0.20"
 ipc-channel = "0.14"
 lazy_static = "1"
diff --git a/components/derive_common/cg.rs b/components/derive_common/cg.rs
index 8abfd871496..ab4b8e52760 100644
--- a/components/derive_common/cg.rs
+++ b/components/derive_common/cg.rs
@@ -222,7 +222,12 @@ where
     }
 }
 
-fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Path
+fn map_type_params_in_path<F>(
+    path: &Path,
+    params: &[&TypeParam],
+    self_type: &Path,
+    f: &mut F,
+) -> Path
 where
     F: FnMut(&Ident) -> Type,
 {
@@ -241,9 +246,9 @@ where
                                 .iter()
                                 .map(|arg| match arg {
                                     ty @ &GenericArgument::Lifetime(_) => ty.clone(),
-                                    &GenericArgument::Type(ref data) => {
-                                        GenericArgument::Type(map_type_params(data, params, self_type, f))
-                                    },
+                                    &GenericArgument::Type(ref data) => GenericArgument::Type(
+                                        map_type_params(data, params, self_type, f),
+                                    ),
                                     &GenericArgument::Binding(ref data) => {
                                         GenericArgument::Binding(Binding {
                                             ty: map_type_params(&data.ty, params, self_type, f),
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 7078e063978..c17d52dd155 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -71,8 +71,8 @@ use style::logical_geometry::Direction;
 use style::properties::ComputedValues;
 use style::selector_parser::{PseudoElement, RestyleDamage};
 use style::servo::restyle_damage::ServoRestyleDamage;
+use style::values::computed::Image;
 use style::values::generics::counters::ContentItem;
-use style::values::generics::url::UrlOrNone as ImageUrlOrNone;
 
 /// The results of flow construction for a DOM node.
 #[derive(Clone)]
@@ -1506,9 +1506,9 @@ where
     ) -> ConstructionResult {
         let flotation = FloatKind::from_property(flotation);
         let marker_fragments = match node.style(self.style_context()).get_list().list_style_image {
-            ImageUrlOrNone::Url(ref url_value) => {
+            Image::Url(ref url_value) => {
                 let image_info = Box::new(ImageFragmentInfo::new(
-                    url_value.url().map(|u| u.clone()),
+                    url_value.url().cloned(),
                     None,
                     node,
                     &self.layout_context,
@@ -1519,7 +1519,13 @@ where
                     self.layout_context,
                 )]
             },
-            ImageUrlOrNone::None => match ListStyleTypeContent::from_list_style_type(
+            // XXX: Non-None image types unimplemented.
+            Image::ImageSet(..) |
+            Image::Rect(..) |
+            Image::Gradient(..) |
+            Image::PaintWorklet(..) |
+            Image::CrossFade(..) |
+            Image::None => match ListStyleTypeContent::from_list_style_type(
                 node.style(self.style_context()).get_list().list_style_type,
             ) {
                 ListStyleTypeContent::None => Vec::new(),
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index d268f8428d3..8f087e1c6c2 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -792,6 +792,9 @@ impl Fragment {
                         );
                     }
                 },
+                Image::CrossFade(..) | Image::ImageSet(..) => {
+                    unreachable!("Shouldn't be parsed by Servo for now")
+                },
                 Image::Rect(ref rect) => {
                     // This is a (boxed) empty enum on non-Gecko
                     match **rect {}
diff --git a/components/layout/query.rs b/components/layout/query.rs
index 56b1fc7d0f8..a02a5c935c2 100644
--- a/components/layout/query.rs
+++ b/components/layout/query.rs
@@ -47,6 +47,7 @@ use style::properties::{
 };
 use style::selector_parser::PseudoElement;
 use style::shared_lock::SharedRwLock;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::{CSSPixel, ParsingMode, ToCss};
 use webrender_api::ExternalScrollId;
 
@@ -762,10 +763,12 @@ fn create_font_declaration(
         &mut declarations,
         property.clone(),
         value,
+        Origin::Author,
         url_data,
         None,
         ParsingMode::DEFAULT,
         quirks_mode,
+        CssRuleType::Style,
     );
     let declarations = match result {
         Ok(()) => {
diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
index 75a948fa56d..24e3ead663b 100644
--- a/components/layout_2020/Cargo.toml
+++ b/components/layout_2020/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 app_units = "0.7"
 atomic_refcell = "0.1.6"
 canvas_traits = { path = "../canvas_traits" }
-cssparser = "0.27"
+cssparser = "0.28"
 embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
index 4fc0c390d0d..3f77e4ae362 100644
--- a/components/layout_2020/display_list/mod.rs
+++ b/components/layout_2020/display_list/mod.rs
@@ -474,6 +474,9 @@ impl<'a> BuilderForBoxFragment<'a> {
                 },
                 // Gecko-only value, represented as a (boxed) empty enum on non-Gecko.
                 Image::Rect(ref rect) => match **rect {},
+                Image::ImageSet(..) | Image::CrossFade(..) => {
+                    unreachable!("Shouldn't be parsed on Servo for now")
+                },
             }
         }
     }
diff --git a/components/layout_2020/lists.rs b/components/layout_2020/lists.rs
index c8fa7eabee3..99074747599 100644
--- a/components/layout_2020/lists.rs
+++ b/components/layout_2020/lists.rs
@@ -7,7 +7,7 @@ use crate::dom_traversal::{NodeAndStyleInfo, NodeExt, PseudoElementContentItem};
 use crate::replaced::ReplacedContent;
 use style::properties::longhands::list_style_type::computed_value::T as ListStyleType;
 use style::properties::style_structs;
-use style::values::computed::url::UrlOrNone;
+use style::values::computed::Image;
 
 /// https://drafts.csswg.org/css-lists/#content-property
 pub(crate) fn make_marker<'dom, Node>(
@@ -21,13 +21,18 @@ where
 
     // https://drafts.csswg.org/css-lists/#marker-image
     let marker_image = || match &style.list_style_image {
-        UrlOrNone::Url(url) => Some(vec![
+        Image::Url(url) => Some(vec![
             PseudoElementContentItem::Replaced(ReplacedContent::from_image_url(
                 info.node, context, url,
             )?),
             PseudoElementContentItem::Text(" ".into()),
         ]),
-        UrlOrNone::None => None,
+        // XXX: Non-None image types unimplemented.
+        Image::ImageSet(..) |
+        Image::Rect(..) |
+        Image::Gradient(..) |
+        Image::CrossFade(..) |
+        Image::None => None,
     };
     marker_image().or_else(|| {
         Some(vec![PseudoElementContentItem::Text(
diff --git a/components/layout_thread/dom_wrapper.rs b/components/layout_thread/dom_wrapper.rs
index f0d25ff8c49..cfbc207431a 100644
--- a/components/layout_thread/dom_wrapper.rs
+++ b/components/layout_thread/dom_wrapper.rs
@@ -90,6 +90,7 @@ use style::shared_lock::{
 };
 use style::str::is_whitespace;
 use style::stylist::CascadeData;
+use style::values::{AtomIdent, AtomString};
 use style::CaseSensitivityExt;
 
 #[derive(Clone, Copy)]
@@ -500,8 +501,8 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn has_attr(&self, namespace: &Namespace, attr: &LocalName) -> bool {
-        self.get_attr(namespace, attr).is_some()
+    fn has_attr(&self, namespace: &style::Namespace, attr: &style::LocalName) -> bool {
+        self.get_attr(&**namespace, &**attr).is_some()
     }
 
     #[inline]
@@ -512,11 +513,11 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     #[inline(always)]
     fn each_class<F>(&self, mut callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         if let Some(ref classes) = self.element.get_classes_for_layout() {
             for class in *classes {
-                callback(class)
+                callback(AtomIdent::cast(class))
             }
         }
     }
@@ -640,7 +641,7 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     fn lang_attr(&self) -> Option<SelectorAttrValue> {
         self.get_attr(&ns!(xml), &local_name!("lang"))
             .or_else(|| self.get_attr(&ns!(), &local_name!("lang")))
-            .map(|v| String::from(v as &str))
+            .map(|v| SelectorAttrValue::from(v as &str))
     }
 
     fn match_element_lang(
@@ -663,8 +664,8 @@ impl<'le> TElement for ServoLayoutElement<'le> {
         // so we can decide when to fall back to the Content-Language check.
         let element_lang = match override_lang {
             Some(Some(lang)) => lang,
-            Some(None) => String::new(),
-            None => self.element.get_lang_for_layout(),
+            Some(None) => AtomString::default(),
+            None => AtomString::from(&*self.element.get_lang_for_layout()),
         };
         extended_filtering(&element_lang, &*value)
     }
@@ -813,9 +814,9 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
 
     fn attr_matches(
         &self,
-        ns: &NamespaceConstraint<&Namespace>,
-        local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        ns: &NamespaceConstraint<&style::Namespace>,
+        local_name: &style::LocalName,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
@@ -945,7 +946,7 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         unsafe {
             (*self.element.id_attribute())
                 .as_ref()
@@ -954,16 +955,16 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         None
     }
 
     #[inline]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         self.element.has_class_for_layout(name, case_sensitivity)
     }
 
@@ -1434,9 +1435,9 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
 
     fn attr_matches(
         &self,
-        ns: &NamespaceConstraint<&Namespace>,
-        local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        ns: &NamespaceConstraint<&style::Namespace>,
+        local_name: &style::LocalName,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
@@ -1470,23 +1471,23 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
         false
     }
 
-    fn has_id(&self, _id: &Atom, _case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, _id: &AtomIdent, _case_sensitivity: CaseSensitivity) -> bool {
         debug!("ServoThreadSafeLayoutElement::has_id called");
         false
     }
 
     #[inline]
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         debug!("ServoThreadSafeLayoutElement::is_part called");
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         debug!("ServoThreadSafeLayoutElement::imported_part called");
         None
     }
 
-    fn has_class(&self, _name: &Atom, _case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, _name: &AtomIdent, _case_sensitivity: CaseSensitivity) -> bool {
         debug!("ServoThreadSafeLayoutElement::has_class called");
         false
     }
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 74deb9fb907..ba2a1f27f68 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -506,6 +506,7 @@ impl LayoutThread {
 
         let device = Device::new(
             MediaType::screen(),
+            QuirksMode::NoQuirks,
             window_size.initial_viewport,
             window_size.device_pixel_ratio,
         );
@@ -1267,7 +1268,12 @@ impl LayoutThread {
         };
 
         let had_used_viewport_units = self.stylist.device().used_viewport_units();
-        let device = Device::new(MediaType::screen(), initial_viewport, device_pixel_ratio);
+        let device = Device::new(
+            MediaType::screen(),
+            self.stylist.quirks_mode(),
+            initial_viewport,
+            device_pixel_ratio,
+        );
         let sheet_origins_affected_by_device_change = self.stylist.set_device(device, &guards);
 
         self.stylist
diff --git a/components/layout_thread_2020/dom_wrapper.rs b/components/layout_thread_2020/dom_wrapper.rs
index d3c355c2fe7..e37bbd38274 100644
--- a/components/layout_thread_2020/dom_wrapper.rs
+++ b/components/layout_thread_2020/dom_wrapper.rs
@@ -90,6 +90,7 @@ use style::shared_lock::{
 };
 use style::str::is_whitespace;
 use style::stylist::CascadeData;
+use style::values::{AtomIdent, AtomString};
 use style::CaseSensitivityExt;
 
 #[derive(Clone, Copy)]
@@ -508,7 +509,7 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn has_attr(&self, namespace: &Namespace, attr: &LocalName) -> bool {
+    fn has_attr(&self, namespace: &style::Namespace, attr: &style::LocalName) -> bool {
         self.get_attr(namespace, attr).is_some()
     }
 
@@ -520,11 +521,11 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     #[inline(always)]
     fn each_class<F>(&self, mut callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         if let Some(ref classes) = self.element.get_classes_for_layout() {
             for class in *classes {
-                callback(class)
+                callback(AtomIdent::cast(class))
             }
         }
     }
@@ -648,7 +649,7 @@ impl<'le> TElement for ServoLayoutElement<'le> {
     fn lang_attr(&self) -> Option<SelectorAttrValue> {
         self.get_attr(&ns!(xml), &local_name!("lang"))
             .or_else(|| self.get_attr(&ns!(), &local_name!("lang")))
-            .map(|v| String::from(v as &str))
+            .map(|v| SelectorAttrValue::from(v as &str))
     }
 
     fn match_element_lang(
@@ -671,8 +672,8 @@ impl<'le> TElement for ServoLayoutElement<'le> {
         // so we can decide when to fall back to the Content-Language check.
         let element_lang = match override_lang {
             Some(Some(lang)) => lang,
-            Some(None) => String::new(),
-            None => self.element.get_lang_for_layout(),
+            Some(None) => AtomString::default(),
+            None => AtomString::from(&*self.element.get_lang_for_layout()),
         };
         extended_filtering(&element_lang, &*value)
     }
@@ -821,9 +822,9 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
 
     fn attr_matches(
         &self,
-        ns: &NamespaceConstraint<&Namespace>,
-        local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        ns: &NamespaceConstraint<&style::Namespace>,
+        local_name: &style::LocalName,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
@@ -953,7 +954,7 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         unsafe {
             (*self.element.id_attribute())
                 .as_ref()
@@ -962,16 +963,16 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
     }
 
     #[inline]
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         None
     }
 
     #[inline]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         self.element.has_class_for_layout(name, case_sensitivity)
     }
 
@@ -1445,9 +1446,9 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
 
     fn attr_matches(
         &self,
-        ns: &NamespaceConstraint<&Namespace>,
-        local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        ns: &NamespaceConstraint<&style::Namespace>,
+        local_name: &style::LocalName,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
@@ -1479,23 +1480,23 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
         false
     }
 
-    fn has_id(&self, _id: &Atom, _case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, _id: &AtomIdent, _case_sensitivity: CaseSensitivity) -> bool {
         debug!("ServoThreadSafeLayoutElement::has_id called");
         false
     }
 
     #[inline]
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         debug!("ServoThreadSafeLayoutElement::is_part called");
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         debug!("ServoThreadSafeLayoutElement::imported_part called");
         None
     }
 
-    fn has_class(&self, _name: &Atom, _case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, _name: &AtomIdent, _case_sensitivity: CaseSensitivity) -> bool {
         debug!("ServoThreadSafeLayoutElement::has_class called");
         false
     }
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 41ceddc5d44..6b32a44a5b4 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -474,6 +474,7 @@ impl LayoutThread {
         // but it will be set correctly when the initial reflow takes place.
         let device = Device::new(
             MediaType::screen(),
+            QuirksMode::NoQuirks,
             window_size.initial_viewport,
             window_size.device_pixel_ratio,
         );
@@ -952,7 +953,12 @@ impl LayoutThread {
             ua_or_user: &ua_or_user_guard,
         };
 
-        let device = Device::new(MediaType::screen(), initial_viewport, device_pixel_ratio);
+        let device = Device::new(
+            MediaType::screen(),
+            self.stylist.quirks_mode(),
+            initial_viewport,
+            device_pixel_ratio,
+        );
         let sheet_origins_affected_by_device_change = self.stylist.set_device(device, &guards);
 
         self.stylist
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml
index 3f6d6e80ed9..f3b40bfa0d6 100644
--- a/components/malloc_size_of/Cargo.toml
+++ b/components/malloc_size_of/Cargo.toml
@@ -31,8 +31,8 @@ accountable-refcell = { version = "0.2.0", optional = true }
 app_units = "0.7"
 content-security-policy = { version = "0.4.0", features = ["serde"], optional = true }
 crossbeam-channel = { version = "0.4", optional = true }
-cssparser = "0.27"
-euclid = "0.22"
+cssparser = "0.28"
+euclid = "0.20"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
 hyper_serde = { version = "0.11", optional = true }
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 68ac6638907..a09ccf8f257 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -42,7 +42,7 @@ chrono = "0.4"
 content-security-policy = { version = "0.4.0", features = ["serde"] }
 cookie = "0.11"
 crossbeam-channel = "0.4"
-cssparser = "0.27"
+cssparser = "0.28"
 data-url = "0.1.0"
 deny_public_fields = { path = "../deny_public_fields" }
 devtools_traits = { path = "../devtools_traits" }
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
index e2e8b79f9af..9c4b221f6f3 100644
--- a/components/script/dom/attr.rs
+++ b/components/script/dom/attr.rs
@@ -21,6 +21,7 @@ use servo_atoms::Atom;
 use std::borrow::ToOwned;
 use std::mem;
 use style::attr::{AttrIdentifier, AttrValue};
+use style::values::GenericAtomIdent;
 
 // https://dom.spec.whatwg.org/#interface-attr
 #[dom_struct]
@@ -46,10 +47,10 @@ impl Attr {
         Attr {
             node_: Node::new_inherited(document),
             identifier: AttrIdentifier {
-                local_name: local_name,
-                name: name,
-                namespace: namespace,
-                prefix: prefix,
+                local_name: GenericAtomIdent(local_name),
+                name: GenericAtomIdent(name),
+                namespace: GenericAtomIdent(namespace),
+                prefix: prefix.map(GenericAtomIdent),
             },
             value: DomRefCell::new(value),
             owner: MutNullableDom::new(owner),
@@ -75,17 +76,17 @@ impl Attr {
 
     #[inline]
     pub fn name(&self) -> &LocalName {
-        &self.identifier.name
+        &self.identifier.name.0
     }
 
     #[inline]
     pub fn namespace(&self) -> &Namespace {
-        &self.identifier.namespace
+        &self.identifier.namespace.0
     }
 
     #[inline]
     pub fn prefix(&self) -> Option<&Prefix> {
-        self.identifier.prefix.as_ref()
+        Some(&self.identifier.prefix.as_ref()?.0)
     }
 }
 
@@ -105,7 +106,7 @@ impl AttrMethods for Attr {
     // https://dom.spec.whatwg.org/#dom-attr-value
     fn SetValue(&self, value: DOMString) {
         if let Some(owner) = self.owner() {
-            let value = owner.parse_attribute(&self.identifier.namespace, self.local_name(), value);
+            let value = owner.parse_attribute(self.namespace(), self.local_name(), value);
             self.set_value(value, &owner);
         } else {
             *self.value.borrow_mut() = AttrValue::String(value.into());
@@ -115,12 +116,12 @@ impl AttrMethods for Attr {
     // https://dom.spec.whatwg.org/#dom-attr-name
     fn Name(&self) -> DOMString {
         // FIXME(ajeffrey): convert directly from LocalName to DOMString
-        DOMString::from(&*self.identifier.name)
+        DOMString::from(&**self.name())
     }
 
     // https://dom.spec.whatwg.org/#dom-attr-namespaceuri
     fn GetNamespaceURI(&self) -> Option<DOMString> {
-        match self.identifier.namespace {
+        match *self.namespace() {
             ns!() => None,
             ref url => Some(DOMString::from(&**url)),
         }
@@ -170,7 +171,7 @@ impl Attr {
         assert_eq!(Some(owner), self.owner().as_deref());
         owner.will_mutate_attr(self);
         self.swap_value(&mut value);
-        if self.identifier.namespace == ns!() {
+        if *self.namespace() == ns!() {
             vtable_for(owner.upcast())
                 .attribute_mutated(self, AttributeMutation::Set(Some(&value)));
         }
@@ -196,7 +197,7 @@ impl Attr {
     /// Sets the owner element. Should be called after the attribute is added
     /// or removed from its older parent.
     pub fn set_owner(&self, owner: Option<&Element>) {
-        let ns = &self.identifier.namespace;
+        let ns = self.namespace();
         match (self.owner(), owner) {
             (Some(old), None) => {
                 // Already gone from the list of attributes of old owner.
@@ -218,7 +219,7 @@ impl Attr {
 
     pub fn summarize(&self) -> AttrInfo {
         AttrInfo {
-            namespace: (*self.identifier.namespace).to_owned(),
+            namespace: (**self.namespace()).to_owned(),
             name: String::from(self.Name()),
             value: String::from(self.Value()),
         }
@@ -263,11 +264,11 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
 
     #[inline]
     fn local_name(self) -> &'dom LocalName {
-        unsafe { &self.unsafe_get().identifier.local_name }
+        unsafe { &self.unsafe_get().identifier.local_name.0 }
     }
 
     #[inline]
     fn namespace(self) -> &'dom Namespace {
-        unsafe { &self.unsafe_get().identifier.namespace }
+        unsafe { &self.unsafe_get().identifier.namespace.0 }
     }
 }
diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs
index 138ffb6b9da..8c9600549c5 100644
--- a/components/script/dom/css.rs
+++ b/components/script/dom/css.rs
@@ -14,7 +14,7 @@ use dom_struct::dom_struct;
 use style::context::QuirksMode;
 use style::parser::ParserContext;
 use style::stylesheets::supports_rule::{parse_condition_or_declaration, Declaration};
-use style::stylesheets::CssRuleType;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::ParsingMode;
 
 #[dom_struct]
@@ -39,7 +39,8 @@ impl CSS {
         decl.push_str(&value);
         let decl = Declaration(decl);
         let url = win.Document().url();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Style),
             ParsingMode::DEFAULT,
@@ -60,7 +61,8 @@ impl CSS {
         };
 
         let url = win.Document().url();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Style),
             ParsingMode::DEFAULT,
diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs
index 2f54b0a0839..ca2bdd4d447 100644
--- a/components/script/dom/cssmediarule.rs
+++ b/components/script/dom/cssmediarule.rs
@@ -18,7 +18,7 @@ use servo_arc::Arc;
 use style::media_queries::MediaList as StyleMediaList;
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, ToCssWithGuard};
-use style::stylesheets::{CssRuleType, MediaRule};
+use style::stylesheets::{CssRuleType, MediaRule, Origin};
 use style_traits::{ParsingMode, ToCss};
 
 #[dom_struct]
@@ -82,7 +82,8 @@ impl CSSMediaRule {
         let window = global.as_window();
         let url = window.get_url();
         let quirks_mode = window.Document().quirks_mode();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
diff --git a/components/script/dom/cssnamespacerule.rs b/components/script/dom/cssnamespacerule.rs
index f3ff8df36d9..3a15c7d5ffd 100644
--- a/components/script/dom/cssnamespacerule.rs
+++ b/components/script/dom/cssnamespacerule.rs
@@ -63,7 +63,7 @@ impl CSSNamespaceRuleMethods for CSSNamespaceRule {
     // https://drafts.csswg.org/cssom/#dom-cssnamespacerule-namespaceuri
     fn NamespaceURI(&self) -> DOMString {
         let guard = self.cssrule.shared_lock().read();
-        (*self.namespacerule.read_with(&guard).url).into()
+        (**self.namespacerule.read_with(&guard).url).into()
     }
 }
 
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
index 3c0d63ce92f..41101afd625 100644
--- a/components/script/dom/cssstyledeclaration.rs
+++ b/components/script/dom/cssstyledeclaration.rs
@@ -25,6 +25,7 @@ use style::properties::{
 };
 use style::selector_parser::PseudoElement;
 use style::shared_lock::Locked;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::ParsingMode;
 
 // http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
@@ -302,10 +303,12 @@ impl CSSStyleDeclaration {
                 &mut declarations,
                 id,
                 &value,
+                Origin::Author,
                 &self.owner.base_url(),
                 window.css_error_reporter(),
                 ParsingMode::DEFAULT,
                 quirks_mode,
+                CssRuleType::Style,
             );
 
             // Step 6
@@ -461,6 +464,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
                 &self.owner.base_url(),
                 window.css_error_reporter(),
                 quirks_mode,
+                CssRuleType::Style,
             );
         });
 
diff --git a/components/script/dom/csssupportsrule.rs b/components/script/dom/csssupportsrule.rs
index c462faf7eba..8a028e9efb2 100644
--- a/components/script/dom/csssupportsrule.rs
+++ b/components/script/dom/csssupportsrule.rs
@@ -16,7 +16,7 @@ use servo_arc::Arc;
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, ToCssWithGuard};
 use style::stylesheets::supports_rule::SupportsCondition;
-use style::stylesheets::{CssRuleType, SupportsRule};
+use style::stylesheets::{CssRuleType, Origin, SupportsRule};
 use style_traits::{ParsingMode, ToCss};
 
 #[dom_struct]
@@ -71,7 +71,8 @@ impl CSSSupportsRule {
             let win = global.as_window();
             let url = win.Document().url();
             let quirks_mode = win.Document().quirks_mode();
-            let context = ParserContext::new_for_cssom(
+            let context = ParserContext::new(
+                Origin::Author,
                 &url,
                 Some(CssRuleType::Supports),
                 ParsingMode::DEFAULT,
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index eccc14f67ed..8ae80be66a1 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -3454,7 +3454,12 @@ impl Document {
         let window_size = self.window().window_size();
         let viewport_size = window_size.initial_viewport;
         let device_pixel_ratio = window_size.device_pixel_ratio;
-        Device::new(MediaType::screen(), viewport_size, device_pixel_ratio)
+        Device::new(
+            MediaType::screen(),
+            self.quirks_mode(),
+            viewport_size,
+            device_pixel_ratio,
+        )
     }
 
     pub fn salvageable(&self) -> bool {
@@ -3551,8 +3556,9 @@ impl Document {
         } else {
             snapshot.other_attributes_changed = true;
         }
-        if !snapshot.changed_attrs.contains(attr.local_name()) {
-            snapshot.changed_attrs.push(attr.local_name().clone());
+        let local_name = style::LocalName::cast(attr.local_name());
+        if !snapshot.changed_attrs.contains(local_name) {
+            snapshot.changed_attrs.push(local_name.clone());
         }
         if snapshot.attrs.is_none() {
             let attrs = el
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index d3813b34001..e69fd558f5c 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -129,9 +129,10 @@ use style::selector_parser::{
     NonTSPseudoClass, PseudoElement, RestyleDamage, SelectorImpl, SelectorParser,
 };
 use style::shared_lock::{Locked, SharedRwLock};
+use style::stylesheets::CssRuleType;
 use style::thread_state;
 use style::values::generics::NonNegative;
-use style::values::{computed, specified, CSSFloat};
+use style::values::{computed, specified, AtomIdent, AtomString, CSSFloat};
 use style::CaseSensitivityExt;
 use xml5ever::serialize as xmlSerialize;
 use xml5ever::serialize::SerializeOpts as XmlSerializeOpts;
@@ -568,7 +569,7 @@ pub fn get_attr_for_layout<'dom>(
 
 pub trait LayoutElementHelpers<'dom> {
     fn attrs(self) -> &'dom [LayoutDom<'dom, Attr>];
-    fn has_class_for_layout(self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool;
+    fn has_class_for_layout(self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool;
     fn get_classes_for_layout(self) -> Option<&'dom [Atom]>;
 
     fn synthesize_presentational_hints_for_legacy_attributes<V>(self, hints: &mut V)
@@ -616,7 +617,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
     }
 
     #[inline]
-    fn has_class_for_layout(self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class_for_layout(self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         get_attr_for_layout(self, &ns!(), &local_name!("class")).map_or(false, |attr| {
             attr.as_tokens()
                 .unwrap()
@@ -2851,6 +2852,7 @@ impl VirtualMethods for Element {
                                 &doc.base_url(),
                                 win.css_error_reporter(),
                                 doc.quirks_mode(),
+                                CssRuleType::Style,
                             )))
                         };
 
@@ -3135,16 +3137,16 @@ impl<'a> SelectorsElement for DomRoot<Element> {
 
     fn attr_matches(
         &self,
-        ns: &NamespaceConstraint<&Namespace>,
-        local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        ns: &NamespaceConstraint<&style::Namespace>,
+        local_name: &style::LocalName,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
                 .get_attribute(ns, local_name)
                 .map_or(false, |attr| attr.value().eval_selector(operation)),
             NamespaceConstraint::Any => self.attrs.borrow().iter().any(|attr| {
-                attr.local_name() == local_name && attr.value().eval_selector(operation)
+                *attr.local_name() == **local_name && attr.value().eval_selector(operation)
             }),
         }
     }
@@ -3240,23 +3242,23 @@ impl<'a> SelectorsElement for DomRoot<Element> {
         }
     }
 
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         self.id_attribute
             .borrow()
             .as_ref()
-            .map_or(false, |atom| case_sensitivity.eq_atom(id, atom))
+            .map_or(false, |atom| case_sensitivity.eq_atom(&*id, atom))
     }
 
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         None
     }
 
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
-        Element::has_class(&**self, name, case_sensitivity)
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
+        Element::has_class(&**self, &name, case_sensitivity)
     }
 
     fn is_html_element_in_html_document(&self) -> bool {
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index d240b913a9e..30a45471203 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -39,7 +39,7 @@ use style::attr::AttrValue;
 use style::media_queries::MediaList;
 use style::parser::ParserContext as CssParserContext;
 use style::str::HTML_SPACE_CHARACTERS;
-use style::stylesheets::{CssRuleType, Stylesheet};
+use style::stylesheets::{CssRuleType, Origin, Stylesheet};
 use style_traits::ParsingMode;
 
 #[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
@@ -310,7 +310,8 @@ impl HTMLLinkElement {
         // FIXME(emilio): This looks somewhat fishy, since we use the context
         // only to parse the media query list, CssRuleType::Media doesn't make
         // much sense.
-        let context = CssParserContext::new_for_cssom(
+        let context = CssParserContext::new(
+            Origin::Author,
             &doc_url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs
index 4e81837fc35..83d35fc78c8 100644
--- a/components/script/dom/htmlstyleelement.rs
+++ b/components/script/dom/htmlstyleelement.rs
@@ -96,7 +96,8 @@ impl HTMLStyleElement {
             .expect("Element.textContent must be a string");
         let url = window.get_url();
         let css_error_reporter = window.css_error_reporter();
-        let context = CssParserContext::new_for_cssom(
+        let context = CssParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs
index de0f61d0c00..772c508fc04 100644
--- a/components/script/dom/medialist.rs
+++ b/components/script/dom/medialist.rs
@@ -16,7 +16,7 @@ use style::media_queries::MediaList as StyleMediaList;
 use style::media_queries::MediaQuery;
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, SharedRwLock};
-use style::stylesheets::CssRuleType;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::{ParsingMode, ToCss};
 
 #[dom_struct]
@@ -81,7 +81,8 @@ impl MediaListMethods for MediaList {
         let window = global.as_window();
         let url = window.get_url();
         let quirks_mode = window.Document().quirks_mode();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
@@ -122,7 +123,8 @@ impl MediaListMethods for MediaList {
         let win = global.as_window();
         let url = win.get_url();
         let quirks_mode = win.Document().quirks_mode();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
@@ -159,7 +161,8 @@ impl MediaListMethods for MediaList {
         let win = global.as_window();
         let url = win.get_url();
         let quirks_mode = win.Document().quirks_mode();
-        let context = ParserContext::new_for_cssom(
+        let context = ParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 71ceb293664..7e36c8086fb 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -142,7 +142,7 @@ use style::properties::style_structs::Font;
 use style::properties::{PropertyId, ShorthandId};
 use style::selector_parser::PseudoElement;
 use style::str::HTML_SPACE_CHARACTERS;
-use style::stylesheets::CssRuleType;
+use style::stylesheets::{CssRuleType, Origin};
 use style_traits::{CSSPixel, DevicePixel, ParsingMode};
 use url::Position;
 use webrender_api::units::{DeviceIntPoint, DeviceIntSize, LayoutPixel};
@@ -1307,7 +1307,8 @@ impl WindowMethods for Window {
         let mut parser = Parser::new(&mut input);
         let url = self.get_url();
         let quirks_mode = self.Document().quirks_mode();
-        let context = CssParserContext::new_for_cssom(
+        let context = CssParserContext::new(
+            Origin::Author,
             &url,
             Some(CssRuleType::Media),
             ParsingMode::DEFAULT,
diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml
index 0716da63752..f8e2b7ac538 100644
--- a/components/selectors/Cargo.toml
+++ b/components/selectors/Cargo.toml
@@ -19,7 +19,7 @@ bench = []
 
 [dependencies]
 bitflags = "1.0"
-cssparser = "0.27"
+cssparser = "0.28"
 derive_more = "0.99"
 fxhash = "0.2"
 log = "0.4"
diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index 244572b53bd..1d116063240 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -908,12 +908,7 @@ where
     let index = if let Some(i) = cache.as_mut().and_then(|c| c.lookup(element.opaque())) {
         i
     } else {
-        let i = nth_child_index(
-            element,
-            is_of_type,
-            is_from_end,
-            cache.as_deref_mut(),
-        );
+        let i = nth_child_index(element, is_of_type, is_from_end, cache.as_deref_mut());
         if let Some(c) = cache.as_mut() {
             c.insert(element.opaque(), i)
         }
diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index 70f66419250..a5fa010d50c 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -353,7 +353,12 @@ impl<Impl: SelectorImpl> SelectorList<Impl> {
     where
         P: Parser<'i, Impl = Impl>,
     {
-        Self::parse_with_state(parser, input, SelectorParsingState::empty(), ParseErrorRecovery::DiscardList)
+        Self::parse_with_state(
+            parser,
+            input,
+            SelectorParsingState::empty(),
+            ParseErrorRecovery::DiscardList,
+        )
     }
 
     #[inline]
@@ -387,7 +392,7 @@ impl<Impl: SelectorImpl> SelectorList<Impl> {
                     Ok(&Token::Comma) => break,
                     Ok(_) => {
                         debug_assert!(!was_ok, "Shouldn't have got a selector if getting here");
-                    }
+                    },
                 }
             }
         }
@@ -490,7 +495,9 @@ where
                 // :where and :is OR their selectors, so we can't put any hash
                 // in the filter if there's more than one selector, as that'd
                 // exclude elements that may match one of the other selectors.
-                if list.len() == 1 && !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len) {
+                if list.len() == 1 &&
+                    !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len)
+                {
                     return false;
                 }
                 continue;
@@ -1106,13 +1113,11 @@ impl<Impl: SelectorImpl> Component<Impl> {
             Component::NonTSPseudoClass(..) => true,
             Component::Negation(ref selectors) |
             Component::Is(ref selectors) |
-            Component::Where(ref selectors) => {
-                selectors.iter().all(|selector| {
-                    selector
-                        .iter_raw_match_order()
-                        .all(|c| c.maybe_allowed_after_pseudo_element())
-                })
-            },
+            Component::Where(ref selectors) => selectors.iter().all(|selector| {
+                selector
+                    .iter_raw_match_order()
+                    .all(|c| c.maybe_allowed_after_pseudo_element())
+            }),
             _ => false,
         }
     }
@@ -1130,13 +1135,11 @@ impl<Impl: SelectorImpl> Component<Impl> {
             *self
         );
         match *self {
-            Component::Negation(ref selectors) => {
-                !selectors.iter().all(|selector| {
-                    selector
-                        .iter_raw_match_order()
-                        .all(|c| c.matches_for_stateless_pseudo_element())
-                })
-            },
+            Component::Negation(ref selectors) => !selectors.iter().all(|selector| {
+                selector
+                    .iter_raw_match_order()
+                    .all(|c| c.matches_for_stateless_pseudo_element())
+            }),
             Component::Is(ref selectors) | Component::Where(ref selectors) => {
                 selectors.iter().any(|selector| {
                     selector
@@ -2114,8 +2117,10 @@ where
     let list = SelectorList::parse_with_state(
         parser,
         input,
-        state | SelectorParsingState::SKIP_DEFAULT_NAMESPACE | SelectorParsingState::DISALLOW_PSEUDOS,
-        ParseErrorRecovery::DiscardList
+        state |
+            SelectorParsingState::SKIP_DEFAULT_NAMESPACE |
+            SelectorParsingState::DISALLOW_PSEUDOS,
+        ParseErrorRecovery::DiscardList,
     )?;
 
     Ok(Component::Negation(list.0.into_vec().into_boxed_slice()))
@@ -2179,8 +2184,8 @@ where
                 //
                 //     (Similar quotes for :where() / :not())
                 //
-                let ignore_default_ns =
-                    state.intersects(SelectorParsingState::SKIP_DEFAULT_NAMESPACE) ||
+                let ignore_default_ns = state
+                    .intersects(SelectorParsingState::SKIP_DEFAULT_NAMESPACE) ||
                     matches!(
                         result,
                         SimpleSelectorParseResult::SimpleSelector(Component::Host(..))
@@ -2239,7 +2244,9 @@ where
     let inner = SelectorList::parse_with_state(
         parser,
         input,
-        state | SelectorParsingState::SKIP_DEFAULT_NAMESPACE | SelectorParsingState::DISALLOW_PSEUDOS,
+        state |
+            SelectorParsingState::SKIP_DEFAULT_NAMESPACE |
+            SelectorParsingState::DISALLOW_PSEUDOS,
         parser.is_and_where_error_recovery(),
     )?;
     Ok(component(inner.0.into_vec().into_boxed_slice()))
@@ -3038,13 +3045,12 @@ pub mod tests {
                 vec![
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
-                        vec![
-                            Selector::from_vec(
-                                vec![Component::Class(DummyAtom::from("cl"))],
-                                specificity(0, 1, 0),
-                                Default::default(),
-                            )
-                        ].into_boxed_slice()
+                        vec![Selector::from_vec(
+                            vec![Component::Class(DummyAtom::from("cl"))],
+                            specificity(0, 1, 0),
+                            Default::default(),
+                        )]
+                        .into_boxed_slice()
                     ),
                 ],
                 specificity(0, 1, 0),
@@ -3057,16 +3063,14 @@ pub mod tests {
                 vec![
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
-                        vec![
-                            Selector::from_vec(
-                                vec![
-                                    Component::DefaultNamespace(MATHML.into()),
-                                    Component::ExplicitUniversalType,
-                                ],
-                                specificity(0, 0, 0),
-                                Default::default(),
-                            )
-                        ]
+                        vec![Selector::from_vec(
+                            vec![
+                                Component::DefaultNamespace(MATHML.into()),
+                                Component::ExplicitUniversalType,
+                            ],
+                            specificity(0, 0, 0),
+                            Default::default(),
+                        )]
                         .into_boxed_slice(),
                     ),
                 ],
@@ -3080,19 +3084,17 @@ pub mod tests {
                 vec![
                     Component::DefaultNamespace(MATHML.into()),
                     Component::Negation(
-                        vec![
-                            Selector::from_vec(
-                                vec![
-                                    Component::DefaultNamespace(MATHML.into()),
-                                    Component::LocalName(LocalName {
-                                        name: DummyAtom::from("e"),
-                                        lower_name: DummyAtom::from("e"),
-                                    }),
-                                ],
-                                specificity(0, 0, 1),
-                                Default::default(),
-                            ),
-                        ]
+                        vec![Selector::from_vec(
+                            vec![
+                                Component::DefaultNamespace(MATHML.into()),
+                                Component::LocalName(LocalName {
+                                    name: DummyAtom::from("e"),
+                                    lower_name: DummyAtom::from("e"),
+                                }),
+                            ],
+                            specificity(0, 0, 1),
+                            Default::default(),
+                        ),]
                         .into_boxed_slice()
                     ),
                 ],
@@ -3196,15 +3198,12 @@ pub mod tests {
             parse_ns(":not(*)", &parser),
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
-                    vec![
-                        Selector::from_vec(
-                            vec![
-                                Component::ExplicitUniversalType
-                            ],
-                            specificity(0, 0, 0),
-                            Default::default(),
-                        )
-                    ].into_boxed_slice()
+                    vec![Selector::from_vec(
+                        vec![Component::ExplicitUniversalType],
+                        specificity(0, 0, 0),
+                        Default::default(),
+                    )]
+                    .into_boxed_slice()
                 )],
                 specificity(0, 0, 0),
                 Default::default(),
@@ -3214,16 +3213,14 @@ pub mod tests {
             parse_ns(":not(|*)", &parser),
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
-                    vec![
-                        Selector::from_vec(
-                            vec![
-                                Component::ExplicitNoNamespace,
-                                Component::ExplicitUniversalType,
-                            ],
-                            specificity(0, 0, 0),
-                            Default::default(),
-                        )
-                    ]
+                    vec![Selector::from_vec(
+                        vec![
+                            Component::ExplicitNoNamespace,
+                            Component::ExplicitUniversalType,
+                        ],
+                        specificity(0, 0, 0),
+                        Default::default(),
+                    )]
                     .into_boxed_slice(),
                 )],
                 specificity(0, 0, 0),
@@ -3236,15 +3233,12 @@ pub mod tests {
             parse_ns_expected(":not(*|*)", &parser, Some(":not(*)")),
             Ok(SelectorList::from_vec(vec![Selector::from_vec(
                 vec![Component::Negation(
-                    vec![
-                        Selector::from_vec(
-                            vec![
-                                Component::ExplicitUniversalType
-                            ],
-                            specificity(0, 0, 0),
-                            Default::default()
-                        )
-                    ].into_boxed_slice()
+                    vec![Selector::from_vec(
+                        vec![Component::ExplicitUniversalType],
+                        specificity(0, 0, 0),
+                        Default::default()
+                    )]
+                    .into_boxed_slice()
                 )],
                 specificity(0, 0, 0),
                 Default::default(),
diff --git a/components/style/attr.rs b/components/style/attr.rs
index 92ab7700fb8..05833fa08d8 100644
--- a/components/style/attr.rs
+++ b/components/style/attr.rs
@@ -12,6 +12,7 @@ use crate::str::str_join;
 use crate::str::{read_exponent, read_fraction, HTML_SPACE_CHARACTERS};
 use crate::str::{read_numbers, split_commas, split_html_space_chars};
 use crate::values::specified::Length;
+use crate::values::AtomString;
 use crate::{Atom, LocalName, Namespace, Prefix};
 use app_units::Au;
 use cssparser::{self, Color, RGBA};
@@ -354,7 +355,7 @@ impl AttrValue {
         }
     }
 
-    pub fn eval_selector(&self, selector: &AttrSelectorOperation<&String>) -> bool {
+    pub fn eval_selector(&self, selector: &AttrSelectorOperation<&AtomString>) -> bool {
         // FIXME(SimonSapin) this can be more efficient by matching on `(self, selector)` variants
         // and doing Atom comparisons instead of string comparisons where possible,
         // with SelectorImpl::AttrValue changed to Atom.
diff --git a/components/style/dom_apis.rs b/components/style/dom_apis.rs
index a6c50805cbb..6d19801cfc5 100644
--- a/components/style/dom_apis.rs
+++ b/components/style/dom_apis.rs
@@ -16,7 +16,6 @@ use selectors::matching::{self, MatchingContext, MatchingMode};
 use selectors::parser::{Combinator, Component, LocalName, SelectorImpl};
 use selectors::{Element, NthIndexCache, SelectorList};
 use smallvec::SmallVec;
-use std::borrow::Borrow;
 
 /// <https://dom.spec.whatwg.org/#dom-element-matches>
 pub fn element_matches<E>(
@@ -354,11 +353,14 @@ where
         ref name,
         ref lower_name,
     } = *local_name;
-    if element.is_html_element_in_html_document() {
-        element.local_name() == lower_name.borrow()
+
+    let chosen_name = if element.is_html_element_in_html_document() {
+        lower_name
     } else {
-        element.local_name() == name.borrow()
-    }
+        name
+    };
+
+    element.local_name() == &**chosen_name
 }
 
 /// Fast paths for querySelector with a single simple selector.
diff --git a/components/style/element_state.rs b/components/style/element_state.rs
index e05ff8778e7..0852b4574fa 100644
--- a/components/style/element_state.rs
+++ b/components/style/element_state.rs
@@ -128,7 +128,7 @@ bitflags! {
         /// https://html.spec.whatwg.org/multipage/#centered-alignment
         const IN_MODAL_DIALOG_STATE = 1 << 53;
 
-        /// https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees
+        /// https://html.spec.whatwg.org/multipage/#inert-subtrees
         const IN_MOZINERT_STATE = 1 << 54;
         /// State for the topmost dialog element in top layer
         const IN_TOPMOST_MODAL_DIALOG_STATE = 1 << 55;
diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 37d667896cc..bfc78b84b15 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -307,7 +307,7 @@ fn eval_prefers_reduced_motion(device: &Device, query_value: Option<PrefersReduc
 
 /// Possible values for prefers-contrast media query.
 /// https://drafts.csswg.org/mediaqueries-5/#prefers-contrast
-#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq, Parse, ToCss)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, PartialEq, ToCss)]
 #[repr(u8)]
 pub enum PrefersContrast {
     /// More contrast is preferred. Corresponds to an accessibility theme
@@ -331,7 +331,7 @@ fn eval_prefers_contrast(device: &Device, query_value: Option<PrefersContrast>)
 
 /// Possible values for the forced-colors media query.
 /// https://drafts.csswg.org/mediaqueries-5/#forced-colors
-#[derive(Clone, Copy, Debug, FromPrimitive, PartialEq, Parse, ToCss)]
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, PartialEq, ToCss)]
 #[repr(u8)]
 pub enum ForcedColors {
     /// Page colors are not being forced.
diff --git a/components/style/gecko_string_cache/mod.rs b/components/style/gecko_string_cache/mod.rs
index a6cf017877d..cb040390cfe 100644
--- a/components/style/gecko_string_cache/mod.rs
+++ b/components/style/gecko_string_cache/mod.rs
@@ -147,6 +147,13 @@ impl PartialEq for WeakAtom {
     }
 }
 
+impl PartialEq<Atom> for WeakAtom {
+    #[inline]
+    fn eq(&self, other: &Atom) -> bool {
+        self == &**other
+    }
+}
+
 unsafe impl Send for Atom {}
 unsafe impl Sync for Atom {}
 unsafe impl Sync for WeakAtom {}
diff --git a/components/style/gecko_string_cache/namespace.rs b/components/style/gecko_string_cache/namespace.rs
index 1acf04c93ff..d9745b9e21f 100644
--- a/components/style/gecko_string_cache/namespace.rs
+++ b/components/style/gecko_string_cache/namespace.rs
@@ -47,7 +47,7 @@ impl PrecomputedHash for Namespace {
 }
 
 /// A Gecko WeakNamespace is a wrapped WeakAtom.
-#[derive(Hash, Deref)]
+#[derive(Deref, Hash)]
 pub struct WeakNamespace(WeakAtom);
 
 impl Deref for Namespace {
diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index 9854387ccad..edecc3fc243 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -66,7 +66,7 @@ impl Invalidation {
 
 /// Whether we should invalidate just the element, or the whole subtree within
 /// it.
-#[derive(Copy, Clone, Debug, Eq, MallocSizeOf, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Ord, PartialEq, PartialOrd)]
 enum InvalidationKind {
     None = 0,
     Element,
diff --git a/components/style/lib.rs b/components/style/lib.rs
index f1d36b2722c..a9853e4c823 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -138,15 +138,19 @@ pub type LocalName = crate::values::AtomIdent;
 #[cfg(feature = "gecko")]
 pub use crate::gecko_string_cache::Namespace;
 
-#[cfg(feature = "servo")]
-pub use html5ever::LocalName;
-#[cfg(feature = "servo")]
-pub use html5ever::Namespace;
-#[cfg(feature = "servo")]
-pub use html5ever::Prefix;
 #[cfg(feature = "servo")]
 pub use servo_atoms::Atom;
 
+#[cfg(feature = "servo")]
+#[allow(missing_docs)]
+pub type LocalName = crate::values::GenericAtomIdent<html5ever::LocalNameStaticSet>;
+#[cfg(feature = "servo")]
+#[allow(missing_docs)]
+pub type Namespace = crate::values::GenericAtomIdent<html5ever::NamespaceStaticSet>;
+#[cfg(feature = "servo")]
+#[allow(missing_docs)]
+pub type Prefix = crate::values::GenericAtomIdent<html5ever::PrefixStaticSet>;
+
 pub use style_traits::arc_slice::ArcSlice;
 pub use style_traits::owned_slice::OwnedSlice;
 pub use style_traits::owned_str::OwnedStr;
diff --git a/components/style/macros.rs b/components/style/macros.rs
index e60be8efc5f..f5937d8b469 100644
--- a/components/style/macros.rs
+++ b/components/style/macros.rs
@@ -134,6 +134,23 @@ macro_rules! profiler_label {
     ($label_type:ident) => {};
 }
 
+#[cfg(feature = "servo")]
+macro_rules! local_name {
+    ($s:tt) => {
+        $crate::values::GenericAtomIdent(html5ever::local_name!($s))
+    };
+}
+
+#[cfg(feature = "servo")]
+macro_rules! ns {
+    () => {
+        $crate::values::GenericAtomIdent(html5ever::ns!())
+    };
+    ($s:tt) => {
+        $crate::values::GenericAtomIdent(html5ever::ns!($s))
+    };
+}
+
 #[cfg(feature = "gecko")]
 macro_rules! local_name {
     ($s:tt) => {
diff --git a/components/style/properties/build.py b/components/style/properties/build.py
index e74c9b9795f..97ad10408ea 100644
--- a/components/style/properties/build.py
+++ b/components/style/properties/build.py
@@ -111,7 +111,7 @@ def main():
                     p.name: {"pref": getattr(p, pref_attr)}
                     for prop in properties_list
                     if prop.enabled_in_content()
-                    for p in [prop] + prop.alias
+                    for p in [prop] + prop.aliases
                 }
                 for kind, properties_list in [
                     ("longhands", properties.longhands),
diff --git a/components/style/properties/helpers.mako.rs b/components/style/properties/helpers.mako.rs
index caa941df1ff..30eaac343ac 100644
--- a/components/style/properties/helpers.mako.rs
+++ b/components/style/properties/helpers.mako.rs
@@ -948,7 +948,8 @@
             input.parse_entirely(|input| parse_value(context, input)).map(|longhands| {
                 % for sub_property in shorthand.sub_properties:
                 % if sub_property.may_be_disabled_in(shorthand, engine):
-                if NonCustomPropertyId::from(LonghandId::${sub_property.camel_case}).allowed_in_ignoring_rule_type(context) {
+                if NonCustomPropertyId::from(LonghandId::${sub_property.camel_case})
+                    .allowed_in_ignoring_rule_type(context) {
                 % endif
                     declarations.push(PropertyDeclaration::${sub_property.camel_case}(
                         longhands.${sub_property.ident}
@@ -984,7 +985,10 @@
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Longhands, ParseError<'i>> {
-        let parse_one = |c: &ParserContext, input: &mut Parser<'i, 't>| -> Result<crate::properties::longhands::${to_rust_ident(first_property)}::SpecifiedValue, ParseError<'i>> {
+        let parse_one = |c: &ParserContext, input: &mut Parser<'i, 't>| -> Result<
+            crate::properties::longhands::${to_rust_ident(first_property)}::SpecifiedValue,
+            ParseError<'i>
+        > {
             ${parser_function}(c, input)
         };
 
@@ -1028,7 +1032,10 @@
             context: &ParserContext,
             input: &mut Parser<'i, 't>,
         ) -> Result<Longhands, ParseError<'i>> {
-            let rect = Rect::parse_with(context, input, |c, i| -> Result<crate::properties::longhands::${to_rust_ident(sub_property_pattern % "top")}::SpecifiedValue, ParseError<'i>> {
+            let rect = Rect::parse_with(context, input, |c, i| -> Result<
+                crate::properties::longhands::${to_rust_ident(sub_property_pattern % "top")}::SpecifiedValue,
+                ParseError<'i>
+            > {
             % if allow_quirks != "No":
                 ${parser_function}_quirky(c, i, specified::AllowQuirks::${allow_quirks})
             % else:
diff --git a/components/style/properties/longhands/inherited_ui.mako.rs b/components/style/properties/longhands/inherited_ui.mako.rs
index cb48acaa1fe..233ef365329 100644
--- a/components/style/properties/longhands/inherited_ui.mako.rs
+++ b/components/style/properties/longhands/inherited_ui.mako.rs
@@ -37,7 +37,7 @@ ${helpers.single_keyword(
     gecko_enum_prefix="StyleInert",
     animation_value_type="discrete",
     enabled_in="ua",
-    spec="Nonstandard (https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees)",
+    spec="Nonstandard (https://html.spec.whatwg.org/multipage/#inert-subtrees)",
 )}
 
 ${helpers.single_keyword(
diff --git a/components/style/properties/longhands/list.mako.rs b/components/style/properties/longhands/list.mako.rs
index b9a11a574f5..99d848d9db6 100644
--- a/components/style/properties/longhands/list.mako.rs
+++ b/components/style/properties/longhands/list.mako.rs
@@ -60,6 +60,7 @@ ${helpers.predefined_type(
     initial_specified_value="specified::Image::None",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-lists/#propdef-list-style-image",
+    boxed=engine == "servo-2013",
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index a3430526458..fc8ef438041 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -54,7 +54,8 @@ pub use self::cascade::*;
 
 <%!
     from collections import defaultdict
-    from data import Method, PropertyRestrictions, Keyword, to_rust_ident, to_camel_case, RULE_VALUES, SYSTEM_FONT_LONGHANDS
+    from data import Method, PropertyRestrictions, Keyword, to_rust_ident, \
+                     to_camel_case, RULE_VALUES, SYSTEM_FONT_LONGHANDS
     import os.path
 %>
 
@@ -1199,7 +1200,10 @@ impl LonghandId {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<PropertyDeclaration, ParseError<'i>> {
-        type ParsePropertyFn = for<'i, 't> fn(context: &ParserContext, input: &mut Parser<'i, 't>) -> Result<PropertyDeclaration, ParseError<'i>>;
+        type ParsePropertyFn = for<'i, 't> fn(
+            context: &ParserContext,
+            input: &mut Parser<'i, 't>,
+        ) -> Result<PropertyDeclaration, ParseError<'i>>;
         static PARSE_PROPERTY: [ParsePropertyFn; ${len(data.longhands)}] = [
         % for property in data.longhands:
             longhands::${property.ident}::parse_declared,
diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs
index 039bcf95e29..17949c723d0 100644
--- a/components/style/servo/media_queries.rs
+++ b/components/style/servo/media_queries.rs
@@ -4,6 +4,7 @@
 
 //! Servo's media-query device and expression representation.
 
+use crate::context::QuirksMode;
 use crate::custom_properties::CssEnvironment;
 use crate::media_queries::media_feature::{AllowsRanges, ParsingRequirements};
 use crate::media_queries::media_feature::{Evaluator, MediaFeatureDescription};
@@ -33,6 +34,9 @@ pub struct Device {
     viewport_size: Size2D<f32, CSSPixel>,
     /// The current device pixel ratio, from CSS pixels to device pixels.
     device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
+    /// The current quirks mode.
+    #[ignore_malloc_size_of = "Pure stack type"]
+    quirks_mode: QuirksMode,
 
     /// The font size of the root element
     /// This is set when computing the style of the root
@@ -60,6 +64,7 @@ impl Device {
     /// Trivially construct a new `Device`.
     pub fn new(
         media_type: MediaType,
+        quirks_mode: QuirksMode,
         viewport_size: Size2D<f32, CSSPixel>,
         device_pixel_ratio: Scale<f32, CSSPixel, DevicePixel>,
     ) -> Device {
@@ -67,6 +72,7 @@ impl Device {
             media_type,
             viewport_size,
             device_pixel_ratio,
+            quirks_mode,
             // FIXME(bz): Seems dubious?
             root_font_size: AtomicU32::new(FONT_MEDIUM_PX.to_bits()),
             used_root_font_size: AtomicBool::new(false),
@@ -101,6 +107,11 @@ impl Device {
             .store(size.px().to_bits(), Ordering::Relaxed)
     }
 
+    /// Get the quirks mode of the current device.
+    pub fn quirks_mode(&self) -> QuirksMode {
+        self.quirks_mode
+    }
+
     /// Sets the body text color for the "inherit color from body" quirk.
     ///
     /// <https://quirks.spec.whatwg.org/#the-tables-inherit-color-from-body-quirk>
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index 82722571c85..ce61c172553 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -15,6 +15,7 @@ use crate::properties::longhands::display::computed_value::T as Display;
 use crate::properties::{ComputedValues, PropertyFlags};
 use crate::selector_parser::AttrValue as SelectorAttrValue;
 use crate::selector_parser::{PseudoElementCascadeType, SelectorParser};
+use crate::values::{AtomIdent, AtomString};
 use crate::{Atom, CaseSensitivityExt, LocalName, Namespace, Prefix};
 use cssparser::{serialize_identifier, CowRcStr, Parser as CssParser, SourceLocation, ToCss};
 use fxhash::FxHashMap;
@@ -66,10 +67,6 @@ pub enum PseudoElement {
 /// The count of all pseudo-elements.
 pub const PSEUDO_COUNT: usize = PseudoElement::ServoInlineAbsolute as usize + 1;
 
-impl ::selectors::parser::PseudoElement for PseudoElement {
-    type Impl = SelectorImpl;
-}
-
 impl ToCss for PseudoElement {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result
     where
@@ -96,6 +93,10 @@ impl ToCss for PseudoElement {
     }
 }
 
+impl ::selectors::parser::PseudoElement for PseudoElement {
+    type Impl = SelectorImpl;
+}
+
 /// The number of eager pseudo-elements. Keep this in sync with cascade_type.
 pub const EAGER_PSEUDO_COUNT: usize = 3;
 
@@ -344,7 +345,6 @@ impl ToCss for NonTSPseudoClass {
             Fullscreen => ":fullscreen",
             Hover => ":hover",
             Indeterminate => ":indeterminate",
-            MozInert => ":-moz-inert",
             Link => ":link",
             PlaceholderShown => ":placeholder-shown",
             ReadWrite => ":read-write",
@@ -402,15 +402,13 @@ impl ::selectors::SelectorImpl for SelectorImpl {
     type NonTSPseudoClass = NonTSPseudoClass;
 
     type ExtraMatchingData = InvalidationMatchingData;
-    type AttrValue = String;
-    type Identifier = Atom;
-    type ClassName = Atom;
-    type PartName = Atom;
+    type AttrValue = AtomString;
+    type Identifier = AtomIdent;
     type LocalName = LocalName;
     type NamespacePrefix = Prefix;
     type NamespaceUrl = Namespace;
-    type BorrowedLocalName = LocalName;
-    type BorrowedNamespaceUrl = Namespace;
+    type BorrowedLocalName = html5ever::LocalName;
+    type BorrowedNamespaceUrl = html5ever::Namespace;
 }
 
 impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
@@ -434,7 +432,6 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
             "fullscreen" => Fullscreen,
             "hover" => Hover,
             "indeterminate" => Indeterminate,
-            "-moz-inert" => MozInert,
             "link" => Link,
             "placeholder-shown" => PlaceholderShown,
             "read-write" => ReadWrite,
@@ -697,15 +694,15 @@ impl ElementSnapshot for ServoElementSnapshot {
             .map(|v| v.as_atom())
     }
 
-    fn is_part(&self, _name: &Atom) -> bool {
+    fn is_part(&self, _name: &AtomIdent) -> bool {
         false
     }
 
-    fn imported_part(&self, _: &Atom) -> Option<Atom> {
+    fn imported_part(&self, _: &AtomIdent) -> Option<AtomIdent> {
         None
     }
 
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         self.get_attr(&ns!(), &local_name!("class"))
             .map_or(false, |v| {
                 v.as_tokens()
@@ -716,11 +713,11 @@ impl ElementSnapshot for ServoElementSnapshot {
 
     fn each_class<F>(&self, mut callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         if let Some(v) = self.get_attr(&ns!(), &local_name!("class")) {
             for class in v.as_tokens() {
-                callback(class);
+                callback(AtomIdent::cast(class));
             }
         }
     }
@@ -728,7 +725,7 @@ impl ElementSnapshot for ServoElementSnapshot {
     fn lang_attr(&self) -> Option<SelectorAttrValue> {
         self.get_attr(&ns!(xml), &local_name!("lang"))
             .or_else(|| self.get_attr(&ns!(), &local_name!("lang")))
-            .map(|v| String::from(v as &str))
+            .map(|v| SelectorAttrValue::from(v as &str))
     }
 }
 
@@ -738,7 +735,7 @@ impl ServoElementSnapshot {
         &self,
         ns: &NamespaceConstraint<&Namespace>,
         local_name: &LocalName,
-        operation: &AttrSelectorOperation<&String>,
+        operation: &AttrSelectorOperation<&AtomString>,
     ) -> bool {
         match *ns {
             NamespaceConstraint::Specific(ref ns) => self
diff --git a/components/style/servo/url.rs b/components/style/servo/url.rs
index 8e011796e79..f4ae4e25edf 100644
--- a/components/style/servo/url.rs
+++ b/components/style/servo/url.rs
@@ -107,11 +107,17 @@ impl CssUrl {
     ///
     /// This is only for shape images and masks in Gecko, thus unimplemented for
     /// now so somebody notices when trying to do so.
-    pub fn parse_with_cors_anonymous<'i, 't>(
-        _context: &ParserContext,
-        _input: &mut Parser<'i, 't>,
+    pub fn parse_with_cors_mode<'i, 't>(
+        context: &ParserContext,
+        input: &mut Parser<'i, 't>,
+        cors_mode: CorsMode,
     ) -> Result<Self, ParseError<'i>> {
-        unimplemented!("Need to record somewhere that the request needs to be CORS-enabled")
+        let url = input.expect_url()?;
+        Ok(Self::parse_from_string(
+            url.as_ref().to_owned(),
+            context,
+            cors_mode,
+        ))
     }
 }
 
@@ -120,12 +126,7 @@ impl Parse for CssUrl {
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<Self, ParseError<'i>> {
-        let url = input.expect_url()?;
-        Ok(Self::parse_from_string(
-            url.as_ref().to_owned(),
-            context,
-            CorsMode::None,
-        ))
+        Self::parse_with_cors_mode(context, input, CorsMode::None)
     }
 }
 
diff --git a/components/style/str.rs b/components/style/str.rs
index 9badcdf413c..c610b5241a7 100644
--- a/components/style/str.rs
+++ b/components/style/str.rs
@@ -179,3 +179,11 @@ pub type CssStringWriter = ::nsstring::nsACString;
 /// needs to allocate a temporary string.
 #[cfg(feature = "gecko")]
 pub type CssString = ::nsstring::nsCString;
+
+/// String. The comments for the Gecko types explain the need for this abstraction.
+#[cfg(feature = "servo")]
+pub type CssStringWriter = String;
+
+/// String. The comments for the Gecko types explain the need for this abstraction.
+#[cfg(feature = "servo")]
+pub type CssString = String;
diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs
index 13599c6630a..158be6d5dfb 100644
--- a/components/style/style_adjuster.rs
+++ b/components/style/style_adjuster.rs
@@ -9,7 +9,6 @@ use crate::computed_value_flags::ComputedValueFlags;
 use crate::dom::TElement;
 use crate::properties::longhands::display::computed_value::T as Display;
 use crate::properties::longhands::float::computed_value::T as Float;
-use crate::properties::longhands::overflow_x::computed_value::T as Overflow;
 use crate::properties::longhands::position::computed_value::T as Position;
 use crate::properties::{self, ComputedValues, StyleBuilder};
 
@@ -153,7 +152,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         }
     }
 
-    /// https://html.spec.whatwg.org/multipage/interaction.html#inert-subtrees
+    /// https://html.spec.whatwg.org/multipage/#inert-subtrees
     ///
     ///    If -moz-inert is applied then add:
     ///        -moz-user-focus: none;
@@ -168,6 +167,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     ///
     /// NOTE: If this or the pointer-events tweak is removed, then
     /// minimal-xul.css and the scrollbar style caching need to be tweaked.
+    #[cfg(feature = "gecko")]
     fn adjust_for_inert(&mut self) {
         use crate::values::specified::ui::CursorKind;
         use crate::values::specified::ui::UserSelect;
@@ -529,6 +529,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     /// parent, but we need to make sure it's still scrollable.
     #[cfg(feature = "gecko")]
     fn adjust_for_text_control_editing_root(&mut self) {
+        use crate::properties::longhands::overflow_x::computed_value::T as Overflow;
         use crate::selector_parser::PseudoElement;
 
         if self.style.pseudo != Some(&PseudoElement::MozTextControlEditingRoot) {
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs
index a07c51fe210..1b242547307 100644
--- a/components/style/values/computed/mod.rs
+++ b/components/style/values/computed/mod.rs
@@ -510,10 +510,11 @@ trivial_to_computed_value!(u16);
 trivial_to_computed_value!(u32);
 trivial_to_computed_value!(usize);
 trivial_to_computed_value!(Atom);
+trivial_to_computed_value!(crate::values::AtomIdent);
 #[cfg(feature = "servo")]
-trivial_to_computed_value!(html5ever::Namespace);
+trivial_to_computed_value!(crate::Namespace);
 #[cfg(feature = "servo")]
-trivial_to_computed_value!(html5ever::Prefix);
+trivial_to_computed_value!(crate::Prefix);
 trivial_to_computed_value!(String);
 trivial_to_computed_value!(Box<str>);
 trivial_to_computed_value!(crate::OwnedStr);
diff --git a/components/style/values/generics/image.rs b/components/style/values/generics/image.rs
index bb875b9f32e..d49a8a2b4de 100644
--- a/components/style/values/generics/image.rs
+++ b/components/style/values/generics/image.rs
@@ -117,7 +117,7 @@ pub use self::GenericCrossFadeElement as CrossFadeElement;
 pub use self::GenericCrossFadeImage as CrossFadeImage;
 
 /// https://drafts.csswg.org/css-images-4/#image-set-notation
-#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToResolvedValue, ToShmem, ToCss)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss, ToResolvedValue, ToShmem)]
 #[css(comma, function = "image-set")]
 #[repr(C)]
 pub struct GenericImageSet<Image, Resolution> {
diff --git a/components/style/values/mod.rs b/components/style/values/mod.rs
index 9587b52648d..79ec424ab3a 100644
--- a/components/style/values/mod.rs
+++ b/components/style/values/mod.rs
@@ -68,7 +68,7 @@ pub fn serialize_atom_identifier<Static, W>(
     dest: &mut W,
 ) -> fmt::Result
 where
-    Static: ::string_cache::StaticAtomSet,
+    Static: string_cache::StaticAtomSet,
     W: Write,
 {
     serialize_identifier(&ident, dest)
@@ -90,7 +90,7 @@ pub fn serialize_atom_name<Static, W>(
     dest: &mut W,
 ) -> fmt::Result
 where
-    Static: ::string_cache::StaticAtomSet,
+    Static: string_cache::StaticAtomSet,
     W: Write,
 {
     serialize_name(&ident, dest)
@@ -114,13 +114,27 @@ where
 )]
 pub struct AtomString(pub Atom);
 
+#[cfg(feature = "servo")]
+impl AsRef<str> for AtomString {
+    fn as_ref(&self) -> &str {
+        &*self.0
+    }
+}
+
 impl cssparser::ToCss for AtomString {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result
     where
         W: Write,
     {
-        self.0
-            .with_str(|s| cssparser::CssStringWriter::new(dest).write_str(s))
+        #[cfg(feature = "servo")]
+        {
+            cssparser::CssStringWriter::new(dest).write_str(self.as_ref())
+        }
+        #[cfg(feature = "gecko")]
+        {
+            self.0
+                .with_str(|s| cssparser::CssStringWriter::new(dest).write_str(s))
+        }
     }
 }
 
@@ -138,24 +152,138 @@ impl<'a> From<&'a str> for AtomString {
     }
 }
 
+/// A generic CSS `<ident>` stored as an `Atom`.
+#[cfg(feature = "servo")]
+#[repr(transparent)]
+#[derive(Deref)]
+pub struct GenericAtomIdent<Set>(pub string_cache::Atom<Set>)
+where
+    Set: string_cache::StaticAtomSet;
+
+/// A generic CSS `<ident>` stored as an `Atom`, for the default atom set.
+#[cfg(feature = "servo")]
+pub type AtomIdent = GenericAtomIdent<servo_atoms::AtomStaticSet>;
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> style_traits::SpecifiedValueInfo for GenericAtomIdent<Set> {}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> Default for GenericAtomIdent<Set> {
+    fn default() -> Self {
+        Self(string_cache::Atom::default())
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> std::fmt::Debug for GenericAtomIdent<Set> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> std::hash::Hash for GenericAtomIdent<Set> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.0.hash(state)
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> Eq for GenericAtomIdent<Set> {}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> PartialEq for GenericAtomIdent<Set> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0 == other.0
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> Clone for GenericAtomIdent<Set> {
+    fn clone(&self) -> Self {
+        Self(self.0.clone())
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> to_shmem::ToShmem for GenericAtomIdent<Set> {
+    fn to_shmem(&self, builder: &mut to_shmem::SharedMemoryBuilder) -> to_shmem::Result<Self> {
+        use std::mem::ManuallyDrop;
+
+        let atom = self.0.to_shmem(builder)?;
+        Ok(ManuallyDrop::new(Self(ManuallyDrop::into_inner(atom))))
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> malloc_size_of::MallocSizeOf for GenericAtomIdent<Set> {
+    fn size_of(&self, ops: &mut malloc_size_of::MallocSizeOfOps) -> usize {
+        self.0.size_of(ops)
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> cssparser::ToCss for GenericAtomIdent<Set> {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: Write,
+    {
+        serialize_atom_identifier(&self.0, dest)
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> PrecomputedHash for GenericAtomIdent<Set> {
+    #[inline]
+    fn precomputed_hash(&self) -> u32 {
+        self.0.precomputed_hash()
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<'a, Set: string_cache::StaticAtomSet> From<&'a str> for GenericAtomIdent<Set> {
+    #[inline]
+    fn from(string: &str) -> Self {
+        Self(string_cache::Atom::from(string))
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> std::borrow::Borrow<string_cache::Atom<Set>>
+    for GenericAtomIdent<Set>
+{
+    #[inline]
+    fn borrow(&self) -> &string_cache::Atom<Set> {
+        &self.0
+    }
+}
+
+#[cfg(feature = "servo")]
+impl<Set: string_cache::StaticAtomSet> GenericAtomIdent<Set> {
+    /// Constructs a new GenericAtomIdent.
+    #[inline]
+    pub fn new(atom: string_cache::Atom<Set>) -> Self {
+        Self(atom)
+    }
+
+    /// Cast an atom ref to an AtomIdent ref.
+    #[inline]
+    pub fn cast<'a>(atom: &'a string_cache::Atom<Set>) -> &'a Self {
+        let ptr = atom as *const _ as *const Self;
+        // safety: repr(transparent)
+        unsafe { &*ptr }
+    }
+}
+
 /// A CSS `<ident>` stored as an `Atom`.
+#[cfg(feature = "gecko")]
 #[repr(transparent)]
 #[derive(
-    Clone,
-    Debug,
-    Default,
-    Deref,
-    Eq,
-    Hash,
-    MallocSizeOf,
-    PartialEq,
-    SpecifiedValueInfo,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
+    Clone, Debug, Default, Deref, Eq, Hash, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToShmem,
 )]
 pub struct AtomIdent(pub Atom);
 
+#[cfg(feature = "gecko")]
 impl cssparser::ToCss for AtomIdent {
     fn to_css<W>(&self, dest: &mut W) -> fmt::Result
     where
@@ -165,6 +293,7 @@ impl cssparser::ToCss for AtomIdent {
     }
 }
 
+#[cfg(feature = "gecko")]
 impl PrecomputedHash for AtomIdent {
     #[inline]
     fn precomputed_hash(&self) -> u32 {
@@ -172,6 +301,7 @@ impl PrecomputedHash for AtomIdent {
     }
 }
 
+#[cfg(feature = "gecko")]
 impl<'a> From<&'a str> for AtomIdent {
     #[inline]
     fn from(string: &str) -> Self {
@@ -179,9 +309,15 @@ impl<'a> From<&'a str> for AtomIdent {
     }
 }
 
+#[cfg(feature = "gecko")]
 impl AtomIdent {
+    /// Constructs a new AtomIdent.
+    #[inline]
+    pub fn new(atom: Atom) -> Self {
+        Self(atom)
+    }
+
     /// Like `Atom::with` but for `AtomIdent`.
-    #[cfg(feature = "gecko")]
     pub unsafe fn with<F, R>(ptr: *const crate::gecko_bindings::structs::nsAtom, callback: F) -> R
     where
         F: FnOnce(&Self) -> R,
diff --git a/components/style/values/resolved/mod.rs b/components/style/values/resolved/mod.rs
index 45cc5cbd8cf..4ec84c2ae14 100644
--- a/components/style/values/resolved/mod.rs
+++ b/components/style/values/resolved/mod.rs
@@ -74,14 +74,15 @@ trivial_to_resolved_value!(Box<str>);
 trivial_to_resolved_value!(crate::OwnedStr);
 trivial_to_resolved_value!(cssparser::RGBA);
 trivial_to_resolved_value!(crate::Atom);
+trivial_to_resolved_value!(crate::values::AtomIdent);
 trivial_to_resolved_value!(app_units::Au);
 trivial_to_resolved_value!(computed::url::ComputedUrl);
 #[cfg(feature = "gecko")]
 trivial_to_resolved_value!(computed::url::ComputedImageUrl);
 #[cfg(feature = "servo")]
-trivial_to_resolved_value!(html5ever::Namespace);
+trivial_to_resolved_value!(crate::Namespace);
 #[cfg(feature = "servo")]
-trivial_to_resolved_value!(html5ever::Prefix);
+trivial_to_resolved_value!(crate::Prefix);
 trivial_to_resolved_value!(computed::LengthPercentage);
 trivial_to_resolved_value!(style_traits::values::specified::AllowedNumericType);
 
diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 51bacdf2ce5..3f150e74d1d 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -1144,15 +1144,6 @@ impl Parse for PaintWorklet {
 }
 
 impl MozImageRect {
-    #[cfg(not(feature = "gecko"))]
-    fn parse<'i, 't>(
-        _context: &ParserContext,
-        input: &mut Parser<'i, 't>,
-        _cors_mode: CorsMode,
-    ) -> Result<Self, ParseError<'i>> {
-        Err(input.new_error_for_next_token())
-    }
-
     #[cfg(feature = "gecko")]
     fn parse<'i, 't>(
         context: &ParserContext,
diff --git a/components/style/values/specified/resolution.rs b/components/style/values/specified/resolution.rs
index e8674cffaaa..5ed642f9818 100644
--- a/components/style/values/specified/resolution.rs
+++ b/components/style/values/specified/resolution.rs
@@ -12,7 +12,7 @@ use cssparser::{Parser, Token};
 use style_traits::{ParseError, StyleParseErrorKind};
 
 /// A specified resolution.
-#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToCss, ToShmem, SpecifiedValueInfo)]
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss, ToShmem)]
 pub enum Resolution {
     /// Dots per inch.
     #[css(dimension)]
diff --git a/components/style/values/specified/table.rs b/components/style/values/specified/table.rs
index 79136b12ca1..81f3414e8f6 100644
--- a/components/style/values/specified/table.rs
+++ b/components/style/values/specified/table.rs
@@ -4,8 +4,6 @@
 
 //! Specified types for CSS values related to tables.
 
-use crate::parser::ParserContext;
-
 /// Specified values for the `caption-side` property.
 ///
 /// Note that despite having "physical" names, these are actually interpreted
@@ -15,7 +13,7 @@ use crate::parser::ParserContext;
 ///
 /// https://drafts.csswg.org/css-tables/#propdef-caption-side
 #[cfg(feature = "gecko")]
-fn caption_side_non_standard_enabled(_context: &ParserContext) -> bool {
+fn caption_side_non_standard_enabled(_: &crate::parser::ParserContext) -> bool {
     static_prefs::pref!("layout.css.caption-side-non-standard.enabled")
 }
 
diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
index 50e93ab25e6..02bee7d899c 100644
--- a/components/style_traits/Cargo.toml
+++ b/components/style_traits/Cargo.toml
@@ -16,7 +16,7 @@ gecko = []
 [dependencies]
 app_units = "0.7"
 bitflags = "1.0"
-cssparser = "0.27"
+cssparser = "0.28"
 euclid = "0.20"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
diff --git a/components/style_traits/values.rs b/components/style_traits/values.rs
index df33c949fb6..05ba0b5f2a5 100644
--- a/components/style_traits/values.rs
+++ b/components/style_traits/values.rs
@@ -118,6 +118,16 @@ where
     }
 }
 
+impl ToCss for () {
+    #[inline]
+    fn to_css<W>(&self, _: &mut CssWriter<W>) -> fmt::Result
+    where
+        W: Write,
+    {
+        Ok(())
+    }
+}
+
 /// A writer tailored for serialising CSS.
 ///
 /// Coupled with SequenceWriter, this allows callers to transparently handle
diff --git a/components/to_shmem/Cargo.toml b/components/to_shmem/Cargo.toml
index 76be7671da3..6027d2670e6 100644
--- a/components/to_shmem/Cargo.toml
+++ b/components/to_shmem/Cargo.toml
@@ -14,7 +14,7 @@ servo = ["cssparser/serde", "string_cache"]
 gecko = []
 
 [dependencies]
-cssparser = "0.27"
+cssparser = "0.28"
 servo_arc = { path = "../servo_arc" }
 smallbitvec = "2.1.1"
 smallvec = "1.0"
diff --git a/components/url/lib.rs b/components/url/lib.rs
index d59d79e519a..944d02f29f7 100644
--- a/components/url/lib.rs
+++ b/components/url/lib.rs
@@ -103,6 +103,10 @@ impl ServoUrl {
         scheme == "about" || scheme == "blob" || scheme == "data"
     }
 
+    pub fn chrome_rules_enabled(&self) -> bool {
+        self.is_chrome()
+    }
+
     pub fn is_chrome(&self) -> bool {
         self.scheme() == "chrome"
     }
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index 2764c9d0408..51056e378f4 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.27"
+cssparser = "0.28"
 euclid = "0.20"
 html5ever = "0.25"
 rayon = "1"
diff --git a/tests/unit/style/custom_properties.rs b/tests/unit/style/custom_properties.rs
index 5bb0a800812..1e4ab0a7282 100644
--- a/tests/unit/style/custom_properties.rs
+++ b/tests/unit/style/custom_properties.rs
@@ -5,6 +5,7 @@
 use cssparser::{Parser, ParserInput};
 use euclid::{Scale, Size2D};
 use servo_arc::Arc;
+use style::context::QuirksMode;
 use style::custom_properties::{
     CustomPropertiesBuilder, CustomPropertiesMap, Name, SpecifiedValue,
 };
@@ -30,6 +31,7 @@ fn cascade(
 
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(800., 600.),
         Scale::new(1.0),
     );
diff --git a/tests/unit/style/parsing/selectors.rs b/tests/unit/style/parsing/selectors.rs
index 1ce7498caad..7aa77200732 100644
--- a/tests/unit/style/parsing/selectors.rs
+++ b/tests/unit/style/parsing/selectors.rs
@@ -12,7 +12,8 @@ fn parse_selector<'i, 't>(
     input: &mut Parser<'i, 't>,
 ) -> Result<SelectorList<SelectorImpl>, ParseError<'i>> {
     let mut ns = Namespaces::default();
-    ns.prefixes.insert("svg".into(), ns!(svg));
+    ns.prefixes
+        .insert("svg".into(), style::Namespace::new(ns!(svg)));
     let parser = SelectorParser {
         stylesheet_origin: Origin::UserAgent,
         namespaces: &ns,
diff --git a/tests/unit/style/stylist.rs b/tests/unit/style/stylist.rs
index 8836436c8be..31b7869a258 100644
--- a/tests/unit/style/stylist.rs
+++ b/tests/unit/style/stylist.rs
@@ -214,6 +214,7 @@ fn test_insert() {
 fn mock_stylist() -> Stylist {
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(0f32, 0f32),
         Scale::new(1.0),
     );
diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs
index 445ec4bf8fd..c12939f8f34 100644
--- a/tests/unit/style/viewport.rs
+++ b/tests/unit/style/viewport.rs
@@ -113,6 +113,7 @@ macro_rules! viewport_length {
 fn empty_viewport_rule() {
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(800., 600.),
         Scale::new(1.0),
     );
@@ -140,6 +141,7 @@ macro_rules! assert_decl_eq {
 fn simple_viewport_rules() {
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(800., 600.),
         Scale::new(1.0),
     );
@@ -308,6 +310,7 @@ fn simple_meta_viewport_contents() {
 fn cascading_within_viewport_rule() {
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(800., 600.),
         Scale::new(1.0),
     );
@@ -448,6 +451,7 @@ fn multiple_stylesheets_cascading() {
     set_pref!(layout.viewport.enabled, true);
     let device = Device::new(
         MediaType::screen(),
+        QuirksMode::NoQuirks,
         Size2D::new(800., 600.),
         Scale::new(1.0),
     );
@@ -539,7 +543,12 @@ fn constrain_viewport() {
     }
 
     let initial_viewport = Size2D::new(800., 600.);
-    let device = Device::new(MediaType::screen(), initial_viewport, Scale::new(1.0));
+    let device = Device::new(
+        MediaType::screen(),
+        QuirksMode::NoQuirks,
+        initial_viewport,
+        Scale::new(1.0),
+    );
     let mut input = ParserInput::new("");
     assert_eq!(
         ViewportConstraints::maybe_new(&device, from_css!(input), QuirksMode::NoQuirks),
@@ -597,7 +606,12 @@ fn constrain_viewport() {
     );
 
     let initial_viewport = Size2D::new(200., 150.);
-    let device = Device::new(MediaType::screen(), initial_viewport, Scale::new(1.0));
+    let device = Device::new(
+        MediaType::screen(),
+        QuirksMode::NoQuirks,
+        initial_viewport,
+        Scale::new(1.0),
+    );
     let mut input = ParserInput::new("width: 320px auto");
     assert_eq!(
         ViewportConstraints::maybe_new(&device, from_css!(input), QuirksMode::NoQuirks),

From aa4d2b0b0dbb9a2163ce019137579bd815fa98f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 20:58:11 +0100
Subject: [PATCH 155/156] selectors: Cherry-pick some fixes that got lost.

---
 components/selectors/parser.rs                | 27 ++-----------------
 .../abspos/position-absolute-013.html.ini     |  1 +
 .../abspos/position-absolute-013.html.ini     |  1 +
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/components/selectors/parser.rs b/components/selectors/parser.rs
index a5fa010d50c..b562b8b55b5 100644
--- a/components/selectors/parser.rs
+++ b/components/selectors/parser.rs
@@ -421,22 +421,6 @@ where
     )
 }
 
-/// Parse a comma separated list of compound selectors.
-pub fn parse_compound_selector_list<'i, 't, P, Impl>(
-    parser: &P,
-    input: &mut CssParser<'i, 't>,
-) -> Result<Box<[Selector<Impl>]>, ParseError<'i, P::Error>>
-where
-    P: Parser<'i, Impl = Impl>,
-    Impl: SelectorImpl,
-{
-    input
-        .parse_comma_separated(|input| {
-            parse_inner_compound_selector(parser, input, SelectorParsingState::empty())
-        })
-        .map(|selectors| selectors.into_boxed_slice())
-}
-
 /// Ancestor hashes for the bloom filter. We precompute these and store them
 /// inline with selectors to optimize cache performance during matching.
 /// This matters a lot.
@@ -1522,14 +1506,6 @@ impl<Impl: SelectorImpl> ToCss for Component<Impl> {
             AttributeOther(ref attr_selector) => attr_selector.to_css(dest),
 
             // Pseudo-classes
-            Negation(ref arg) => {
-                dest.write_str(":not(")?;
-                for component in arg.iter() {
-                    component.to_css(dest)?;
-                }
-                dest.write_str(")")
-            },
-
             FirstChild => dest.write_str(":first-child"),
             LastChild => dest.write_str(":last-child"),
             OnlyChild => dest.write_str(":only-child"),
@@ -1559,10 +1535,11 @@ impl<Impl: SelectorImpl> ToCss for Component<Impl> {
                 write_affine(dest, a, b)?;
                 dest.write_char(')')
             },
-            Is(ref list) | Where(ref list) => {
+            Is(ref list) | Where(ref list) | Negation(ref list) => {
                 match *self {
                     Where(..) => dest.write_str(":where(")?,
                     Is(..) => dest.write_str(":is(")?,
+                    Negation(..) => dest.write_str(":not(")?,
                     _ => unreachable!(),
                 }
                 serialize_selector_list(list.iter(), dest)?;
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
index e32da21630a..f85c833dc81 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,4 +1,5 @@
 [position-absolute-013.html]
+  expected: TIMEOUT
   [.flexbox 309]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
index 85b50256b63..a22b1f33f9b 100644
--- a/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,4 +1,5 @@
 [position-absolute-013.html]
+  expected: TIMEOUT
   [.flexbox 309]
     expected: FAIL
 

From fd51cddf9677563a5754ec757ab880ddb7c9890e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 26 Feb 2021 19:53:20 +0100
Subject: [PATCH 156/156] Keep not parsing conic gradient, update WPT
 expectations.

---
 components/style/values/specified/image.rs    |   2 +-
 .../css/css-transitions/events-005.html.ini   |   3 +
 .../css/cssom/CSSFontFaceRule.html.ini        |   4 -
 .../cssstyledeclaration-csstext.html.ini      |   4 -
 .../css/selectors/parsing/parse-not.html.ini  |  25 --
 .../parsing/font-size-computed.html.ini       |  16 --
 .../css/css-transitions/events-005.html.ini   |   3 +
 .../css/css-values/calc-in-max.html.ini       |   2 -
 .../css-values/clamp-length-computed.html.ini |  12 -
 .../css/css-values/max-20-arguments.html.ini  |   2 -
 .../max-length-percent-001.html.ini           |   2 -
 .../max-unitless-zero-invalid.html.ini        |   2 -
 .../min-length-percent-001.html.ini           |   2 -
 ...x-percentage-length-interpolation.html.ini |   2 -
 .../css-values/minmax-angle-computed.html.ini |  96 -------
 .../minmax-angle-serialize.html.ini           | 114 ---------
 .../minmax-integer-computed.html.ini          |  30 ---
 .../minmax-length-computed.html.ini           | 237 ------------------
 .../minmax-length-percent-computed.html.ini   | 150 -----------
 .../minmax-length-percent-serialize.html.ini  | 123 ---------
 .../minmax-length-serialize.html.ini          |  66 -----
 .../minmax-number-computed.html.ini           |  42 ----
 .../minmax-number-serialize.html.ini          |  90 -------
 .../minmax-percentage-computed.html.ini       |  39 ---
 .../minmax-percentage-serialize.html.ini      |  39 ---
 .../css-values/minmax-time-computed.html.ini  |  63 -----
 .../css-values/minmax-time-serialize.html.ini |  66 -----
 .../css/cssom/CSSFontFaceRule.html.ini        |   4 -
 .../cssstyledeclaration-csstext.html.ini      |   3 -
 .../selectors/invalidation/not-001.html.ini   |   7 -
 .../old-tests/css3-modsel-83.xml.ini          |   2 -
 .../css/selectors/parsing/parse-not.html.ini  |  28 ---
 32 files changed, 7 insertions(+), 1273 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/calc-in-max.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/max-20-arguments.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/max-length-percent-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/max-unitless-zero-invalid.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/min-length-percent-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-values/min-max-percentage-length-interpolation.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
 delete mode 100644 tests/wpt/metadata/css/selectors/invalidation/not-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/selectors/old-tests/css3-modsel-83.xml.ini

diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs
index 3f150e74d1d..3ec678cd237 100644
--- a/components/style/values/specified/image.rs
+++ b/components/style/values/specified/image.rs
@@ -826,7 +826,7 @@ impl Gradient {
             AngleOrPercentage::parse_with_unitless,
         )?;
 
-        if items.len() < 2 {
+        if cfg!(feature = "servo") || items.len() < 2 {
             return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError));
         }
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/events-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/events-005.html.ini
index dc242640441..cb829ed6873 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/events-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/events-005.html.ini
@@ -2,6 +2,9 @@
   [padding-left, padding]
     expected: FAIL
 
+  [padding, padding-left]
+    expected: FAIL
+
   [property repetition]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
deleted file mode 100644
index ef2b41ef6d4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CSSFontFaceRule.html]
-  [CSSFontFaceRule.cssText doesn't serialize with newlines]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/cssstyledeclaration-csstext.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/cssstyledeclaration-csstext.html.ini
index 6fb6ba40994..3d58e42a2bb 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom/cssstyledeclaration-csstext.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom/cssstyledeclaration-csstext.html.ini
@@ -1,7 +1,3 @@
 [cssstyledeclaration-csstext.html]
   [cssText on computed style declaration returns the empty string]
     expected: FAIL
-
-  [Shorthands aren't serialized if there are other properties with different logical groups in between]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/selectors/parsing/parse-not.html.ini b/tests/wpt/metadata-layout-2020/css/selectors/parsing/parse-not.html.ini
index 13cb99458c9..b01f67b60f6 100644
--- a/tests/wpt/metadata-layout-2020/css/selectors/parsing/parse-not.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/selectors/parsing/parse-not.html.ini
@@ -1,31 +1,6 @@
 [parse-not.html]
-  [":not(span.a, div.b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(:not(foo))" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b ~ c)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b ~ c, .d .e)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a + .b)" should be a valid selector]
-    expected: FAIL
-
   [":not(:host(:not(.a)))" should be a valid selector]
     expected: FAIL
 
   [":not(:host)" should be a valid selector]
     expected: FAIL
-
-  [":not([disabled\],[selected\])" should be a valid selector]
-    expected: FAIL
-
-  [":not([disabled\][selected\])" should be a valid selector]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini
deleted file mode 100644
index 8a1237e8bb6..00000000000
--- a/tests/wpt/metadata/css/css-fonts/parsing/font-size-computed.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[font-size-computed.html]
-  [<font size="4"> is font-size: large]
-    expected: FAIL
-
-  [<font size="2"> is font-size: small]
-    expected: FAIL
-
-  [<font size="7"> is font-size: xxx-large]
-    expected: FAIL
-
-  [<font size="6"> is font-size: xx-large]
-    expected: FAIL
-
-  [<font size="5"> is font-size: x-large]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/events-005.html.ini b/tests/wpt/metadata/css/css-transitions/events-005.html.ini
index dc242640441..cb829ed6873 100644
--- a/tests/wpt/metadata/css/css-transitions/events-005.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/events-005.html.ini
@@ -2,6 +2,9 @@
   [padding-left, padding]
     expected: FAIL
 
+  [padding, padding-left]
+    expected: FAIL
+
   [property repetition]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-values/calc-in-max.html.ini b/tests/wpt/metadata/css/css-values/calc-in-max.html.ini
deleted file mode 100644
index be0c4da2fdb..00000000000
--- a/tests/wpt/metadata/css/css-values/calc-in-max.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-in-max.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/clamp-length-computed.html.ini b/tests/wpt/metadata/css/css-values/clamp-length-computed.html.ini
index 35bc011d78a..1e17130fab5 100644
--- a/tests/wpt/metadata/css/css-values/clamp-length-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/clamp-length-computed.html.ini
@@ -11,15 +11,3 @@
   [Property letter-spacing value 'clamp(10px, 20px, 30px)' computes to '20px']
     expected: FAIL
 
-  [Property letter-spacing value 'clamp(10px, 20px, 30px)']
-    expected: FAIL
-
-  [Property letter-spacing value 'clamp(10px, 35px, 30px)']
-    expected: FAIL
-
-  [Property letter-spacing value 'clamp(30px, 100px, 20px)']
-    expected: FAIL
-
-  [Property letter-spacing value 'clamp(10px, 5px, 30px)']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/max-20-arguments.html.ini b/tests/wpt/metadata/css/css-values/max-20-arguments.html.ini
deleted file mode 100644
index 53c38aaeb66..00000000000
--- a/tests/wpt/metadata/css/css-values/max-20-arguments.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[max-20-arguments.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/max-length-percent-001.html.ini b/tests/wpt/metadata/css/css-values/max-length-percent-001.html.ini
deleted file mode 100644
index d9ddfa2bf68..00000000000
--- a/tests/wpt/metadata/css/css-values/max-length-percent-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[max-length-percent-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/max-unitless-zero-invalid.html.ini b/tests/wpt/metadata/css/css-values/max-unitless-zero-invalid.html.ini
deleted file mode 100644
index 77cdb9a7a67..00000000000
--- a/tests/wpt/metadata/css/css-values/max-unitless-zero-invalid.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[max-unitless-zero-invalid.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/min-length-percent-001.html.ini b/tests/wpt/metadata/css/css-values/min-length-percent-001.html.ini
deleted file mode 100644
index e70af2a782f..00000000000
--- a/tests/wpt/metadata/css/css-values/min-length-percent-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[min-length-percent-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/min-max-percentage-length-interpolation.html.ini b/tests/wpt/metadata/css/css-values/min-max-percentage-length-interpolation.html.ini
deleted file mode 100644
index d59c7b30211..00000000000
--- a/tests/wpt/metadata/css/css-values/min-max-percentage-length-interpolation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[min-max-percentage-length-interpolation.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/minmax-angle-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-angle-computed.html.ini
index 40c50190740..3a9e368ccdb 100644
--- a/tests/wpt/metadata/css/css-values/minmax-angle-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-angle-computed.html.ini
@@ -191,99 +191,3 @@
   [Property transform value 'rotate(calc(max(90deg, 1.56rad) * 2)']
     expected: FAIL
 
-  [max(1turn) should be used-value-equivalent to 1turn]
-    expected: FAIL
-
-  [min(1deg, 2deg) should be used-value-equivalent to 1deg]
-    expected: FAIL
-
-  [min(1turn) should be used-value-equivalent to 1turn]
-    expected: FAIL
-
-  [max(1grad) should be used-value-equivalent to 1grad]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) / 2 should be used-value-equivalent to 45deg]
-    expected: FAIL
-
-  [min(1rad, 2rad) should be used-value-equivalent to 1rad]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) - 0.125turn) should be used-value-equivalent to 45deg]
-    expected: FAIL
-
-  [max(1deg) should be used-value-equivalent to 1deg]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) - max(0.25turn, 99grad)) should be used-value-equivalent to 0deg]
-    expected: FAIL
-
-  [calc(max(90deg, 1.56rad) / 2 should be used-value-equivalent to 45deg]
-    expected: FAIL
-
-  [calc(max(90deg, 1.56rad) - 0.125turn) should be used-value-equivalent to 45deg]
-    expected: FAIL
-
-  [max(1rad) should be used-value-equivalent to 1rad]
-    expected: FAIL
-
-  [min(270deg, max(0.25turn, 3.14rad)) should be used-value-equivalent to 3.14rad]
-    expected: FAIL
-
-  [min(1grad, 2grad) should be used-value-equivalent to 1grad]
-    expected: FAIL
-
-  [min(1deg) should be used-value-equivalent to 1deg]
-    expected: FAIL
-
-  [min(90deg, 0.26turn) should be used-value-equivalent to 90deg]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) + 0.25turn) should be used-value-equivalent to 180deg]
-    expected: FAIL
-
-  [calc(max(90deg, 1.56rad) * 2 should be used-value-equivalent to 180deg]
-    expected: FAIL
-
-  [calc(max(90deg, 1.56rad) + 0.25turn) should be used-value-equivalent to 180deg]
-    expected: FAIL
-
-  [max(1grad, 2grad) should be used-value-equivalent to 2grad]
-    expected: FAIL
-
-  [max(91deg, 0.25turn) should be used-value-equivalent to 91deg]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) * 2 should be used-value-equivalent to 180deg]
-    expected: FAIL
-
-  [min(1.57rad, 95deg) should be used-value-equivalent to 1.57rad]
-    expected: FAIL
-
-  [min(1turn, 2turn) should be used-value-equivalent to 1turn]
-    expected: FAIL
-
-  [max(1.58rad, 90deg) should be used-value-equivalent to 1.58rad]
-    expected: FAIL
-
-  [calc(min(90deg, 1.58rad) + max(0.25turn, 99grad)) should be used-value-equivalent to 180deg]
-    expected: FAIL
-
-  [max(1turn, 2turn) should be used-value-equivalent to 2turn]
-    expected: FAIL
-
-  [max(1rad, 2rad) should be used-value-equivalent to 2rad]
-    expected: FAIL
-
-  [max(1deg, 2deg) should be used-value-equivalent to 2deg]
-    expected: FAIL
-
-  [min(1rad) should be used-value-equivalent to 1rad]
-    expected: FAIL
-
-  [max(0.25turn, min(270deg, 3.14rad)) should be used-value-equivalent to 3.14rad]
-    expected: FAIL
-
-  [min(1grad) should be used-value-equivalent to 1grad]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-angle-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-angle-serialize.html.ini
index 1b0e7197cca..087d8045750 100644
--- a/tests/wpt/metadata/css/css-values/minmax-angle-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-angle-serialize.html.ini
@@ -65,117 +65,3 @@
   [e.style['transform'\] = "rotate(calc(min(1deg) + min(2deg)))" should set the property value]
     expected: FAIL
 
-  ['rotate(max(90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(0.25turn, 1.57rad, 90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(93deg, 92deg, 90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(90deg, 1.57rad, 0.25turn))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(calc(50grad + min(45deg)))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(90deg, 1.57rad, 0.25turn))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(max(90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(90deg, 1.58rad, 0.25turn))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(81deg, 82deg, 90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(90deg, 92deg, 93deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(max(.25turn))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(50grad + max(45deg)))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(.25turn))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(max(100grad))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(min(30deg) + max(60deg)))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(50grad + min(45deg)))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(100grad))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(100grad))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(0.25turn, 1.58rad, 90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(calc(min(30deg) + max(60deg)))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(83deg, 82deg, 90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(90deg, 92deg, 93deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(0.25turn, 1.57rad, 90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(calc(min(45deg) + 50grad))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(83deg, 82deg, 90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(max(.25turn))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(90deg, 1.58rad, 0.25turn))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(93deg, 92deg, 90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(max(45deg) + 50grad))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(min(45deg) + 50grad))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(max(45deg) + 50grad))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(0.25turn, 1.58rad, 90deg))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(calc(50grad + max(45deg)))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(min(100grad))' as a computed value should serialize as 'rotate(90deg)'.]
-    expected: FAIL
-
-  ['rotate(min(.25turn))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
-  ['rotate(max(81deg, 82deg, 90deg))' as a specified value should serialize as 'rotate(calc(90deg))'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-integer-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-integer-computed.html.ini
index 287e488fd81..8c5176025bb 100644
--- a/tests/wpt/metadata/css/css-values/minmax-integer-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-integer-computed.html.ini
@@ -59,33 +59,3 @@
   [Property z-index value 'min(0.6)']
     expected: FAIL
 
-  [min(1.1, max(0.4, 0.6)) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [min(0.4) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [max(1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [max(0.6) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [min(0.6) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [min(1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [calc(max(0.3, 0.6) / 2) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [max(0.4) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [calc(min(0.3, 0.6) * 2) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [max(0.3, min(1.1, 0.4)) should be used-value-equivalent to 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-length-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-length-computed.html.ini
index e8eb799c3ea..0a95b909192 100644
--- a/tests/wpt/metadata/css/css-values/minmax-length-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-length-computed.html.ini
@@ -479,240 +479,3 @@
   [Property letter-spacing value 'calc(max(1em, 19px) - 10px)']
     expected: FAIL
 
-  [max(1pc, 2pc) should be used-value-equivalent to 2pc]
-    expected: FAIL
-
-  [min(1Q) should be used-value-equivalent to 1Q]
-    expected: FAIL
-
-  [max(1vmax, 2vmax) should be used-value-equivalent to 2vmax]
-    expected: FAIL
-
-  [max(1px) should be used-value-equivalent to 1px]
-    expected: FAIL
-
-  [max(15px, min(25px, 1em)) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [max(1vmax) should be used-value-equivalent to 1vmax]
-    expected: FAIL
-
-  [calc(min(1em, 21px) + max(0.9em, 20px)) should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [min(1pt) should be used-value-equivalent to 1pt]
-    expected: FAIL
-
-  [min(95px, 1in) should be used-value-equivalent to 95px]
-    expected: FAIL
-
-  [max(1px, 2px) should be used-value-equivalent to 2px]
-    expected: FAIL
-
-  [min(1em, 2em) should be used-value-equivalent to 1em]
-    expected: FAIL
-
-  [min(1mm) should be used-value-equivalent to 1mm]
-    expected: FAIL
-
-  [min(1Q, 2Q) should be used-value-equivalent to 1Q]
-    expected: FAIL
-
-  [min(1pc, 2pc) should be used-value-equivalent to 1pc]
-    expected: FAIL
-
-  [max(1em) should be used-value-equivalent to 1em]
-    expected: FAIL
-
-  [max(1cm, 2cm) should be used-value-equivalent to 2cm]
-    expected: FAIL
-
-  [max(25px, 1em) should be used-value-equivalent to 25px]
-    expected: FAIL
-
-  [min(1cm) should be used-value-equivalent to 1cm]
-    expected: FAIL
-
-  [max(1ch) should be used-value-equivalent to 1ch]
-    expected: FAIL
-
-  [min(1vh, 2vh) should be used-value-equivalent to 1vh]
-    expected: FAIL
-
-  [max(1rem, 2rem) should be used-value-equivalent to 2rem]
-    expected: FAIL
-
-  [calc(max(1em, 19px) / 2 should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [max(15px, 2em) should be used-value-equivalent to 20px; fontSize=10px]
-    expected: FAIL
-
-  [min(1ch) should be used-value-equivalent to 1ch]
-    expected: FAIL
-
-  [calc(min(1em, 21px) / 2 should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [min(25px, 1em) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [max(1ex) should be used-value-equivalent to 1ex]
-    expected: FAIL
-
-  [max(1ch, 2ch) should be used-value-equivalent to 2ch]
-    expected: FAIL
-
-  [calc(min(1em, 21px) * 2 should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [max(1pt) should be used-value-equivalent to 1pt]
-    expected: FAIL
-
-  [max(1Q) should be used-value-equivalent to 1Q]
-    expected: FAIL
-
-  [min(1in) should be used-value-equivalent to 1in]
-    expected: FAIL
-
-  [min(1vw) should be used-value-equivalent to 1vw]
-    expected: FAIL
-
-  [max(1mm) should be used-value-equivalent to 1mm]
-    expected: FAIL
-
-  [min(1rem) should be used-value-equivalent to 1rem]
-    expected: FAIL
-
-  [min(1rem, 2rem) should be used-value-equivalent to 1rem]
-    expected: FAIL
-
-  [min(1vmin, 2vmin) should be used-value-equivalent to 1vmin]
-    expected: FAIL
-
-  [max(95px, 1in) should be used-value-equivalent to 1in]
-    expected: FAIL
-
-  [min(1ex, 2ex) should be used-value-equivalent to 1ex]
-    expected: FAIL
-
-  [max(1vh) should be used-value-equivalent to 1vh]
-    expected: FAIL
-
-  [min(1em) should be used-value-equivalent to 1em]
-    expected: FAIL
-
-  [max(1rem) should be used-value-equivalent to 1rem]
-    expected: FAIL
-
-  [calc(min(1em, 21px) + 10px) should be used-value-equivalent to 30px]
-    expected: FAIL
-
-  [max(1vh, 2vh) should be used-value-equivalent to 2vh]
-    expected: FAIL
-
-  [min(1vmin) should be used-value-equivalent to 1vmin]
-    expected: FAIL
-
-  [min(1px, 2px) should be used-value-equivalent to 1px]
-    expected: FAIL
-
-  [calc(max(1em, 19px) - 10px) should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [min(1ch, 2ch) should be used-value-equivalent to 1ch]
-    expected: FAIL
-
-  [max(1em, 2em) should be used-value-equivalent to 2em]
-    expected: FAIL
-
-  [calc(max(1em, 19px) * 2 should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [max(1pc) should be used-value-equivalent to 1pc]
-    expected: FAIL
-
-  [min(25px, max(15px, 1em)) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [min(1vmax) should be used-value-equivalent to 1vmax]
-    expected: FAIL
-
-  [min(1cm, 2cm) should be used-value-equivalent to 1cm]
-    expected: FAIL
-
-  [max(15px, 1em) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [min(1pc) should be used-value-equivalent to 1pc]
-    expected: FAIL
-
-  [max(1Q, 2Q) should be used-value-equivalent to 2Q]
-    expected: FAIL
-
-  [max(1vw) should be used-value-equivalent to 1vw]
-    expected: FAIL
-
-  [min(1vh) should be used-value-equivalent to 1vh]
-    expected: FAIL
-
-  [max(1mm, 2mm) should be used-value-equivalent to 2mm]
-    expected: FAIL
-
-  [max(1pt, 2pt) should be used-value-equivalent to 2pt]
-    expected: FAIL
-
-  [max(1ex, 2ex) should be used-value-equivalent to 2ex]
-    expected: FAIL
-
-  [min(1vw, 2vw) should be used-value-equivalent to 1vw]
-    expected: FAIL
-
-  [calc(min(1em, 21px) - 10px) should be used-value-equivalent to 10px]
-    expected: FAIL
-
-  [max(1in, 2in) should be used-value-equivalent to 2in]
-    expected: FAIL
-
-  [min(1in, 2in) should be used-value-equivalent to 1in]
-    expected: FAIL
-
-  [max(1vmin, 2vmin) should be used-value-equivalent to 2vmin]
-    expected: FAIL
-
-  [min(1vmax, 2vmax) should be used-value-equivalent to 1vmax]
-    expected: FAIL
-
-  [calc(max(1em, 19px) + 10px) should be used-value-equivalent to 30px]
-    expected: FAIL
-
-  [max(1vw, 2vw) should be used-value-equivalent to 2vw]
-    expected: FAIL
-
-  [min(1px) should be used-value-equivalent to 1px]
-    expected: FAIL
-
-  [min(15px, 1em) should be used-value-equivalent to 10px; fontSize=10px]
-    expected: FAIL
-
-  [max(1vmin) should be used-value-equivalent to 1vmin]
-    expected: FAIL
-
-  [min(1ex) should be used-value-equivalent to 1ex]
-    expected: FAIL
-
-  [min(1pt, 2pt) should be used-value-equivalent to 1pt]
-    expected: FAIL
-
-  [min(1mm, 2mm) should be used-value-equivalent to 1mm]
-    expected: FAIL
-
-  [min(15px, 1em) should be used-value-equivalent to 15px]
-    expected: FAIL
-
-  [max(1cm) should be used-value-equivalent to 1cm]
-    expected: FAIL
-
-  [max(1in) should be used-value-equivalent to 1in]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-length-percent-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-length-percent-computed.html.ini
index 6db0ec8b407..5534ae5c023 100644
--- a/tests/wpt/metadata/css/css-values/minmax-length-percent-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-length-percent-computed.html.ini
@@ -299,153 +299,3 @@
   [Property margin-left value 'calc(max(1em, 15%) / 2)']
     expected: FAIL
 
-  [max(20px, 10%) should be used-value-equivalent to 20px; width=100px]
-    expected: FAIL
-
-  [max(1mm + 1%) should be used-value-equivalent to calc(1mm + 1%)]
-    expected: FAIL
-
-  [min(1pt + 1%) should be used-value-equivalent to calc(1pt + 1%)]
-    expected: FAIL
-
-  [max(1pt + 1%) should be used-value-equivalent to calc(1pt + 1%)]
-    expected: FAIL
-
-  [min(1mm + 1%) should be used-value-equivalent to calc(1mm + 1%)]
-    expected: FAIL
-
-  [max(1ch + 1%) should be used-value-equivalent to calc(1ch + 1%)]
-    expected: FAIL
-
-  [max(1ex + 1%) should be used-value-equivalent to calc(1ex + 1%)]
-    expected: FAIL
-
-  [calc(max(1em, 15%) * 2) should be used-value-equivalent to 120px]
-    expected: FAIL
-
-  [max(2em + 10%, 1em + 20%) should be used-value-equivalent to 100px]
-    expected: FAIL
-
-  [min(1em + 1%) should be used-value-equivalent to calc(1em + 1%)]
-    expected: FAIL
-
-  [max(1cm + 1%) should be used-value-equivalent to calc(1cm + 1%)]
-    expected: FAIL
-
-  [min(1em, 10%) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [min(1px + 1%) should be used-value-equivalent to calc(1px + 1%)]
-    expected: FAIL
-
-  [max(1px + 1%) should be used-value-equivalent to calc(1px + 1%)]
-    expected: FAIL
-
-  [min(1Q + 1%) should be used-value-equivalent to calc(1Q + 1%)]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) * 2) should be used-value-equivalent to 60px]
-    expected: FAIL
-
-  [max(1vmax + 1%) should be used-value-equivalent to calc(1vmax + 1%)]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) - 10px) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [max(1em, 10%) should be used-value-equivalent to 20px; width=100px]
-    expected: FAIL
-
-  [max(1rem + 1%) should be used-value-equivalent to calc(1rem + 1%)]
-    expected: FAIL
-
-  [min(30px + 10%, 60px + 5%) should be used-value-equivalent to 70px]
-    expected: FAIL
-
-  [min(1ex + 1%) should be used-value-equivalent to calc(1ex + 1%)]
-    expected: FAIL
-
-  [min(1rem + 1%) should be used-value-equivalent to calc(1rem + 1%)]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) / 2) should be used-value-equivalent to 15px]
-    expected: FAIL
-
-  [min(1vmin + 1%) should be used-value-equivalent to calc(1vmin + 1%)]
-    expected: FAIL
-
-  [max(1em, 10%) should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [min(1pc + 1%) should be used-value-equivalent to calc(1pc + 1%)]
-    expected: FAIL
-
-  [calc(max(1em, 15%) - 10px) should be used-value-equivalent to 50px]
-    expected: FAIL
-
-  [calc(max(1em, 15%) + 10px) should be used-value-equivalent to 70px]
-    expected: FAIL
-
-  [min(1cm + 1%) should be used-value-equivalent to calc(1cm + 1%)]
-    expected: FAIL
-
-  [max(20px, 10%) should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [min(20px, 10%) should be used-value-equivalent to 10px; width=100px]
-    expected: FAIL
-
-  [min(1vw + 1%) should be used-value-equivalent to calc(1vw + 1%)]
-    expected: FAIL
-
-  [max(1Q + 1%) should be used-value-equivalent to calc(1Q + 1%)]
-    expected: FAIL
-
-  [max(1vw + 1%) should be used-value-equivalent to calc(1vw + 1%)]
-    expected: FAIL
-
-  [min(1vmax + 1%) should be used-value-equivalent to calc(1vmax + 1%)]
-    expected: FAIL
-
-  [max(1pc + 1%) should be used-value-equivalent to calc(1pc + 1%)]
-    expected: FAIL
-
-  [min(1in + 1%) should be used-value-equivalent to calc(1in + 1%)]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) + 10px) should be used-value-equivalent to 40px]
-    expected: FAIL
-
-  [min(20px, 10%) should be used-value-equivalent to 20px]
-    expected: FAIL
-
-  [min(1vh + 1%) should be used-value-equivalent to calc(1vh + 1%)]
-    expected: FAIL
-
-  [max(1em + 1%) should be used-value-equivalent to calc(1em + 1%)]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) - max(1em, 15%)) should be used-value-equivalent to -30px]
-    expected: FAIL
-
-  [calc(max(1em, 15%) / 2) should be used-value-equivalent to 30px]
-    expected: FAIL
-
-  [max(1vmin + 1%) should be used-value-equivalent to calc(1vmin + 1%)]
-    expected: FAIL
-
-  [min(1ch + 1%) should be used-value-equivalent to calc(1ch + 1%)]
-    expected: FAIL
-
-  [max(1vh + 1%) should be used-value-equivalent to calc(1vh + 1%)]
-    expected: FAIL
-
-  [min(1em, 10%) should be used-value-equivalent to 10px; width=100px]
-    expected: FAIL
-
-  [calc(min(1.5em, 10%) + max(1em, 15%)) should be used-value-equivalent to 90px]
-    expected: FAIL
-
-  [max(1in + 1%) should be used-value-equivalent to calc(1in + 1%)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-length-percent-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-length-percent-serialize.html.ini
index 5f1cf65fc6c..2b23997447b 100644
--- a/tests/wpt/metadata/css/css-values/minmax-length-percent-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-length-percent-serialize.html.ini
@@ -179,156 +179,33 @@
   [e.style['margin-left'\] = "calc(min(1em) + 10%)" should set the property value]
     expected: FAIL
 
-  ['calc(1em + max(10% + 20px) + 5% + min(1em + 10%) + 10px)' as a used value should serialize as '87px'.]
-    expected: FAIL
-
-  ['max(1px)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
-  ['max(10%, 1em)' as a computed value should serialize as 'max(10%, 16px)'.]
-    expected: FAIL
-
-  ['min(10%, 20px)' as a specified value should serialize as 'min(10%, 20px)'.]
-    expected: FAIL
-
-  ['min(10% + 30px, 5em + 5%)' as a specified value should serialize as 'min(10% + 30px, 5% + 5em)'.]
-    expected: FAIL
-
-  ['min(1px)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['min(10% + 30px, 5em + 5%)' as a used value should serialize as '40px'.]
-    expected: FAIL
-
-  ['max(10% + 30px, 5em + 5%)' as a computed value should serialize as 'max(10% + 30px, 5% + 80px)'.]
-    expected: FAIL
-
-  ['max(10%, 20px)' as a used value should serialize as '20px'.]
-    expected: FAIL
-
-  ['min(10%, 1em)' as a computed value should serialize as 'min(10%, 16px)'.]
-    expected: FAIL
-
-  ['min(1px + 1%)' as a used value should serialize as '2px'.]
-    expected: FAIL
-
   ['min(1% + 1px)' as a computed value should serialize as 'min(1% + 1px)'.]
     expected: FAIL
 
-  ['max(10% + 30px, 5em + 5%)' as a used value should serialize as '85px'.]
-    expected: FAIL
-
-  ['max(10% + 30px, 5em + 5%)' as a specified value should serialize as 'max(10% + 30px, 5% + 5em)'.]
-    expected: FAIL
-
-  ['min(10%, 1em)' as a used value should serialize as '10px'.]
-    expected: FAIL
-
-  ['min(1em, 10%)' as a used value should serialize as '10px'.]
-    expected: FAIL
-
-  ['max(20px, 10%)' as a used value should serialize as '20px'.]
-    expected: FAIL
-
-  ['max(10%, 1em)' as a used value should serialize as '16px'.]
-    expected: FAIL
-
-  ['min(20px, 10%)' as a specified value should serialize as 'min(20px, 10%)'.]
-    expected: FAIL
-
-  ['max(1em, 10%)' as a specified value should serialize as 'max(1em, 10%)'.]
-    expected: FAIL
-
-  ['min(10%, 1em)' as a specified value should serialize as 'min(10%, 1em)'.]
-    expected: FAIL
-
-  ['min(1px)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
-  ['min(1px)' as a specified value should serialize as 'calc(1px)'.]
-    expected: FAIL
-
-  ['min(20px, 10%)' as a used value should serialize as '10px'.]
-    expected: FAIL
-
-  ['min(1% + 1px)' as a used value should serialize as '2px'.]
-    expected: FAIL
-
   ['calc(min(10% + 1px) + max(1em + 10%) + min(10% + 20px))' as a computed value should serialize as 'calc(min(10% + 1px) + max(10% + 16px) + min(10% + 20px))'.]
     expected: FAIL
 
-  ['max(1px)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['min(20px, 10%)' as a computed value should serialize as 'min(20px, 10%)'.]
-    expected: FAIL
-
-  ['max(1px)' as a specified value should serialize as 'calc(1px)'.]
-    expected: FAIL
-
-  ['max(10%, 1em)' as a specified value should serialize as 'max(10%, 1em)'.]
-    expected: FAIL
-
-  ['min(10%, 20px)' as a used value should serialize as '10px'.]
-    expected: FAIL
-
-  ['max(20px, 10%)' as a specified value should serialize as 'max(20px, 10%)'.]
-    expected: FAIL
-
-  ['max(10%, 20px)' as a computed value should serialize as 'max(10%, 20px)'.]
-    expected: FAIL
-
-  ['min(10% + 30px, 5em + 5%)' as a computed value should serialize as 'min(10% + 30px, 5% + 80px)'.]
-    expected: FAIL
-
-  ['min(10%, 20px)' as a computed value should serialize as 'min(10%, 20px)'.]
-    expected: FAIL
-
   ['max(1px + 1%)' as a specified value should serialize as 'max(1% + 1px)'.]
     expected: FAIL
 
-  ['calc(min(10% + 1px) + max(1em + 10%) + min(10% + 20px))' as a used value should serialize as '67px'.]
-    expected: FAIL
-
   ['calc(1em + max(10% + 20px) + 5% + min(1em + 10%) + 10px)' as a computed value should serialize as 'calc(5% + 26px + max(10% + 20px) + min(10% + 16px))'.]
     expected: FAIL
 
   ['max(1px + 1%)' as a computed value should serialize as 'max(1% + 1px)'.]
     expected: FAIL
 
-  ['min(1em, 10%)' as a specified value should serialize as 'min(1em, 10%)'.]
-    expected: FAIL
-
   ['min(1% + 1px)' as a specified value should serialize as 'min(1% + 1px)'.]
     expected: FAIL
 
   ['calc(min(10% + 1px) + max(1em + 10%) + min(10% + 20px))' as a specified value should serialize as 'calc(min(10% + 1px) + max(10% + 1em) + min(10% + 20px))'.]
     expected: FAIL
 
-  ['max(10%, 20px)' as a specified value should serialize as 'max(10%, 20px)'.]
-    expected: FAIL
-
   ['min(1px + 1%)' as a specified value should serialize as 'min(1% + 1px)'.]
     expected: FAIL
 
-  ['max(1em, 10%)' as a computed value should serialize as 'max(16px, 10%)'.]
-    expected: FAIL
-
   ['min(1px + 1%)' as a computed value should serialize as 'min(1% + 1px)'.]
     expected: FAIL
 
-  ['max(1em, 10%)' as a used value should serialize as '16px'.]
-    expected: FAIL
-
-  ['max(20px, 10%)' as a computed value should serialize as 'max(20px, 10%)'.]
-    expected: FAIL
-
-  ['min(1em, 10%)' as a computed value should serialize as 'min(16px, 10%)'.]
-    expected: FAIL
-
   ['calc(1em + max(10% + 20px) + 5% + min(1em + 10%) + 10px)' as a specified value should serialize as 'calc(5% + 1em + 10px + max(10% + 20px) + min(10% + 1em))'.]
     expected: FAIL
 
-  ['max(1px + 1%)' as a used value should serialize as '2px'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-length-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-length-serialize.html.ini
index 776b7d465e4..2bbf3298114 100644
--- a/tests/wpt/metadata/css/css-values/minmax-length-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-length-serialize.html.ini
@@ -131,69 +131,3 @@
   [e.style['letter-spacing'\] = "calc(10px + min(1em))" should set the property value]
     expected: FAIL
 
-  ['min(50px, 1in + 1px)' as a specified value should serialize as 'calc(50px)'.]
-    expected: FAIL
-
-  ['min(1px)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['min(50px, 1in + 1px)' as a computed value should serialize as '50px'.]
-    expected: FAIL
-
-  ['calc(1px + min(1in, 100px))' as a computed value should serialize as '97px'.]
-    expected: FAIL
-
-  ['min(1in)' as a specified value should serialize as 'calc(96px)'.]
-    expected: FAIL
-
-  ['calc(1px + max(1in, 100px))' as a computed value should serialize as '101px'.]
-    expected: FAIL
-
-  ['calc(min(1px, 1in) + max(100px + 1em, 10px + 1in) + 1px)' as a computed value should serialize as '118px'.]
-    expected: FAIL
-
-  ['min(1px, 1em)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['max(50px, 1in + 1px)' as a computed value should serialize as '97px'.]
-    expected: FAIL
-
-  ['min(1px)' as a specified value should serialize as 'calc(1px)'.]
-    expected: FAIL
-
-  ['calc(1px + min(1in, 100px))' as a specified value should serialize as 'calc(97px)'.]
-    expected: FAIL
-
-  ['max(1px)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['max(1px)' as a specified value should serialize as 'calc(1px)'.]
-    expected: FAIL
-
-  ['min(1PX)' as a computed value should serialize as '1px'.]
-    expected: FAIL
-
-  ['max(1in)' as a specified value should serialize as 'calc(96px)'.]
-    expected: FAIL
-
-  ['min(1in)' as a computed value should serialize as '96px'.]
-    expected: FAIL
-
-  ['min(1PX)' as a specified value should serialize as 'calc(1px)'.]
-    expected: FAIL
-
-  ['calc(min(1px, 1in) + max(100px + 1em, 10px + 1in) + 1px)' as a specified value should serialize as 'calc(2px + max(1em + 100px, 106px))'.]
-    expected: FAIL
-
-  ['max(1in)' as a computed value should serialize as '96px'.]
-    expected: FAIL
-
-  ['min(1px, 1em)' as a specified value should serialize as 'min(1px, 1em)'.]
-    expected: FAIL
-
-  ['max(50px, 1in + 1px)' as a specified value should serialize as 'calc(97px)'.]
-    expected: FAIL
-
-  ['calc(1px + max(1in, 100px))' as a specified value should serialize as 'calc(101px)'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
index d850f06d62f..632a2867a95 100644
--- a/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-number-computed.html.ini
@@ -89,45 +89,3 @@
   [Property opacity value 'min(0, 0.5)']
     expected: FAIL
 
-  [calc(min(0.1, 0.2) + 0.05) should be used-value-equivalent to 0.15]
-    expected: FAIL
-
-  [min(0.2, max(0.1, 0.15)) should be used-value-equivalent to 0.15]
-    expected: FAIL
-
-  [calc(min(0.1, 0.2) + max(0.1, 0.05)) should be used-value-equivalent to 0.2]
-    expected: FAIL
-
-  [calc(max(0.1, 0.2) + 0.05) should be used-value-equivalent to 0.25]
-    expected: FAIL
-
-  [calc(max(0.1, 0.2) - 0.05) should be used-value-equivalent to 0.15]
-    expected: FAIL
-
-  [max(0.1, min(0.2, 0.15)) should be used-value-equivalent to 0.15]
-    expected: FAIL
-
-  [max(1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [calc(max(0.1, 0.2) * 2) should be used-value-equivalent to 0.4]
-    expected: FAIL
-
-  [min(1) should be used-value-equivalent to 1]
-    expected: FAIL
-
-  [calc(min(0.1, 0.2) / 2) should be used-value-equivalent to 0.05]
-    expected: FAIL
-
-  [calc(min(0.1, 0.2) * 2) should be used-value-equivalent to 0.2]
-    expected: FAIL
-
-  [calc(max(0.1, 0.2) / 2) should be used-value-equivalent to 0.1]
-    expected: FAIL
-
-  [calc(min(0.1, 0.2) - max(0.1, 0.05)) should be used-value-equivalent to 0]
-    expected: FAIL
-
-  [calc(min(0.1, 0.2) - 0.05) should be used-value-equivalent to 0.05]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-number-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-number-serialize.html.ini
index 11391cdf13b..0acf897cf7c 100644
--- a/tests/wpt/metadata/css/css-values/minmax-number-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-number-serialize.html.ini
@@ -35,123 +35,33 @@
   [e.style['opacity'\] = "calc(1 + min(1))" should set the property value]
     expected: FAIL
 
-  ['min(.3, .2, .1)' as a computed value should serialize as '0.1'.]
-    expected: FAIL
-
   ['scale(min(.1))' as a computed value should serialize as 'matrix(0.1, 0, 0, 0.1, 0, 0)'.]
     expected: FAIL
 
   ['scale(min(.3, .2, .1))' as a computed value should serialize as 'matrix(0.1, 0, 0, 0.1, 0, 0)'.]
     expected: FAIL
 
-  ['calc(.1 + min(.1))' as a specified value should serialize as 'calc(0.2)'.]
-    expected: FAIL
-
   ['scale(calc(max(.1) + max(.2)))' as a computed value should serialize as 'matrix(0.3, 0, 0, 0.3, 0, 0)'.]
     expected: FAIL
 
-  ['max(.1, .2, .3)' as a specified value should serialize as 'calc(0.3)'.]
-    expected: FAIL
-
-  ['min(.1, .2, .3)' as a computed value should serialize as '0.1'.]
-    expected: FAIL
-
-  ['min(.3, .2, .1)' as a specified value should serialize as 'calc(0.1)'.]
-    expected: FAIL
-
-  ['calc(max(.1) + max(.2))' as a specified value should serialize as 'calc(0.3)'.]
-    expected: FAIL
-
-  ['scale(min(.1, .2, .3))' as a specified value should serialize as 'scale(calc(0.1))'.]
-    expected: FAIL
-
-  ['calc(max(.1) + max(.2))' as a computed value should serialize as '0.3'.]
-    expected: FAIL
-
-  ['max(.3, .2, .1)' as a specified value should serialize as 'calc(0.3)'.]
-    expected: FAIL
-
-  ['min(.1)' as a specified value should serialize as 'calc(0.1)'.]
-    expected: FAIL
-
   ['scale(max(.3, .2, .1))' as a computed value should serialize as 'matrix(0.3, 0, 0, 0.3, 0, 0)'.]
     expected: FAIL
 
-  ['min(.1, .2, .3)' as a specified value should serialize as 'calc(0.1)'.]
-    expected: FAIL
-
-  ['min(.1)' as a computed value should serialize as '0.1'.]
-    expected: FAIL
-
-  ['scale(calc(max(.1) + max(.2)))' as a specified value should serialize as 'scale(calc(0.3))'.]
-    expected: FAIL
-
   ['scale(max(.1))' as a computed value should serialize as 'matrix(0.1, 0, 0, 0.1, 0, 0)'.]
     expected: FAIL
 
-  ['scale(max(.1, .2, .3))' as a specified value should serialize as 'scale(calc(0.3))'.]
-    expected: FAIL
-
-  ['scale(min(.3, .2, .1))' as a specified value should serialize as 'scale(calc(0.1))'.]
-    expected: FAIL
-
   ['scale(max(.1, .2, .3))' as a computed value should serialize as 'matrix(0.3, 0, 0, 0.3, 0, 0)'.]
     expected: FAIL
 
-  ['scale(calc(max(.1) + .1))' as a specified value should serialize as 'scale(calc(0.2))'.]
-    expected: FAIL
-
   ['scale(min(.1, .2, .3))' as a computed value should serialize as 'matrix(0.1, 0, 0, 0.1, 0, 0)'.]
     expected: FAIL
 
-  ['scale(calc(min(.1) + min(.2)))' as a specified value should serialize as 'scale(calc(0.3))'.]
-    expected: FAIL
-
-  ['scale(max(.3, .2, .1))' as a specified value should serialize as 'scale(calc(0.3))'.]
-    expected: FAIL
-
-  ['scale(min(.1))' as a specified value should serialize as 'scale(calc(0.1))'.]
-    expected: FAIL
-
-  ['calc(max(.1) + .1)' as a specified value should serialize as 'calc(0.2)'.]
-    expected: FAIL
-
-  ['max(.3, .2, .1)' as a computed value should serialize as '0.3'.]
-    expected: FAIL
-
-  ['calc(min(.1) + min(.2))' as a specified value should serialize as 'calc(0.3)'.]
-    expected: FAIL
-
-  ['max(.1)' as a specified value should serialize as 'calc(0.1)'.]
-    expected: FAIL
-
-  ['scale(max(.1))' as a specified value should serialize as 'scale(calc(0.1))'.]
-    expected: FAIL
-
-  ['calc(min(.1) + min(.2))' as a computed value should serialize as '0.3'.]
-    expected: FAIL
-
-  ['max(.1)' as a computed value should serialize as '0.1'.]
-    expected: FAIL
-
-  ['calc(.1 + min(.1))' as a computed value should serialize as '0.2'.]
-    expected: FAIL
-
-  ['calc(max(.1) + .1)' as a computed value should serialize as '0.2'.]
-    expected: FAIL
-
   ['scale(calc(.1 + min(.1)))' as a computed value should serialize as 'matrix(0.2, 0, 0, 0.2, 0, 0)'.]
     expected: FAIL
 
   ['scale(calc(max(.1) + .1))' as a computed value should serialize as 'matrix(0.2, 0, 0, 0.2, 0, 0)'.]
     expected: FAIL
 
-  ['max(.1, .2, .3)' as a computed value should serialize as '0.3'.]
-    expected: FAIL
-
   ['scale(calc(min(.1) + min(.2)))' as a computed value should serialize as 'matrix(0.3, 0, 0, 0.3, 0, 0)'.]
     expected: FAIL
 
-  ['scale(calc(.1 + min(.1)))' as a specified value should serialize as 'scale(calc(0.2))'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-percentage-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-percentage-computed.html.ini
index 6610c4f3ae9..320e92be7f9 100644
--- a/tests/wpt/metadata/css/css-values/minmax-percentage-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-percentage-computed.html.ini
@@ -83,42 +83,3 @@
   [Property margin-left value 'calc(min(10%, 20%) + max(10%, 5%))']
     expected: FAIL
 
-  [calc(min(10%, 20%) - 5%) should be used-value-equivalent to 5%]
-    expected: FAIL
-
-  [calc(max(10%, 20%) + 5%) should be used-value-equivalent to 25%]
-    expected: FAIL
-
-  [max(10%, min(20%, 15%)) should be used-value-equivalent to 15%]
-    expected: FAIL
-
-  [min(20%, max(10%, 15%)) should be used-value-equivalent to 15%]
-    expected: FAIL
-
-  [calc(min(10%, 20%) + 5%) should be used-value-equivalent to 15%]
-    expected: FAIL
-
-  [calc(min(10%, 20%) * 2) should be used-value-equivalent to 20%]
-    expected: FAIL
-
-  [calc(max(10%, 20%) / 2) should be used-value-equivalent to 10%]
-    expected: FAIL
-
-  [calc(max(10%, 20%) * 2) should be used-value-equivalent to 40%]
-    expected: FAIL
-
-  [min(1%) should be used-value-equivalent to 1%]
-    expected: FAIL
-
-  [calc(min(10%, 20%) + max(10%, 5%)) should be used-value-equivalent to 20%]
-    expected: FAIL
-
-  [calc(min(10%, 20%) / 2) should be used-value-equivalent to 5%]
-    expected: FAIL
-
-  [calc(max(10%, 20%) - 5%) should be used-value-equivalent to 15%]
-    expected: FAIL
-
-  [max(1%) should be used-value-equivalent to 1%]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-percentage-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-percentage-serialize.html.ini
index 403ee031818..44784275b15 100644
--- a/tests/wpt/metadata/css/css-values/minmax-percentage-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-percentage-serialize.html.ini
@@ -35,57 +35,24 @@
   [e.style['margin-left'\] = "min(3%, 2%, 1%)" should set the property value]
     expected: FAIL
 
-  ['max(1%)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
   ['max(1%, 2%, 3%)' as a computed value should serialize as 'max(1%, 2%, 3%)'.]
     expected: FAIL
 
-  ['min(1%)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
-  ['min(3%, 2%, 1%)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
   ['min(3%, 2%, 1%)' as a specified value should serialize as 'min(3%, 2%, 1%)'.]
     expected: FAIL
 
-  ['max(3%, 2%, 1%)' as a used value should serialize as '3px'.]
-    expected: FAIL
-
-  ['calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a computed value should serialize as '15%'.]
-    expected: FAIL
-
   ['max(3%, 2%, 1%)' as a specified value should serialize as 'max(3%, 2%, 1%)'.]
     expected: FAIL
 
-  ['min(1%)' as a specified value should serialize as 'calc(1%)'.]
-    expected: FAIL
-
   ['min(1%, 2%, 3%)' as a computed value should serialize as 'min(1%, 2%, 3%)'.]
     expected: FAIL
 
   ['min(1%, 2%, 3%)' as a specified value should serialize as 'min(1%, 2%, 3%)'.]
     expected: FAIL
 
-  ['min(1%)' as a computed value should serialize as '1%'.]
-    expected: FAIL
-
-  ['max(1%, 2%, 3%)' as a used value should serialize as '3px'.]
-    expected: FAIL
-
-  ['max(1%)' as a specified value should serialize as 'calc(1%)'.]
-    expected: FAIL
-
-  ['calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a specified value should serialize as 'calc(15%)'.]
-    expected: FAIL
-
   ['max(3%, 2%, 1%)' as a computed value should serialize as 'max(3%, 2%, 1%)'.]
     expected: FAIL
 
-  ['calc(min(1%, 2%) + max(3%, 4%) + 10%)' as a used value should serialize as '15px'.]
-    expected: FAIL
-
   ['min(3%, 2%, 1%)' as a computed value should serialize as 'min(3%, 2%, 1%)'.]
     expected: FAIL
 
@@ -98,9 +65,3 @@
   ['min(1%, 2%, 3%) 0px' as a computed value should serialize as 'min(1%, 2%, 3%) 0px'.]
     expected: FAIL
 
-  ['min(1%, 2%, 3%)' as a used value should serialize as '1px'.]
-    expected: FAIL
-
-  ['max(1%)' as a computed value should serialize as '1%'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-time-computed.html.ini b/tests/wpt/metadata/css/css-values/minmax-time-computed.html.ini
index 23a2912ab88..0e9738b9fad 100644
--- a/tests/wpt/metadata/css/css-values/minmax-time-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-time-computed.html.ini
@@ -131,66 +131,3 @@
   [Property transition-delay value 'calc(min(0.5s, 600ms) / 2)']
     expected: FAIL
 
-  [min(1s + 100ms, 500ms * 3) should be used-value-equivalent to 1.1s]
-    expected: FAIL
-
-  [max(1s, 2s) should be used-value-equivalent to 2s]
-    expected: FAIL
-
-  [max(1000ms, min(2000ms, 1.5s)) should be used-value-equivalent to 1.5s]
-    expected: FAIL
-
-  [calc(min(0.5s, 600ms) + max(500ms, 0.4s)) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [min(1s, 2s) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [min(1s, 1100ms) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(min(0.5s, 600ms) + 500ms) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [min(1ms) should be used-value-equivalent to 1ms]
-    expected: FAIL
-
-  [calc(min(0.5s, 600ms) / 2) should be used-value-equivalent to 0.25s]
-    expected: FAIL
-
-  [calc(max(0.5s, 400ms) + 500ms) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(min(0.5s, 600ms) * 2) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [max(0.9s, 1000ms) should be used-value-equivalent to 1000ms]
-    expected: FAIL
-
-  [min(2s, max(1s, 1500ms)) should be used-value-equivalent to 1500ms]
-    expected: FAIL
-
-  [max(1ms, 2ms) should be used-value-equivalent to 2ms]
-    expected: FAIL
-
-  [calc(max(0.5s, 400ms) / 2) should be used-value-equivalent to 0.25s]
-    expected: FAIL
-
-  [max(1ms) should be used-value-equivalent to 1ms]
-    expected: FAIL
-
-  [min(1ms, 2ms) should be used-value-equivalent to 1ms]
-    expected: FAIL
-
-  [min(1s) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(max(0.5s, 400ms) * 2) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [max(1s) should be used-value-equivalent to 1s]
-    expected: FAIL
-
-  [calc(min(1s, 2s) + max(3s, 4s) + 10s) should be used-value-equivalent to 15s]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-values/minmax-time-serialize.html.ini b/tests/wpt/metadata/css/css-values/minmax-time-serialize.html.ini
index 0f892efe5eb..6be83f82dc2 100644
--- a/tests/wpt/metadata/css/css-values/minmax-time-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/minmax-time-serialize.html.ini
@@ -59,69 +59,3 @@
   [e.style['transition-delay'\] = "min(3ms, 2ms, 1ms)" should set the property value]
     expected: FAIL
 
-  ['min(1ms)' as a specified value should serialize as 'calc(0.001s)'.]
-    expected: FAIL
-
-  ['min(900ms, 1s)' as a specified value should serialize as 'calc(0.9s)'.]
-    expected: FAIL
-
-  ['max(3s, 2s, 1s)' as a computed value should serialize as '3s'.]
-    expected: FAIL
-
-  ['max(1s)' as a specified value should serialize as 'calc(1s)'.]
-    expected: FAIL
-
-  ['min(1s, 2s, 3s)' as a computed value should serialize as '1s'.]
-    expected: FAIL
-
-  ['max(1s, 2s, 3s)' as a specified value should serialize as 'calc(3s)'.]
-    expected: FAIL
-
-  ['min(1ms)' as a computed value should serialize as '0.001s'.]
-    expected: FAIL
-
-  ['max(1ms)' as a computed value should serialize as '0.001s'.]
-    expected: FAIL
-
-  ['min(3s, 2s, 1s)' as a computed value should serialize as '1s'.]
-    expected: FAIL
-
-  ['max(1s)' as a computed value should serialize as '1s'.]
-    expected: FAIL
-
-  ['min(1s)' as a specified value should serialize as 'calc(1s)'.]
-    expected: FAIL
-
-  ['min(3s, 2s, 1s)' as a specified value should serialize as 'calc(1s)'.]
-    expected: FAIL
-
-  ['calc(min(1s, 2s) + max(3s, 4s) + 10s)' as a computed value should serialize as '15s'.]
-    expected: FAIL
-
-  ['max(1s, 2s, 3s)' as a computed value should serialize as '3s'.]
-    expected: FAIL
-
-  ['max(3s, 2s, 1s)' as a specified value should serialize as 'calc(3s)'.]
-    expected: FAIL
-
-  ['max(1ms)' as a specified value should serialize as 'calc(0.001s)'.]
-    expected: FAIL
-
-  ['min(1s, 2s, 3s)' as a specified value should serialize as 'calc(1s)'.]
-    expected: FAIL
-
-  ['min(1s)' as a computed value should serialize as '1s'.]
-    expected: FAIL
-
-  ['max(1100ms, 1s)' as a computed value should serialize as '1.1s'.]
-    expected: FAIL
-
-  ['calc(min(1s, 2s) + max(3s, 4s) + 10s)' as a specified value should serialize as 'calc(15s)'.]
-    expected: FAIL
-
-  ['max(1100ms, 1s)' as a specified value should serialize as 'calc(1.1s)'.]
-    expected: FAIL
-
-  ['min(900ms, 1s)' as a computed value should serialize as '0.9s'.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini b/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
deleted file mode 100644
index ef2b41ef6d4..00000000000
--- a/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CSSFontFaceRule.html]
-  [CSSFontFaceRule.cssText doesn't serialize with newlines]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom/cssstyledeclaration-csstext.html.ini b/tests/wpt/metadata/css/cssom/cssstyledeclaration-csstext.html.ini
index 6fb6ba40994..c6715d49f44 100644
--- a/tests/wpt/metadata/css/cssom/cssstyledeclaration-csstext.html.ini
+++ b/tests/wpt/metadata/css/cssom/cssstyledeclaration-csstext.html.ini
@@ -2,6 +2,3 @@
   [cssText on computed style declaration returns the empty string]
     expected: FAIL
 
-  [Shorthands aren't serialized if there are other properties with different logical groups in between]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/selectors/invalidation/not-001.html.ini b/tests/wpt/metadata/css/selectors/invalidation/not-001.html.ini
deleted file mode 100644
index 99d21825015..00000000000
--- a/tests/wpt/metadata/css/selectors/invalidation/not-001.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[not-001.html]
-  [precondition]
-    expected: FAIL
-
-  [Invalidation of sibling combinators in :not()]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/selectors/old-tests/css3-modsel-83.xml.ini b/tests/wpt/metadata/css/selectors/old-tests/css3-modsel-83.xml.ini
deleted file mode 100644
index 21388cd7cce..00000000000
--- a/tests/wpt/metadata/css/selectors/old-tests/css3-modsel-83.xml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[css3-modsel-83.xml]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/selectors/parsing/parse-not.html.ini b/tests/wpt/metadata/css/selectors/parsing/parse-not.html.ini
index 13cb99458c9..2f8681b0c25 100644
--- a/tests/wpt/metadata/css/selectors/parsing/parse-not.html.ini
+++ b/tests/wpt/metadata/css/selectors/parsing/parse-not.html.ini
@@ -1,31 +1,3 @@
 [parse-not.html]
-  [":not(span.a, div.b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(:not(foo))" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b ~ c)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b ~ c, .d .e)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a + .b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(:host(:not(.a)))" should be a valid selector]
-    expected: FAIL
-
   [":not(:host)" should be a valid selector]
     expected: FAIL
-
-  [":not([disabled\],[selected\])" should be a valid selector]
-    expected: FAIL
-
-  [":not([disabled\][selected\])" should be a valid selector]
-    expected: FAIL
-