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

auto merge of #1461 : ksh8281/servo/block_black_boxes, r=SimonSapin

Browse source 
fix for anonymous boxes.
http://www.w3.org/TR/CSS2/visuren.html#anonymous-block-level
This commit is contained in:
bors-servo 2014-01-06 17:25:30 -08:00
commit 7be2125f96
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/main/layout/box.rs
View file

@ -27,7 +27,7 @@ use std::cast;
use std::cell::Cell; use std::cell::Cell;
use std::cmp::ApproxEq; use std::cmp::ApproxEq;
use std::num::Zero; use std::num::Zero;
use style::{ComputedValues, TElement, TNode}; use style::{ComputedValues, TElement, TNode, cascade};
use style::computed_values::{LengthOrPercentage, overflow}; use style::computed_values::{LengthOrPercentage, overflow};
use style::computed_values::{border_style, clear, font_family, line_height}; use style::computed_values::{border_style, clear, font_family, line_height};
use style::computed_values::{text_align, text_decoration, vertical_align, visibility}; use style::computed_values::{text_align, text_decoration, vertical_align, visibility};
@ -228,8 +228,7 @@ impl Box {
pub fn new(node: LayoutNode, specific: SpecificBoxInfo) -> Box { pub fn new(node: LayoutNode, specific: SpecificBoxInfo) -> Box {
// Find the nearest ancestor element and take its style. (It should be either that node or // Find the nearest ancestor element and take its style. (It should be either that node or
// its immediate parent.) // its immediate parent.)
// // CSS 2.1 § 9.2.1.1,9.2.2.1 This is for non-inherited properties on anonymous boxes
// FIXME(pcwalton): This is incorrect for non-inherited properties on anonymous boxes. For
// example: // example:
// //
// <div style="border: solid"> // <div style="border: solid">
@ -239,14 +238,24 @@ impl Box {
// </div> // </div>
// //
// An anonymous block box is generated around `Bar`, but it shouldn't inherit the border. // An anonymous block box is generated around `Bar`, but it shouldn't inherit the border.
let node_style = if node.is_element() {
node.style().clone()
} else {
let mut nearest_ancestor_element = node; let mut nearest_ancestor_element = node;
while !nearest_ancestor_element.is_element() { while !nearest_ancestor_element.is_element() {
nearest_ancestor_element = node.parent_node().expect("no nearest element?!"); nearest_ancestor_element =
nearest_ancestor_element.parent_node().expect("no nearest element?!");
} }
// Anonymous box: inheriting from the ancestor with no specified declarations.
Arc::new(cascade(&[Arc::new(~[])],
Some(nearest_ancestor_element.style().get())))
};
Box { Box {
node: OpaqueNode::from_layout_node(&node), node: OpaqueNode::from_layout_node(&node),
style: (*nearest_ancestor_element.style()).clone(), style: node_style,
position: Slot::init(Au::zero_rect()), position: Slot::init(Au::zero_rect()),
border: Slot::init(Zero::zero()), border: Slot::init(Zero::zero()),
padding: Slot::init(Zero::zero()), padding: Slot::init(Zero::zero()),