mirror of
https://github.com/harfbuzz/harfbuzz.git
synced 2025-04-04 13:05:04 +00:00
[cmap] Move cache from face to cmap accelerator
No need to use user-data for it. Fixes https://github.com/harfbuzz/harfbuzz/issues/5235
This commit is contained in:
Behdad Esfahbod
parent
7ebe6b48b6
commit
591f00a281
2 changed files with 37 additions and 70 deletions
|
|
@ -2029,6 +2029,14 @@ struct cmap
|
|||
subtable_uvs = &st->u.format14;
|
||||
}
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
cache = (cache_t *) hb_malloc (sizeof (cache_t));
|
||||
if (cache)
|
||||
new (cache) cache_t ();
|
||||
else
|
||||
return; // Such that get_glyph_funcZ remains null.
|
||||
#endif
|
||||
|
||||
this->get_glyph_data = subtable;
|
||||
#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
|
||||
if (unlikely (symbol))
|
||||
|
|
@ -2079,45 +2087,54 @@ struct cmap
|
|||
}
|
||||
}
|
||||
}
|
||||
~accelerator_t () { this->table.destroy (); }
|
||||
~accelerator_t ()
|
||||
{
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
hb_free (cache);
|
||||
#endif
|
||||
table.destroy ();
|
||||
}
|
||||
|
||||
inline bool _cached_get (hb_codepoint_t unicode,
|
||||
hb_codepoint_t *glyph,
|
||||
cache_t *cache) const
|
||||
hb_codepoint_t *glyph) const
|
||||
{
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
// cache is always non-null if we have a get_glyph_funcZ
|
||||
unsigned v;
|
||||
if (cache && cache->get (unicode, &v))
|
||||
if (cache->get (unicode, &v))
|
||||
{
|
||||
*glyph = v;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
bool ret = this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph);
|
||||
|
||||
if (cache && ret)
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
if (ret)
|
||||
cache->set (unicode, *glyph);
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool get_nominal_glyph (hb_codepoint_t unicode,
|
||||
hb_codepoint_t *glyph,
|
||||
cache_t *cache = nullptr) const
|
||||
hb_codepoint_t *glyph) const
|
||||
{
|
||||
if (unlikely (!this->get_glyph_funcZ)) return false;
|
||||
return _cached_get (unicode, glyph, cache);
|
||||
return _cached_get (unicode, glyph);
|
||||
}
|
||||
|
||||
unsigned int get_nominal_glyphs (unsigned int count,
|
||||
const hb_codepoint_t *first_unicode,
|
||||
unsigned int unicode_stride,
|
||||
hb_codepoint_t *first_glyph,
|
||||
unsigned int glyph_stride,
|
||||
cache_t *cache = nullptr) const
|
||||
unsigned int glyph_stride) const
|
||||
{
|
||||
if (unlikely (!this->get_glyph_funcZ)) return 0;
|
||||
|
||||
unsigned int done;
|
||||
for (done = 0;
|
||||
done < count && _cached_get (*first_unicode, first_glyph, cache);
|
||||
done < count && _cached_get (*first_unicode, first_glyph);
|
||||
done++)
|
||||
{
|
||||
first_unicode = &StructAtOffsetUnaligned<hb_codepoint_t> (first_unicode, unicode_stride);
|
||||
|
|
@ -2128,8 +2145,7 @@ struct cmap
|
|||
|
||||
bool get_variation_glyph (hb_codepoint_t unicode,
|
||||
hb_codepoint_t variation_selector,
|
||||
hb_codepoint_t *glyph,
|
||||
cache_t *cache = nullptr) const
|
||||
hb_codepoint_t *glyph) const
|
||||
{
|
||||
switch (this->subtable_uvs->get_glyph_variant (unicode,
|
||||
variation_selector,
|
||||
|
|
@ -2140,7 +2156,7 @@ struct cmap
|
|||
case GLYPH_VARIANT_USE_DEFAULT: break;
|
||||
}
|
||||
|
||||
return get_nominal_glyph (unicode, glyph, cache);
|
||||
return get_nominal_glyph (unicode, glyph);
|
||||
}
|
||||
|
||||
void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const
|
||||
|
|
@ -2215,6 +2231,10 @@ struct cmap
|
|||
|
||||
CmapSubtableFormat4::accelerator_t format4_accel;
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
cache_t *cache;
|
||||
#endif
|
||||
|
||||
public:
|
||||
hb_blob_ptr_t<cmap> table;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -61,23 +61,13 @@
|
|||
* never need to call these functions directly.
|
||||
**/
|
||||
|
||||
using hb_ot_font_cmap_cache_t = OT::cmap_accelerator_t::cache_t;
|
||||
static_assert (sizeof (hb_ot_font_cmap_cache_t) == 1024, "");
|
||||
using hb_ot_font_advance_cache_t = hb_cache_t<24, 16, 8, true>;
|
||||
static_assert (sizeof (hb_ot_font_advance_cache_t) == 1024, "");
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
static hb_user_data_key_t hb_ot_font_cmap_cache_user_data_key;
|
||||
#endif
|
||||
|
||||
struct hb_ot_font_t
|
||||
{
|
||||
const hb_ot_face_t *ot_face;
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
hb_ot_font_cmap_cache_t *cmap_cache;
|
||||
#endif
|
||||
|
||||
/* h_advance caching */
|
||||
mutable hb_atomic_t<int> cached_coords_serial;
|
||||
mutable hb_atomic_t<hb_ot_font_advance_cache_t *> advance_cache;
|
||||
|
|
@ -92,35 +82,6 @@ _hb_ot_font_create (hb_font_t *font)
|
|||
|
||||
ot_font->ot_face = &font->face->table;
|
||||
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
// retry:
|
||||
auto *cmap_cache = (hb_ot_font_cmap_cache_t *) hb_face_get_user_data (font->face,
|
||||
&hb_ot_font_cmap_cache_user_data_key);
|
||||
if (!cmap_cache)
|
||||
{
|
||||
cmap_cache = (hb_ot_font_cmap_cache_t *) hb_malloc (sizeof (hb_ot_font_cmap_cache_t));
|
||||
if (unlikely (!cmap_cache)) goto out;
|
||||
new (cmap_cache) hb_ot_font_cmap_cache_t ();
|
||||
if (unlikely (!hb_face_set_user_data (font->face,
|
||||
&hb_ot_font_cmap_cache_user_data_key,
|
||||
cmap_cache,
|
||||
hb_free,
|
||||
false)))
|
||||
{
|
||||
hb_free (cmap_cache);
|
||||
cmap_cache = nullptr;
|
||||
/* Normally we would retry here, but that would
|
||||
* infinite-loop if the face is the empty-face.
|
||||
* Just let it go and this font will be uncached if it
|
||||
* happened to collide with another thread creating the
|
||||
* cache at the same time. */
|
||||
// goto retry;
|
||||
}
|
||||
}
|
||||
out:
|
||||
ot_font->cmap_cache = cmap_cache;
|
||||
#endif
|
||||
|
||||
return ot_font;
|
||||
}
|
||||
|
||||
|
|
@ -144,11 +105,7 @@ hb_ot_get_nominal_glyph (hb_font_t *font HB_UNUSED,
|
|||
{
|
||||
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
|
||||
const hb_ot_face_t *ot_face = ot_font->ot_face;
|
||||
hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
cmap_cache = ot_font->cmap_cache;
|
||||
#endif
|
||||
return ot_face->cmap->get_nominal_glyph (unicode, glyph, cmap_cache);
|
||||
return ot_face->cmap->get_nominal_glyph (unicode, glyph);
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
|
|
@ -163,14 +120,9 @@ hb_ot_get_nominal_glyphs (hb_font_t *font HB_UNUSED,
|
|||
{
|
||||
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
|
||||
const hb_ot_face_t *ot_face = ot_font->ot_face;
|
||||
hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
cmap_cache = ot_font->cmap_cache;
|
||||
#endif
|
||||
return ot_face->cmap->get_nominal_glyphs (count,
|
||||
first_unicode, unicode_stride,
|
||||
first_glyph, glyph_stride,
|
||||
cmap_cache);
|
||||
first_glyph, glyph_stride);
|
||||
}
|
||||
|
||||
static hb_bool_t
|
||||
|
|
@ -183,13 +135,8 @@ hb_ot_get_variation_glyph (hb_font_t *font HB_UNUSED,
|
|||
{
|
||||
const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
|
||||
const hb_ot_face_t *ot_face = ot_font->ot_face;
|
||||
hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
|
||||
#ifndef HB_NO_OT_FONT_CMAP_CACHE
|
||||
cmap_cache = ot_font->cmap_cache;
|
||||
#endif
|
||||
return ot_face->cmap->get_variation_glyph (unicode,
|
||||
variation_selector, glyph,
|
||||
cmap_cache);
|
||||
variation_selector, glyph);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue