Use Vec instead of SmallVec for glyphs field of ShapedRun (#30664)

This glyphs field is usually larger than 8 elements, and SmallVec is not
efficient when it cannot store the value inline.

This change also adds precise glyphs run preallocation in some places
`ShapedRun` is constructed.

Release Notes:

- N/A
This commit is contained in:
Michael Sloan
2025-05-14 07:02:38 +00:00
committed by GitHub
parent a4766e296f
commit 25cc05b45c
5 changed files with 6 additions and 7 deletions
@@ -16,7 +16,7 @@ use pathfinder_geometry::{
rect::{RectF, RectI},
vector::{Vector2F, Vector2I},
};
use smallvec::{SmallVec, smallvec};
use smallvec::SmallVec;
use std::{borrow::Cow, sync::Arc};
pub(crate) struct CosmicTextSystem(RwLock<CosmicTextSystemState>);
@@ -443,7 +443,7 @@ impl CosmicTextSystemState {
} else {
runs.push(ShapedRun {
font_id,
glyphs: smallvec![shaped_glyph],
glyphs: vec![shaped_glyph],
});
}
}
+1 -1
View File
@@ -480,7 +480,7 @@ impl MacTextSystemState {
};
let font_id = self.id_for_native_font(font);
let mut glyphs = SmallVec::new();
let mut glyphs = Vec::with_capacity(run.glyph_count().try_into().unwrap_or(0));
for ((glyph_id, position), glyph_utf16_ix) in run
.glyphs()
.iter()
@@ -5,7 +5,6 @@ use anyhow::{Result, anyhow};
use collections::HashMap;
use itertools::Itertools;
use parking_lot::{RwLock, RwLockUpgradableReadGuard};
use smallvec::SmallVec;
use windows::{
Win32::{
Foundation::*,
@@ -1089,7 +1088,7 @@ impl IDWriteTextRenderer_Impl for TextRenderer_Impl {
} else {
context.text_system.select_font(&font_struct)
};
let mut glyphs = SmallVec::new();
let mut glyphs = Vec::with_capacity(glyph_count);
for index in 0..glyph_count {
let id = GlyphId(*glyphrun.glyphIndices.add(index) as u32);
context