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

Do a little less copying in TextRun.split

Browse source
This commit is contained in:
Brian Anderson 2012-09-15 16:31:38 -07:00
parent d2da516ec0
commit 4e3e5a879d
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rust-mozjs

@ -1 +1 @@
Subproject commit e2b17f323b0ab2d6a2d806d114bd1e61f3b1ba50 Subproject commit de66662c301b2c00dacabdf0d82adf22d16232b4

18
src/servo/text/text_run.rs
View file

@ -30,18 +30,18 @@ impl TextRun {
let mut curr_run = ~""; let mut curr_run = ~"";
for iter_indivisible_slices(font, self.text) |slice| { for iter_indivisible_slices(font, self.text) |slice| {
let mut candidate = curr_run; let mut candidate = copy curr_run;
if candidate.is_not_empty() { if candidate.is_not_empty() {
candidate += " "; // FIXME: just inserting spaces between words can't be right str::push_str(candidate, " "); // FIXME: just inserting spaces between words can't be right
} }
candidate += slice; str::push_str(candidate, slice);
let glyphs = shape_text(font, candidate); let glyphs = shape_text(font, candidate);
let size = glyph_run_size(glyphs); let size = glyph_run_size(glyphs);
if size.width <= h_offset { if size.width <= h_offset {
curr_run = candidate; curr_run = move candidate;
} else { } else {
break; break;
} }
@ -50,8 +50,14 @@ impl TextRun {
assert curr_run.is_not_empty(); assert curr_run.is_not_empty();
let first = move curr_run; let first = move curr_run;
let second = str::slice(self.text, first.len(), self.text.len()); let second_start = match str::find_from(self.text, first.len(), |c| !char::is_whitespace(c)) {
let second = second.trim_left(); Some(idx) => idx,
None => {
// This will be an empty string
self.text.len()
}
};
let second = str::slice(self.text, second_start, self.text.len());
return (TextRun(font, first), TextRun(font, second)); return (TextRun(font, first), TextRun(font, second));
} }
} }