Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-12 18:03:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Blockify grid items like we do flex items.

Browse source 
MozReview-Commit-ID: DysyWARAf3A
This commit is contained in:
Cameron McCormack 2016-12-06 00:42:16 -10:00
parent 7851163610
commit be3f2579c4
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1630,9 +1630,15 @@ pub fn apply_declarations<'a, F, I>(viewport_size: Size2D<Au>,
longhands::position::SpecifiedValue::absolute | longhands::position::SpecifiedValue::absolute |
longhands::position::SpecifiedValue::fixed); longhands::position::SpecifiedValue::fixed);
let floated = style.get_box().clone_float() != longhands::float::SpecifiedValue::none; let floated = style.get_box().clone_float() != longhands::float::SpecifiedValue::none;
let is_flex_item = // FIXME(heycam): We should look past any display:contents ancestors to
context.inherited_style.get_box().clone_display() == computed_values::display::T::flex; // determine if we are a flex or grid item, but we don't have access to
if positioned || floated || is_root_element || is_flex_item { // grandparent or higher style here.
let is_item = matches!(context.inherited_style.get_box().clone_display(),
% if product == "gecko":
computed_values::display::T::grid |
% endif
computed_values::display::T::flex);
if positioned || floated || is_root_element || is_item {
use computed_values::display::T; use computed_values::display::T;
let specified_display = style.get_box().clone_display(); let specified_display = style.get_box().clone_display();
@ -1663,7 +1669,7 @@ pub fn apply_declarations<'a, F, I>(viewport_size: Size2D<Au>,
let box_ = style.mutate_box(); let box_ = style.mutate_box();
box_.set_display(computed_display); box_.set_display(computed_display);
% if product == "servo": % if product == "servo":
box_.set__servo_display_for_hypothetical_box(if is_root_element || is_flex_item { box_.set__servo_display_for_hypothetical_box(if is_root_element || is_item {
computed_display computed_display
} else { } else {
specified_display specified_display