From 1716259a3a0215ba392a95f9a82e07dd235aa2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 24 Jul 2018 03:36:41 +0200
Subject: [PATCH] style: Fix servo build.

---
 .../properties/longhands/position.mako.rs     | 61 +++++++++++--------
 components/style/servo/selector_parser.rs     |  2 +-
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs
index 81cf3d3782a..957335d32b2 100644
--- a/components/style/properties/longhands/position.mako.rs
+++ b/components/style/properties/longhands/position.mako.rs
@@ -257,32 +257,41 @@ ${helpers.predefined_type(
         )}
     % else:
         // servo versions (no keyword support)
-        ${helpers.predefined_type(size,
-                                  "LengthOrPercentageOrAuto",
-                                  "computed::LengthOrPercentageOrAuto::Auto",
-                                  "parse_non_negative",
-                                  spec=spec % size,
-                                  allow_quirks=not logical,
-                                  animation_value_type="ComputedValue", logical = logical,
-                                  servo_restyle_damage = "reflow")}
-        ${helpers.predefined_type("min-%s" % size,
-                                  "LengthOrPercentage",
-                                  "computed::LengthOrPercentage::Length(computed::Length::new(0.))",
-                                  "parse_non_negative",
-                                  spec=spec % ("min-%s" % size),
-                                  animation_value_type="ComputedValue",
-                                  logical=logical,
-                                  allow_quirks=not logical,
-                                  servo_restyle_damage = "reflow")}
-        ${helpers.predefined_type("max-%s" % size,
-                                  "LengthOrPercentageOrNone",
-                                  "computed::LengthOrPercentageOrNone::None",
-                                  "parse_non_negative",
-                                  spec=spec % ("min-%s" % size),
-                                  animation_value_type="ComputedValue",
-                                  logical=logical,
-                                  allow_quirks=not logical,
-                                  servo_restyle_damage = "reflow")}
+        ${helpers.predefined_type(
+            size,
+            "LengthOrPercentageOrAuto",
+            "computed::LengthOrPercentageOrAuto::Auto",
+            "parse_non_negative",
+            spec=spec % size,
+            logical_group="size",
+            allow_quirks=not logical,
+            animation_value_type="ComputedValue", logical = logical,
+            servo_restyle_damage = "reflow",
+        )}
+        ${helpers.predefined_type(
+            "min-%s" % size,
+            "LengthOrPercentage",
+            "computed::LengthOrPercentage::Length(computed::Length::new(0.))",
+            "parse_non_negative",
+            spec=spec % ("min-%s" % size),
+            logical_group="min-size",
+            animation_value_type="ComputedValue",
+            logical=logical,
+            allow_quirks=not logical,
+            servo_restyle_damage = "reflow",
+        )}
+        ${helpers.predefined_type(
+            "max-%s" % size,
+            "LengthOrPercentageOrNone",
+            "computed::LengthOrPercentageOrNone::None",
+            "parse_non_negative",
+            spec=spec % ("max-%s" % size),
+            logical_group="max-size",
+            animation_value_type="ComputedValue",
+            logical=logical,
+            allow_quirks=not logical,
+            servo_restyle_damage = "reflow",
+        )}
     % endif
 % endfor
 
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index f1ba0698e6c..894148a1786 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -14,7 +14,7 @@ use element_state::{DocumentState, ElementState};
 use fnv::FnvHashMap;
 use invalidation::element::document_state::InvalidationMatchingData;
 use invalidation::element::element_wrapper::ElementSnapshot;
-use properties::{CascadeFlags, ComputedValues, PropertyFlags};
+use properties::{ComputedValues, PropertyFlags};
 use properties::longhands::display::computed_value::T as Display;
 use selector_parser::{AttrValue as SelectorAttrValue, PseudoElementCascadeType, SelectorParser};
 use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint};