Auto merge of #7470 - psdh:flexflow, r=pcwalton

implemented a pass-through mark_as_root for FlexFlow

Fixes #7467

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7470)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-31 18:28:14 -06:00
commit 23d1416cc2

View file

@ -312,6 +312,10 @@ impl Flow for FlexFlow {
&mut self.block_flow
}
fn mark_as_root(&mut self) {
self.block_flow.mark_as_root();
}
fn bubble_inline_sizes(&mut self) {
let _scope = layout_debug_scope!("flex::bubble_inline_sizes {:x}",
self.block_flow.base.debug_id());