Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-16 03:43:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make querying layout for content boxes an infallible operation.

Browse source
This commit is contained in:
Josh Matthews 2013-09-03 18:26:39 -04:00
parent a567eb007d
commit 79444596d1
6 changed files with 74 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -372,33 +372,42 @@ impl LayoutTask {
transmute(node)
};
let response = do node.read_layout_data |layout_data| {
match (layout_data.boxes.display_list.clone(), layout_data.boxes.range) {
(Some(display_list), Some(range)) => {
let mut rect: Option<Rect<Au>> = None;
for i in range.eachi() {
rect = match rect {
Some(acc) => Some(acc.union(&display_list.get().list[i].bounds())),
None => Some(display_list.get().list[i].bounds())
fn box_for_node(node: AbstractNode<LayoutView>) -> Option<Rect<Au>> {
do node.read_layout_data |layout_data| {
match (layout_data.boxes.display_list.clone(), layout_data.boxes.range) {
(Some(display_list), Some(range)) => {
let mut rect: Option<Rect<Au>> = None;
for i in range.eachi() {
rect = match rect {
Some(acc) => {
Some(acc.union(&display_list.get().list[i].bounds()))
}
None => Some(display_list.get().list[i].bounds())
}
}
rect
}
match rect {
None => {
error!("no boxes for node");
Err(())
_ => {
let mut acc: Option<Rect<Au>> = None;
for child in node.children() {
let rect = box_for_node(child);
match rect {
None => loop,
Some(rect) => acc = match acc {
Some(acc) => Some(acc.union(&rect)),
None => Some(rect)
}
}
}
Some(rect) => Ok(ContentBoxResponse(rect))
acc
}
}
_ => {
error!("no display list present");
Err(())
}
}
};
}
reply_chan.send(response)
let rect = box_for_node(node).unwrap_or_default(Rect(Point2D(Au(0), Au(0)),
Size2D(Au(0), Au(0))));
reply_chan.send(ContentBoxResponse(rect))
}
ContentBoxesQuery(node, reply_chan) => {
// FIXME: Isolate this transmutation into a single "bridge" module.
@ -406,21 +415,30 @@ impl LayoutTask {
transmute(node)
};
let response = do node.read_layout_data |layout_data| {
match (layout_data.boxes.display_list.clone(), layout_data.boxes.range) {
(Some(display_list), Some(range)) => {
let mut boxes = ~[];
for i in range.eachi() {
boxes.push(display_list.get().list[i].bounds());
fn boxes_for_node(node: AbstractNode<LayoutView>,
boxes: ~[Rect<Au>]) -> ~[Rect<Au>] {
let boxes = Cell::new(boxes);
do node.read_layout_data |layout_data| {
let mut boxes = boxes.take();
match (layout_data.boxes.display_list.clone(), layout_data.boxes.range) {
(Some(display_list), Some(range)) => {
for i in range.eachi() {
boxes.push(display_list.get().list[i].bounds());
}
}
_ => {
for child in node.children() {
boxes = boxes_for_node(child, boxes);
}
}
Ok(ContentBoxesResponse(boxes))
}
_ => Err(()),
boxes
}
};
}
reply_chan.send(response)
let mut boxes = ~[];
boxes = boxes_for_node(node, boxes);
reply_chan.send(ContentBoxesResponse(boxes))
}
HitTestQuery(_, point, reply_chan) => {
let response = {