Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not preserve suppress flag on second half of split

Browse source
This commit is contained in:
Manish Goregaokar 2018-01-24 14:31:07 +05:30
parent f3c81fcda8
commit fc97f0b464
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/fragment.rs
View file

@ -717,13 +717,15 @@ impl Fragment {
}
/// Transforms this fragment using the given `SplitInfo`, preserving all the other data.
pub fn transform_with_split_info(&self, split: &SplitInfo, text_run: Arc<TextRun>)
-> Fragment {
///
/// If this is the first half of a split, `first` is true
pub fn transform_with_split_info(&self, split: &SplitInfo, text_run: Arc<TextRun>,
first: bool) -> Fragment {
let size = LogicalSize::new(self.style.writing_mode,
split.inline_size,
self.border_box.size.block);
// Preserve the insertion point if it is in this fragment's range or it is at line end.
let (flags, insertion_point) = match self.specific {
let (mut flags, insertion_point) = match self.specific {
SpecificFragmentInfo::ScannedText(ref info) => {
match info.insertion_point {
Some(index) if split.range.contains(index) => (info.flags, info.insertion_point),
@ -734,6 +736,11 @@ impl Fragment {
},
_ => (ScannedTextFlags::empty(), None)
};
if !first {
flags.set(ScannedTextFlags::SUPPRESS_LINE_BREAK_BEFORE, false);
}
let info = Box::new(ScannedTextFragmentInfo::new(
text_run,
split.range,

4
components/layout/inline.rs
View file

@ -670,10 +670,10 @@ impl LineBreaker {
};
inline_start_fragment = split_result.inline_start.as_ref().map(|x| {
fragment.transform_with_split_info(x, split_result.text_run.clone())
fragment.transform_with_split_info(x, split_result.text_run.clone(), true)
});
inline_end_fragment = split_result.inline_end.as_ref().map(|x| {
fragment.transform_with_split_info(x, split_result.text_run.clone())
fragment.transform_with_split_info(x, split_result.text_run.clone(), false)
});
// Push the first fragment onto the line we're working on and start off the next line with