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

Fixed the inline_element_border_a reftest with incremental layout turned on.

Browse source
This commit is contained in:
Clark Gaebel 2014-10-16 19:18:45 -07:00
parent 2faf5b270f
commit 8496c056e7
6 changed files with 60 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout/block.rs
View file

@ -1842,15 +1842,7 @@ impl Flow for BlockFlow {
impl fmt::Show for BlockFlow {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(write!(f, "BlockFlow"));
if self.is_float() {
try!(write!(f, "(Float)"));
} else if self.is_root() {
try!(write!(f, "(Root)"));
} else if self.is_absolutely_positioned() {
try!(write!(f, "(Absolute)"));
}
write!(f, ": {} ({})", self.fragment, self.base)
write!(f, "{} - {:x}: frag={} ({})", self.class(), self.base.debug_id(), self.fragment, self.base)
}
}
@ -2010,6 +2002,7 @@ pub trait ISizeAndMarginsComputer {
// We also resize the block itself, to ensure that overflow is not calculated
// as the inline-size of our parent. We might be smaller and we might be larger if we
// overflow.
flow::mut_base(block).position.size.inline = inline_size + extra_inline_size_from_margin;
}