Dedup PrefersColorScheme type

servo · Nov 29, 2024 · 069aa9f · 069aa9f
1 parent 6ee9405
commit 069aa9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/style/gecko/media_features.rs b/style/gecko/media_features.rs
@@ -8,7 +8,7 @@ use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs;
 use crate::media_queries::{Device, MediaType};
 use crate::queries::feature::{AllowsRanges, Evaluator, FeatureFlags, QueryFeatureDescription};
-use crate::queries::values::Orientation;
+use crate::queries::values::{Orientation, PrefersColorScheme};
 use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
 use crate::values::specified::color::ForcedColors;
 use crate::values::AtomString;
@@ -191,15 +191,6 @@ enum PrefersReducedTransparency {
     Reduce,
 }
 
-/// Values for the prefers-color-scheme media feature.
-#[derive(Clone, Copy, Debug, FromPrimitive, Parse, PartialEq, ToCss)]
-#[repr(u8)]
-#[allow(missing_docs)]
-pub enum PrefersColorScheme {
-    Light,
-    Dark,
-}
-
 /// Values for the dynamic-range and video-dynamic-range media features.
 /// https://drafts.csswg.org/mediaqueries-5/#dynamic-range
 /// This implements PartialOrd so that lower values will correctly match

diff --git a/style/queries/values.rs b/style/queries/values.rs
@@ -34,3 +34,12 @@ impl Orientation {
         }
     }
 }
+
+/// Values for the prefers-color-scheme media feature.
+#[derive(Clone, Copy, Debug, FromPrimitive, Parse, PartialEq, ToCss, MallocSizeOf)]
+#[repr(u8)]
+#[allow(missing_docs)]
+pub enum PrefersColorScheme {
+    Light,
+    Dark,
+}
diff --git a/style/servo/media_queries.rs b/style/servo/media_queries.rs
@@ -9,6 +9,7 @@ use crate::context::QuirksMode;
 use crate::custom_properties::CssEnvironment;
 use crate::font_metrics::FontMetrics;
 use crate::queries::feature::{AllowsRanges, Evaluator, FeatureFlags, QueryFeatureDescription};
+use crate::queries::values::PrefersColorScheme;
 use crate::logical_geometry::WritingMode;
 use crate::media_queries::MediaType;
 use crate::properties::style_structs::Font;
@@ -362,15 +363,6 @@ fn eval_device_pixel_ratio(context: &Context) -> f32 {
     eval_resolution(context).dppx()
 }
 
-/// Values for the prefers-color-scheme media feature.
-#[derive(Clone, Copy, Debug, FromPrimitive, Parse, PartialEq, ToCss)]
-#[repr(u8)]
-#[allow(missing_docs)]
-pub enum PrefersColorScheme {
-    Light,
-    Dark,
-}
-
 fn eval_prefers_color_scheme(context: &Context, query_value: Option<PrefersColorScheme>) -> bool {
     match query_value {
         Some(v) => context.device().prefers_color_scheme == v,