auto merge of #597 : eric93/servo/diplaylist-refactor, r=jdm

This commit is contained in:
bors-servo 2013-07-17 17:00:42 -07:00
commit e5fc6484ce

View file

@ -241,8 +241,8 @@ impl LayoutTask {
// TODO: Set options on the builder before building. // TODO: Set options on the builder before building.
// TODO: Be smarter about what needs painting. // TODO: Be smarter about what needs painting.
for layout_root.traverse_preorder |flow| { do layout_root.partially_traverse_preorder |flow| {
flow.build_display_list(&builder, &layout_root.position(), display_list); flow.build_display_list(&builder, &layout_root.position(), display_list)
} }
let root_size = do layout_root.with_base |base| { let root_size = do layout_root.with_base |base| {
@ -349,9 +349,13 @@ impl LayoutTask {
}; };
let display_list: @Cell<DisplayList<RenderBox>> = let display_list: @Cell<DisplayList<RenderBox>> =
@Cell::new(DisplayList::new()); @Cell::new(DisplayList::new());
flow.build_display_list(&builder,
&flow.position(), do flow.partially_traverse_preorder |this_flow| {
display_list); this_flow.build_display_list(&builder,
&flow.position(),
display_list)
}
let (x, y) = (Au::from_frac_px(point.x as float), let (x, y) = (Au::from_frac_px(point.x as float),
Au::from_frac_px(point.y as float)); Au::from_frac_px(point.y as float));
let mut resp = Err(()); let mut resp = Err(());