From 17d33183c26b89492ab59706eb14051d067006b9 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Fri, 4 Nov 2022 17:41:40 +0000
Subject: [PATCH] style: Fix serialization of the font-variant shorthand when
 font-variant-emoji is preffed off

Depends on D160256

Differential Revision: https://phabricator.services.mozilla.com/D160257
---
 components/style/properties/shorthands/font.mako.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/style/properties/shorthands/font.mako.rs b/components/style/properties/shorthands/font.mako.rs
index e55cdbe2fb8..bdedf348af7 100644
--- a/components/style/properties/shorthands/font.mako.rs
+++ b/components/style/properties/shorthands/font.mako.rs
@@ -418,6 +418,13 @@
                    nb_normals += 1;
                 }
             }
+        % if prop == "emoji":
+            else {
+                // The property was disabled, so we count it as 'normal' for the purpose
+                // of deciding how the shorthand can be serialized.
+                nb_normals += 1;
+            }
+        % endif
         % endfor