layout: Make intrinsic inline sizes take the value of box-sizing into

account.
servo · Oct 26, 2016 · ce2e5dc · ce2e5dc
1 parent d222e3e
commit ce2e5dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
@@ -1176,10 +1176,11 @@ impl Fragment {
             if let Some(max) = model::specified_or_none(style.max_inline_size(), Au(0)) {
                 specified = min(specified, max)
             }
-        }
 
-        // FIXME(#2261, pcwalton): This won't work well for inlines: is this OK?
-        let surrounding_inline_size = self.surrounding_intrinsic_inline_size();
+            if self.style.get_position().box_sizing == box_sizing::T::border_box {
+                specified -= border_padding
+            }
+        }
 
         IntrinsicISizesContribution {
             content_intrinsic_sizes: IntrinsicISizes {