Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite FlowContext's box iterator methods to compose better.

Browse source
This commit is contained in:
Brian J. Burg 2012-10-12 18:52:14 -07:00
parent cb356cbcc4
commit 7a6a1265f9
1 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/servo/layout/flow.rs
View file

@ -272,43 +272,39 @@ impl FlowContext : FlowContextMethods {
}
// Actual methods that do not require much flow-specific logic
pure fn foldl_boxes_for_node<B: Copy>(node: Node, seed: B, blk: pure fn&(a: B,@RenderBox) -> B) -> B {
pure fn foldl_all_boxes<B: Copy>(seed: B,
cb: pure fn&(a: B,@RenderBox) -> B) -> B {
match self {
RootFlow(*) => match self.root().box {
Some(box) if box.d().node == node => { blk(seed, box) },
_ => seed
},
BlockFlow(*) => match self.block().box {
Some(box) if box.d().node == node => { blk(seed, box) },
_ => seed
},
InlineFlow(*) => do self.inline().boxes.foldl(seed) |acc, box| {
// FIXME: Bad copies. foldl's accumulator should be by-value
if box.d().node == node { blk(*acc, *box) }
else { *acc }
},
RootFlow(*) => option::map_default(&self.root().box, seed, |box| { cb(seed, *box) }),
BlockFlow(*) => option::map_default(&self.block().box, seed, |box| { cb(seed, *box) }),
InlineFlow(*) => do self.inline().boxes.foldl(seed) |acc, box| { cb(*acc, *box) },
_ => fail fmt!("Don't know how to iterate node's RenderBoxes for %?", self)
}
}
pure fn iter_boxes_for_node<T>(node: Node, cb: pure fn&(@RenderBox) -> T) {
pure fn foldl_boxes_for_node<B: Copy>(node: Node, seed: B,
cb: pure fn&(a: B,@RenderBox) -> B) -> B {
do self.foldl_all_boxes(seed) |acc, box| {
if box.d().node == node { cb(acc, box) }
else { acc }
}
}
pure fn iter_all_boxes<T>(cb: pure fn&(@RenderBox) -> T) {
match self {
RootFlow(*) => match self.root().box {
Some(box) if box.d().node == node => { cb(box); },
_ => {}
},
BlockFlow(*) => match self.block().box {
Some(box) if box.d().node == node => { cb(box); },
_ => {}
},
InlineFlow(*) => {
for self.inline().boxes.each |box| {
if box.d().node == node { cb(*box); }
}
},
RootFlow(*) => do self.root().box.iter |box| { cb(*box); },
BlockFlow(*) => do self.block().box.iter |box| { cb(*box); },
InlineFlow(*) => for self.inline().boxes.each |box| { cb(*box); },
_ => fail fmt!("Don't know how to iterate node's RenderBoxes for %?", self)
}
}
pure fn iter_boxes_for_node<T>(node: Node,
cb: pure fn&(@RenderBox) -> T) {
do self.iter_all_boxes |box| {
if box.d().node == node { cb(box); }
}
}
}
/* The tree holding FlowContexts */