From c6f241b0cef6921d31b2234322da999f9ae4dfe1 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@nox.paris>
Date: Wed, 27 Nov 2019 11:02:14 +0100
Subject: [PATCH] Remove some stale servo-2020 gates

---
 components/style/properties/properties.mako.rs                | 4 +---
 .../css/CSS2/box-display/block-in-inline-relpos-001.xht.ini   | 2 +-
 .../css/CSS2/box-display/block-in-inline-relpos-002.xht.ini   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index fe4d3cceaf8..37b2319dfd6 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -1260,12 +1260,12 @@ impl LonghandId {
             LonghandId::Stroke |
             LonghandId::CaretColor |
             % endif
-            % if engine in ["gecko", "servo-2013"]:
             LonghandId::BackgroundColor |
             LonghandId::BorderTopColor |
             LonghandId::BorderRightColor |
             LonghandId::BorderBottomColor |
             LonghandId::BorderLeftColor |
+            % if engine in ["gecko", "servo-2013"]:
             LonghandId::OutlineColor |
             % endif
             LonghandId::Color
@@ -1315,14 +1315,12 @@ impl LonghandId {
             LonghandId::MozScriptLevel |
             % endif
 
-            % if engine in ["gecko", "servo-2013"]:
             // Needed to compute the first available font, in order to
             // compute font-relative units correctly.
             LonghandId::FontSize |
             LonghandId::FontWeight |
             LonghandId::FontStretch |
             LonghandId::FontStyle |
-            % endif
             LonghandId::FontFamily |
 
             // Needed to properly compute the writing mode, to resolve logical
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
index 36258eb2ff6..36bc0e014bb 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
@@ -1,2 +1,2 @@
 [block-in-inline-relpos-001.xht]
-  expected: CRASH
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
index 0151ccbabc9..7607acf73b6 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
@@ -1,2 +1,2 @@
 [block-in-inline-relpos-002.xht]
-  expected: CRASH
+  expected: FAIL