From d63ce552f7b876cb1a308e812f68810e5198048a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 17 Aug 2018 01:07:22 +0000
Subject: [PATCH] style: Deduplicate system metric atoms.

Now that :-moz-system-metric is gone, there's no real reason for the atoms to
be separate.

Differential Revision: https://phabricator.services.mozilla.com/D3497
---
 components/style/gecko/media_features.rs | 48 ++++++++++++------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs
index 8a0eaf7aa63..0ff420a1612 100644
--- a/components/style/gecko/media_features.rs
+++ b/components/style/gecko/media_features.rs
@@ -401,7 +401,7 @@ fn eval_moz_touch_enabled(
     eval_system_metric(
         device,
         query_value,
-        atom!("touch-enabled"),
+        atom!("-moz-touch-enabled"),
         /* accessible_from_content = */ true,
     )
 }
@@ -424,7 +424,7 @@ fn eval_moz_os_version(
 }
 
 macro_rules! system_metric_feature {
-    ($feature_name:expr, $metric_name:expr) => {
+    ($feature_name:expr) => {
         {
             fn __eval(
                 device: &Device,
@@ -434,7 +434,7 @@ macro_rules! system_metric_feature {
                 eval_system_metric(
                     device,
                     query_value,
-                    $metric_name,
+                    $feature_name,
                     /* accessible_from_content = */ false,
                 )
             }
@@ -596,28 +596,26 @@ lazy_static! {
             Evaluator::Ident(eval_moz_os_version),
             ParsingRequirements::CHROME_AND_UA_ONLY,
         ),
-        // FIXME(emilio): make system metrics store the -moz- atom, and remove
-        // some duplication here.
-        system_metric_feature!(atom!("-moz-scrollbar-start-backward"), atom!("scrollbar-start-backward")),
-        system_metric_feature!(atom!("-moz-scrollbar-start-forward"), atom!("scrollbar-start-forward")),
-        system_metric_feature!(atom!("-moz-scrollbar-end-backward"), atom!("scrollbar-end-backward")),
-        system_metric_feature!(atom!("-moz-scrollbar-end-forward"), atom!("scrollbar-end-forward")),
-        system_metric_feature!(atom!("-moz-scrollbar-thumb-proportional"), atom!("scrollbar-thumb-proportional")),
-        system_metric_feature!(atom!("-moz-overlay-scrollbars"), atom!("overlay-scrollbars")),
-        system_metric_feature!(atom!("-moz-windows-default-theme"), atom!("windows-default-theme")),
-        system_metric_feature!(atom!("-moz-mac-graphite-theme"), atom!("mac-graphite-theme")),
-        system_metric_feature!(atom!("-moz-mac-yosemite-theme"), atom!("mac-yosemite-theme")),
-        system_metric_feature!(atom!("-moz-windows-accent-color-in-titlebar"), atom!("windows-accent-color-in-titlebar")),
-        system_metric_feature!(atom!("-moz-windows-compositor"), atom!("windows-compositor")),
-        system_metric_feature!(atom!("-moz-windows-classic"), atom!("windows-classic")),
-        system_metric_feature!(atom!("-moz-windows-glass"), atom!("windows-glass")),
-        system_metric_feature!(atom!("-moz-menubar-drag"), atom!("menubar-drag")),
-        system_metric_feature!(atom!("-moz-swipe-animation-enabled"), atom!("swipe-animation-enabled")),
-        system_metric_feature!(atom!("-moz-gtk-csd-available"), atom!("gtk-csd-available")),
-        system_metric_feature!(atom!("-moz-gtk-csd-minimize-button"), atom!("gtk-csd-minimize-button")),
-        system_metric_feature!(atom!("-moz-gtk-csd-maximize-button"), atom!("gtk-csd-maximize-button")),
-        system_metric_feature!(atom!("-moz-gtk-csd-close-button"), atom!("gtk-csd-close-button")),
-        system_metric_feature!(atom!("-moz-system-dark-theme"), atom!("system-dark-theme")),
+        system_metric_feature!(atom!("-moz-scrollbar-start-backward")),
+        system_metric_feature!(atom!("-moz-scrollbar-start-forward")),
+        system_metric_feature!(atom!("-moz-scrollbar-end-backward")),
+        system_metric_feature!(atom!("-moz-scrollbar-end-forward")),
+        system_metric_feature!(atom!("-moz-scrollbar-thumb-proportional")),
+        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-windows-accent-color-in-titlebar")),
+        system_metric_feature!(atom!("-moz-windows-compositor")),
+        system_metric_feature!(atom!("-moz-windows-classic")),
+        system_metric_feature!(atom!("-moz-windows-glass")),
+        system_metric_feature!(atom!("-moz-menubar-drag")),
+        system_metric_feature!(atom!("-moz-swipe-animation-enabled")),
+        system_metric_feature!(atom!("-moz-gtk-csd-available")),
+        system_metric_feature!(atom!("-moz-gtk-csd-minimize-button")),
+        system_metric_feature!(atom!("-moz-gtk-csd-maximize-button")),
+        system_metric_feature!(atom!("-moz-gtk-csd-close-button")),
+        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.