Auto merge of #7588 - notriddle:master, r=pcwalton

Actually store the overflow for inline-block elements.

Fixes #7571

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7588)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-17 00:53:04 -06:00
commit 9e914ca0db
7 changed files with 72 additions and 6 deletions

View file

@ -953,10 +953,11 @@ unsafe impl Sync for BaseFlow {}
impl fmt::Debug for BaseFlow {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f,
"@ {:?}, CC {}, ADC {}",
"@ {:?}, CC {}, ADC {}, Ovr {:?}",
self.position,
self.parallel.children_count.load(Ordering::SeqCst),
self.abs_descendants.len())
self.abs_descendants.len(),
self.overflow)
}
}