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

fix ContentBoxQuery

Browse source
This commit is contained in:
patrick kim 2013-11-26 11:44:16 +09:00 • committed by Youngmin Yoo
parent af80c57029
commit 9b4b414abe
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/main/layout/layout_task.rs
View file

@ -514,18 +514,19 @@ impl LayoutTask {
match *node.mutate_layout_data().ptr {
Some(ref mut layout_data) => {
let boxes = &mut layout_data.boxes;
if boxes.display_bound_list.is_none() || boxes.display_bound.is_none() {
boxes.display_bound_list = Some(~[]);
boxes.display_bound = Some(Au::zero_rect());
}
if boxes.display_bound_list.is_none() {
boxes.display_bound_list = Some(~[]);
}
match boxes.display_bound_list {
Some(ref mut list) => list.push(item.base().bounds),
None => {}
}
match boxes.display_bound {
Some(ref mut bounds) => *bounds = bounds.union(&item.base().bounds),
None => {}
if boxes.display_bound.is_none() {
boxes.display_bound = Some(item.base().bounds);
} else {
boxes.display_bound = Some(boxes.display_bound.unwrap().union(&item.base().bounds));
}
}
None => fail!("no layout data"),
@ -556,7 +557,7 @@ impl LayoutTask {
let layout_data = node.borrow_layout_data();
let boxes = &layout_data.ptr.as_ref().unwrap().boxes;
match boxes.display_bound {
Some(_) => boxes.display_bound.clone(),
Some(_) => boxes.display_bound,
_ => {
let mut acc: Option<Rect<Au>> = None;
for child in node.children() {