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

auto merge of #1547 : deokjinkim/servo/fix_white_space, r=metajack

Browse source 
If html has empty line, it is not handled currently.
Because pending line is empty in such case, flushing current line doesn't care empty line.
For example, below html has two empty line(line 2 and line 4)
<div>
test1

test2

</div>

To handle empty line, added empty box to pending line.
This commit is contained in:
bors-servo 2014-01-27 16:32:53 -08:00
commit d47df0812f
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/layout/box_.rs
View file

@ -1283,14 +1283,12 @@ impl Box {
let right_range = Range::new(text_box_info.range.begin() + cur_new_line_pos + 1, text_box_info.range.length() - (cur_new_line_pos + 1));
// Left box is for left text of first founded new-line character.
let left_box = if left_range.length() > 0 {
let left_box = {
let new_text_box_info = ScannedTextBoxInfo::new(text_box_info.run.clone(), left_range);
let new_metrics = new_text_box_info.run.get().metrics_for_range(&left_range);
let mut new_box = self.transform(new_metrics.bounding_box.size, ScannedTextBox(new_text_box_info));
new_box.new_line_pos = ~[];
Some(new_box)
} else {
None
};
// Right box is for right text of first founded new-line character.

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

@ -327,10 +327,7 @@ impl LineboxScanner {
(Some(left_box), None) => {
self.push_box_to_line(left_box);
}
(None, Some(right_box)) => {
self.work_list.push_front(right_box);
}
(None, None) => error!("LineboxScanner: This split case makes no sense!"),
_ => error!("LineboxScanner: This split case makes no sense!"),
}
}
_ => {}