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

Auto merge of #7711 - aopicier:root_layout, r=pcwalton

Browse source 
Use computed `display` property for hypothetical box of root element

Closes #7558.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7711)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-27 17:03:58 -06:00
commit 45a0c48efd
5 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -556,10 +556,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>
@ -6647,7 +6651,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.