Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use computed display property for hypothetical box of root element

Browse source 
The root element should never be treated as an inline element by the
flow construction.

Closes #7558.
This commit is contained in:
Philipp Hartwig 2015-09-18 23:08:10 +02:00
parent 9b939546a6
commit c2db10217c
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -554,11 +554,15 @@ pub mod longhands {
} }
#[inline] #[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) context: &computed::Context)
-> computed_value::T { -> computed_value::T {
if context.is_root_element {
computed_value
} else {
context.display context.display
} }
}
</%self:longhand> </%self:longhand>
@ -6643,7 +6647,12 @@ pub fn cascade(viewport_size: Size2D<Au>,
// The initial value of display may be changed at computed value time. // The initial value of display may be changed at computed value time.
if !seen.get_display() { if !seen.get_display() {
let box_ = Arc::make_mut(&mut style.box_); 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. // The initial value of outline width may be changed at computed value time.