walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add dirty-state tracking to hb_face_t

This commit is contained in:
Behdad Esfahbod 2017-02-03 15:42:03 -08:00
parent 2171f48b4b
commit d3d3691806
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-face-private.hh
View File

@ -54,6 +54,13 @@ struct hb_face_t {
mutable unsigned int upem; /* Units-per-EM. */ mutable unsigned int upem; /* Units-per-EM. */
mutable unsigned int num_glyphs; /* Number of glyphs. */ mutable unsigned int num_glyphs; /* Number of glyphs. */
enum dirty_t {
NOTHING = 0x0000,
INDEX = 0x0001,
UPEM = 0x0002,
NUM_GLYPHS = 0x0004,
} dirty;
struct hb_shaper_data_t shaper_data; /* Various shaper data. */ struct hb_shaper_data_t shaper_data; /* Various shaper data. */
/* Various non-shaping data. */ /* Various non-shaping data. */
@ -99,6 +106,8 @@ struct hb_face_t {
HB_INTERNAL void load_num_glyphs (void) const; HB_INTERNAL void load_num_glyphs (void) const;
}; };
HB_MARK_AS_FLAG_T (hb_face_t::dirty_t);
extern HB_INTERNAL const hb_face_t _hb_face_nil; extern HB_INTERNAL const hb_face_t _hb_face_nil;
#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS #define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS

19
src/hb-face.cc
View File

@ -51,6 +51,8 @@ const hb_face_t _hb_face_nil = {
1000, /* upem */ 1000, /* upem */
0, /* num_glyphs */ 0, /* num_glyphs */
hb_face_t::NOTHING, /* dirty */
{ {
#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,
#include "hb-shaper-list.hh" #include "hb-shaper-list.hh"
@ -171,7 +173,7 @@ hb_face_create (hb_blob_t *blob,
closure, closure,
(hb_destroy_func_t) _hb_face_for_data_closure_destroy); (hb_destroy_func_t) _hb_face_for_data_closure_destroy);
hb_face_set_index (face, index); face->index = index;
return face; return face;
} }
@ -365,6 +367,11 @@ hb_face_set_index (hb_face_t *face,
if (face->immutable) if (face->immutable)
return; return;
if (face->index == index)
return;
face->dirty |= face->INDEX;
face->index = index; face->index = index;
} }
@ -400,6 +407,11 @@ hb_face_set_upem (hb_face_t *face,
if (face->immutable) if (face->immutable)
return; return;
if (face->upem == upem)
return;
face->dirty |= face->UPEM;
face->upem = upem; face->upem = upem;
} }
@ -444,6 +456,11 @@ hb_face_set_glyph_count (hb_face_t *face,
if (face->immutable) if (face->immutable)
return; return;
if (face->num_glyphs == glyph_count)
return;
face->dirty |= face->NUM_GLYPHS;
face->num_glyphs = glyph_count; face->num_glyphs = glyph_count;
} }

2
src/hb-font.cc
View File

@ -1196,7 +1196,7 @@ hb_font_get_empty (void)
NULL, /* user_data */ NULL, /* user_data */
NULL, /* destroy */ NULL, /* destroy */
hb_font_t::NOTHING, /* dirty_bits */ hb_font_t::NOTHING, /* dirty */
{ {
#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, #define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID,