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

Auto merge of #16258 - jdm:panic-at-the-ellipsis, r=pcwalton,stshine

Browse source 
Overwrite default RunInfo values with the first real ones encountered.

TextRunScanner::flush_clump_to_list compares the values in the RunInfo object against the ones determined from the current fragment, but these values can be arbitrary defaults that don't mean anything useful.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14783
- [X] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16258)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-12 23:09:53 -05:00 • committed by GitHub
commit 9c0d8e44a0
4 changed files with 70 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/layout/text.rs
View file

@ -234,17 +234,22 @@ impl TextRunScanner {
let flush_run = run_info.font_index != font_index ||
run_info.bidi_level != bidi_level ||
!compatible_script;
let flush_mapping = flush_run || mapping.selected != selected;
let new_mapping_needed = flush_run || mapping.selected != selected;
if flush_mapping {
mapping.flush(&mut mappings,
&mut run_info,
&**text,
compression,
text_transform,
&mut last_whitespace,
&mut start_position,
end_position);
if new_mapping_needed {
// We ignore empty mappings at the very start of a fragment.
// The run info values are uninitialized at this point so
// flushing an empty mapping is pointless.
if end_position > 0 {
mapping.flush(&mut mappings,
&mut run_info,
&**text,
compression,
text_transform,
&mut last_whitespace,
&mut start_position,
end_position);
}
if run_info.text.len() > 0 {
if flush_run {
run_info.flush(&mut run_info_list, &mut insertion_point);

25
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -1451,6 +1451,18 @@
{}
]
],
"css/ellipsis_font_panic.html": [
[
"/_mozilla/css/ellipsis_font_panic.html",
[
[
"/_mozilla/css/ellipsis_font_panic-ref.html",
"=="
]
],
{}
]
],
"css/empty_cells_a.html": [
[
"/_mozilla/css/empty_cells_a.html",
@ -7341,6 +7353,11 @@
{}
]
],
"css/ellipsis_font_panic-ref.html": [
[
{}
]
],
"css/empty_cells_ref.html": [
[
{}
@ -20942,6 +20959,14 @@
"24dfcfa8ac401233d287631e57ea64edb94883cc",
"support"
],
"css/ellipsis_font_panic-ref.html": [
"21988e7f477117e23eb0d6770eec3896bac3b4a2",
"support"
],
"css/ellipsis_font_panic.html": [
"037c81c6f2f550b6d7e415b0fc7f3d0476202b76",
"reftest"
],
"css/empty-keyframes.html": [
"366edc7d29168809b6385ce7139786a0446ba560",
"testharness"

13
tests/wpt/mozilla/tests/css/ellipsis_font_panic-ref.html Normal file
View file

@ -0,0 +1,13 @@
<!doctype html>
<meta charset="utf-8">
<title></title>
<style>
@font-face {
font-family: "Roboto";
src: url("fonts/octicons/octicons.ttf");
}
#foo {
font-family: Roboto;
}
</style>
<div id="foo">E…</div>

17
tests/wpt/mozilla/tests/css/ellipsis_font_panic.html Normal file
View file

@ -0,0 +1,17 @@
<!doctype html>
<meta charset="utf-8">
<title></title>
<link rel="match" href="ellipsis_font_panic-ref.html">
<style>
@font-face {
font-family: "Roboto";
src: url("fonts/octicons/octicons.ttf");
}
#foo {
max-width: 30px;
overflow-x: hidden;
text-overflow: ellipsis;
font-family: Roboto;
}
</style>
<div id="foo">English</div>