style: Handle reversed ranges in @font-face descriptors.

Differential Revision: https://phabricator.services.mozilla.com/D10327
servo · Nov 5, 2018 · 5976956 · 5976956
1 parent 33b2514
commit 5976956
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/components/style/font_face.rs b/components/style/font_face.rs
@@ -151,10 +151,20 @@ impl_range!(FontWeightRange, AbsoluteFontWeight);
 #[allow(missing_docs)]
 pub struct ComputedFontWeightRange(f32, f32);
 
+#[inline]
+fn sort_range<T: PartialOrd>(a: T, b: T) -> (T, T) {
+    if a > b {
+        (b, a)
+    } else {
+        (a, b)
+    }
+}
+
 impl FontWeightRange {
     /// Returns a computed font-stretch range.
     pub fn compute(&self) -> ComputedFontWeightRange {
-        ComputedFontWeightRange(self.0.compute().0, self.1.compute().0)
+        let (min, max) = sort_range(self.0.compute().0, self.1.compute().0);
+        ComputedFontWeightRange(min, max)
     }
 }
 
@@ -182,7 +192,11 @@ impl FontStretchRange {
             }
         }
 
-        ComputedFontStretchRange(compute_stretch(&self.0), compute_stretch(&self.1))
+        let (min, max) = sort_range(
+            compute_stretch(&self.0),
+            compute_stretch(&self.1),
+        );
+        ComputedFontStretchRange(min, max)
     }
 }
 
@@ -258,10 +272,11 @@ impl FontStyle {
             FontStyle::Normal => ComputedFontStyleDescriptor::Normal,
             FontStyle::Italic => ComputedFontStyleDescriptor::Italic,
             FontStyle::Oblique(ref first, ref second) => {
-                ComputedFontStyleDescriptor::Oblique(
+                let (min, max) = sort_range(
                     SpecifiedFontStyle::compute_angle_degrees(first),
                     SpecifiedFontStyle::compute_angle_degrees(second),
-                )
+                );
+                ComputedFontStyleDescriptor::Oblique(min, max)
             }
         }
     }