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

auto merge of #1506 : ksh8281/servo/inline_add, r=pcwalton

Browse source 
add inline stuff & color support
it makes same result with firefox in "http://www.w3.org/Style/CSS/Test/CSS1/current/sec543.htm"
makes line-height property can inherit
This commit is contained in:
bors-servo 2014-01-22 17:13:03 -08:00
commit 6662fb0c32
8 changed files with 204 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/main/layout/inline.rs
View file

@ -640,11 +640,13 @@ impl Flow for InlineFlow {
}
}
// FIXME(ksh8281) avoid copy
let flags_info = self.base.flags_info.clone();
for kid in self.base.child_iter() {
let child_base = flow::mut_base(*kid);
child_base.position.size.width = self.base.position.size.width;
child_base.flags.set_inorder(self.base.flags.inorder());
child_base.flags.propagate_text_alignment_from_parent(self.base.flags)
child_base.flags_info.flags.set_inorder(self.base.flags_info.flags.inorder());
child_base.flags_info.propagate_text_alignment_from_parent(&flags_info)
}
// There are no child contexts, so stop here.
@ -689,7 +691,7 @@ impl Flow for InlineFlow {
let mut line_height_offset = Au::new(0);
// All lines use text alignment of the flow.
let text_align = self.base.flags.text_align();
let text_align = self.base.flags_info.flags.text_align();
// Now, go through each line and lay out the boxes inside.
for line in self.lines.mut_iter() {