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

Auto merge of #6118 - Ryman:gh5856, r=pcwalton

Browse source 
Fixes #5856 

This stops the panic, but the empty fragments tend to be non-empty if extended by `info.range_end_including_stripped_whitespace`, so I'm unsure if it's a requirement to include that instead of skipping for correctness? Perhaps there's a testcase needed for this behaviour?

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6118)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-18 16:19:34 -05:00
commit 913c5677ab
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/layout/inline.rs
View file

@ -959,14 +959,13 @@ impl InlineFlow {
let mut expansion_opportunities = 0i32; let mut expansion_opportunities = 0i32;
for fragment_index in line.range.each_index() { for fragment_index in line.range.each_index() {
let fragment = fragments.get(fragment_index.to_usize()); let fragment = fragments.get(fragment_index.to_usize());
let scanned_text_fragment_info = let scanned_text_fragment_info = match fragment.specific {
if let SpecificFragmentInfo::ScannedText(ref info) = fragment.specific { SpecificFragmentInfo::ScannedText(ref info) if !info.range.is_empty() => info,
info _ => continue
} else { };
continue let fragment_range = scanned_text_fragment_info.range;
};
for slice in scanned_text_fragment_info.run.character_slices_in_range( for slice in scanned_text_fragment_info.run.character_slices_in_range(&fragment_range) {
&scanned_text_fragment_info.range) {
expansion_opportunities += slice.glyphs.space_count_in_range(&slice.range) as i32 expansion_opportunities += slice.glyphs.space_count_in_range(&slice.range) as i32
} }
} }
@ -976,12 +975,10 @@ impl InlineFlow {
(expansion_opportunities as f64); (expansion_opportunities as f64);
for fragment_index in line.range.each_index() { for fragment_index in line.range.each_index() {
let fragment = fragments.get_mut(fragment_index.to_usize()); let fragment = fragments.get_mut(fragment_index.to_usize());
let mut scanned_text_fragment_info = let mut scanned_text_fragment_info = match fragment.specific {
if let SpecificFragmentInfo::ScannedText(ref mut info) = fragment.specific { SpecificFragmentInfo::ScannedText(ref mut info) if !info.range.is_empty() => info,
info _ => continue
} else { };
continue
};
let fragment_range = scanned_text_fragment_info.range; let fragment_range = scanned_text_fragment_info.range;
// FIXME(pcwalton): This is an awful lot of uniqueness making. I don't see any easy way // FIXME(pcwalton): This is an awful lot of uniqueness making. I don't see any easy way