Skip to content

Commit

Permalink
Use computed display property for hypothetical box of root element
Browse files Browse the repository at this point in the history
The root element should never be treated as an inline element by the
flow construction.

Closes #7558.
  • Loading branch information
aopicier committed Sep 18, 2015
1 parent 9b93954 commit c2db102
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions components/style/properties.mako.rs
Expand Up @@ -554,10 +554,14 @@ pub mod longhands {
}

#[inline]
pub fn derive_from_display(_: super::display::computed_value::T,
pub fn derive_from_display(computed_value: super::display::computed_value::T,
context: &computed::Context)
-> computed_value::T {
context.display
if context.is_root_element {
computed_value
} else {
context.display
}
}

</%self:longhand>
Expand Down Expand Up @@ -6643,7 +6647,12 @@ pub fn cascade(viewport_size: Size2D<Au>,
// The initial value of display may be changed at computed value time.
if !seen.get_display() {
let box_ = Arc::make_mut(&mut style.box_);
box_.display = box_.display.to_computed_value(&context);
let computed_value = box_.display.to_computed_value(&context);
box_.display = computed_value;
box_._servo_display_for_hypothetical_box =
longhands::_servo_display_for_hypothetical_box::derive_from_display(
computed_value,
&context);
}

// The initial value of outline width may be changed at computed value time.
Expand Down

0 comments on commit c2db102

Please sign in to comment.