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] 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 {