Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 17:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15231 - bholley:align_self, r=upsuper

Browse source 
Remove out-of-date handling for align-self in Gecko builds.

See #15229.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15231)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-26 23:06:25 -08:00 • committed by GitHub
commit d3daad327f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/properties/properties.mako.rs
View file

@ -2019,7 +2019,11 @@ pub fn apply_declarations<'a, F, I>(viewport_size: Size2D<Au>,
} }
} }
% if "align-items" in data.longhands_by_name: // This implements an out-of-date spec. The new spec moves the handling of
// this to layout, which Gecko implements but Servo doesn't.
//
// See https://github.com/servo/servo/issues/15229
% if product == "servo" and "align-items" in data.longhands_by_name:
{ {
use computed_values::align_self::T as align_self; use computed_values::align_self::T as align_self;
use computed_values::align_items::T as align_items; use computed_values::align_items::T as align_items;
@ -2031,9 +2035,6 @@ pub fn apply_declarations<'a, F, I>(viewport_size: Size2D<Au>,
align_items::flex_start => align_self::flex_start, align_items::flex_start => align_self::flex_start,
align_items::flex_end => align_self::flex_end, align_items::flex_end => align_self::flex_end,
align_items::center => align_self::center, align_items::center => align_self::center,
% if product == "gecko":
align_items::normal => align_self::normal,
% endif
}; };
style.mutate_position().set_align_self(self_align); style.mutate_position().set_align_self(self_align);
} }