Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 14:53:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cap the number of glyphs per WebRender text run to avoid overflowing WR's limit.

Browse source 
Closes #17230.
This commit is contained in:
Patrick Walton 2019-12-13 16:53:14 -08:00
parent 0103ab7698
commit 6e67349d8c
1 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/layout/display_list/builder.rs
View file

@ -124,6 +124,11 @@ static THREAD_TINT_COLORS: [ColorF; 8] = [
},
];
// An internal WebRender limit.
//
// See: https://github.com/servo/servo/issues/17230#issuecomment-564307277
const MAX_GLYPHS_PER_TEXT_RUN: usize = 2000;
pub struct InlineNodeBorderInfo {
is_first_fragment_of_element: bool,
is_last_fragment_of_element: bool,
@ -2069,19 +2074,27 @@ impl Fragment {
}
// Text
let glyphs = convert_text_run_to_glyphs(
let mut glyphs = convert_text_run_to_glyphs(
text_fragment.run.clone(),
text_fragment.range,
baseline_origin,
);
if !glyphs.is_empty() {
let indexable_text = IndexableTextItem {
origin: stacking_relative_content_box.origin,
text_run: text_fragment.run.clone(),
range: text_fragment.range,
baseline_origin,
let indexable_text = IndexableTextItem {
origin: stacking_relative_content_box.origin,
text_run: text_fragment.run.clone(),
range: text_fragment.range,
baseline_origin,
};
state.indexable_text.insert(self.node, indexable_text);
// Process glyphs in chunks to avoid overflowing WebRender's internal limits (#17230).
while !glyphs.is_empty() {
let mut rest_of_glyphs = vec![];
if glyphs.len() > MAX_GLYPHS_PER_TEXT_RUN {
rest_of_glyphs = glyphs[MAX_GLYPHS_PER_TEXT_RUN..].to_vec();
glyphs.truncate(MAX_GLYPHS_PER_TEXT_RUN);
};
state.indexable_text.insert(self.node, indexable_text);
state.add_display_item(DisplayItem::Text(CommonDisplayItem::with_data(
base.clone(),
@ -2094,6 +2107,8 @@ impl Fragment {
},
glyphs,
)));
glyphs = rest_of_glyphs;
}
// TODO(#17715): emit text-emphasis marks here.