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

layout: Use a flag to record whether we need to perform a line break if

Browse source 
wrapping on newlines rather than searching for a newline character.

Since the newline character might have been stripped out during
whitespace stripping, this was incorrect.

Fixes the "jumpiness" seen on the Google home page, Wikipedia, and many
other places.
This commit is contained in:
Patrick Walton 2015-04-23 14:12:22 -07:00
parent 3d6d102fd1
commit 8741d9e8c4
3 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/layout/text.rs
View file

@ -26,7 +26,7 @@ use style::properties::style_structs::Font as FontStyle;
use util::geometry::Au;
use util::linked_list::split_off_head;
use util::logical_geometry::{LogicalSize, WritingMode};
use util::range::Range;
use util::range::{Range, RangeIndex};
use util::smallvec::{SmallVec, SmallVec1};
/// A stack-allocated object for scanning an inline flow into `TextRun`-containing `TextFragment`s.
@ -193,16 +193,25 @@ impl TextRunScanner {
debug!("TextRunScanner: pushing {} fragment(s)", self.clump.len());
for (logical_offset, old_fragment) in
mem::replace(&mut self.clump, LinkedList::new()).into_iter().enumerate() {
let range = *new_ranges.get(logical_offset);
let mut range = *new_ranges.get(logical_offset);
if range.is_empty() {
debug!("Elided an `SpecificFragmentInfo::UnscannedText` because it was \
zero-length after compression");
continue
}
let requires_line_break_afterward_if_wrapping_on_newlines =
run.text.char_at_reverse(range.end().get() as usize) == '\n';
if requires_line_break_afterward_if_wrapping_on_newlines {
range.extend_by(CharIndex(-1))
}
let text_size = old_fragment.border_box.size;
let mut new_text_fragment_info =
box ScannedTextFragmentInfo::new(run.clone(), range, text_size);
let mut new_text_fragment_info = box ScannedTextFragmentInfo::new(
run.clone(),
range,
text_size,
requires_line_break_afterward_if_wrapping_on_newlines);
let new_metrics = new_text_fragment_info.run.metrics_for_range(&range);
let bounding_box_size = bounding_box_for_run_metrics(&new_metrics,
old_fragment.style.writing_mode);