Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Formatting fixes

Browse source
This commit is contained in:
Brendan Zabarauskas 2014-05-27 11:58:30 -07:00
parent 28aed0d511
commit a944e378eb
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/components/main/layout/inline.rs
View file

@ -441,13 +441,13 @@ impl LineboxScanner {
left.new_line_pos = vec!(); left.new_line_pos = vec!();
self.push_box_to_line(left); self.push_box_to_line(left);
right.map(|right| { for right in right.move_iter() {
debug!("LineboxScanner: Deferring the box to the right of the new-line \ debug!("LineboxScanner: Deferring the box to the right of the new-line \
character to the line."); character to the line.");
let mut right = split_box(right); let mut right = split_box(right);
right.new_line_pos = in_box.new_line_pos.clone(); right.new_line_pos = in_box.new_line_pos.clone();
self.work_list.push_front(right); self.work_list.push_front(right);
}); }
}, },
None => { None => {
error!("LineboxScanner: This split case makes no sense!") error!("LineboxScanner: This split case makes no sense!")
@ -509,20 +509,19 @@ impl LineboxScanner {
} }
let available_width = green_zone.width - self.pending_line.bounds.size.width; let available_width = green_zone.width - self.pending_line.bounds.size.width;
match in_box.find_split_info_for_width(CharIndex(0), available_width, line_is_empty).map( let split = in_box.find_split_info_for_width(CharIndex(0), available_width, line_is_empty);
|(left, right, run)| { match split.map(|(left, right, run)| {
// TODO(bjz): Remove box splitting // TODO(bjz): Remove box splitting
let split_box = |split: SplitInfo| { let split_box = |split: SplitInfo| {
let info = ScannedTextBoxInfo::new(run.clone(), split.range); let info = ScannedTextBoxInfo::new(run.clone(), split.range);
let specific = ScannedTextBox(info); let specific = ScannedTextBox(info);
let size = Size2D(split.width, in_box.border_box.size.height); let size = Size2D(split.width, in_box.border_box.size.height);
in_box.transform(size, specific) in_box.transform(size, specific)
}; };
(left.map(|x| { debug!("LineboxScanner: Left split {}", x); split_box(x) }), (left.map(|x| { debug!("LineboxScanner: Left split {}", x); split_box(x) }),
right.map(|x| { debug!("LineboxScanner: Right split {}", x); split_box(x) })) right.map(|x| { debug!("LineboxScanner: Right split {}", x); split_box(x) }))
} }) {
) {
None => { None => {
debug!("LineboxScanner: Tried to split unsplittable render box! Deferring to next \ debug!("LineboxScanner: Tried to split unsplittable render box! Deferring to next \
line. {}", in_box); line. {}", in_box);