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

Make hb_font_create_sub_font() NOT make parent immutable 

We don't rely on that.  However, whenever hb_font_make_immutable()
is called, it makes its parenting chain immutable.
This commit is contained in:
Behdad Esfahbod 2015-10-02 14:21:29 +01:00
parent 980e25cad2
commit 1866e17114
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-font.cc
View File

@ -885,7 +885,6 @@ hb_font_create_sub_font (hb_font_t *parent)
if (unlikely (hb_object_is_inert (font))) if (unlikely (hb_object_is_inert (font)))
return font; return font;
hb_font_make_immutable (parent);
font->parent = hb_font_reference (parent); font->parent = hb_font_reference (parent);
font->x_scale = parent->x_scale; font->x_scale = parent->x_scale;
@ -1035,6 +1034,9 @@ hb_font_make_immutable (hb_font_t *font)
if (unlikely (hb_object_is_inert (font))) if (unlikely (hb_object_is_inert (font)))
return; return;
if (font->parent)
hb_font_make_immutable (font->parent);
font->immutable = true; font->immutable = true;
} }

21
test/api/test-font.c
View File

@ -290,9 +290,22 @@ test_fontfuncs_subclassing (void)
x = hb_font_get_glyph_h_advance (font1, 2); x = hb_font_get_glyph_h_advance (font1, 2);
g_assert_cmpint (x, ==, 0); g_assert_cmpint (x, ==, 0);
/* creating sub-font doesn't make the parent font immutable;
* making a font immutable however makes it's lineage immutable.
*/
font2 = hb_font_create_sub_font (font1);
font3 = hb_font_create_sub_font (font2);
g_assert (!hb_font_is_immutable (font1));
g_assert (!hb_font_is_immutable (font2));
g_assert (!hb_font_is_immutable (font3));
hb_font_make_immutable (font3);
g_assert (hb_font_is_immutable (font1));
g_assert (hb_font_is_immutable (font2));
g_assert (hb_font_is_immutable (font3));
hb_font_destroy (font2);
hb_font_destroy (font3);
font2 = hb_font_create_sub_font (font1); font2 = hb_font_create_sub_font (font1);
g_assert (hb_font_is_immutable (font1));
hb_font_destroy (font1); hb_font_destroy (font1);
/* setup font2 to override some funcs */ /* setup font2 to override some funcs */
@ -316,12 +329,8 @@ test_fontfuncs_subclassing (void)
x = hb_font_get_glyph_h_advance (font2, 2); x = hb_font_get_glyph_h_advance (font2, 2);
g_assert_cmpint (x, ==, 0); g_assert_cmpint (x, ==, 0);
font3 = hb_font_create_sub_font (font2);
g_assert (hb_font_is_immutable (font2));
hb_font_destroy (font2);
/* setup font3 to override scale */ /* setup font3 to override scale */
font3 = hb_font_create_sub_font (font2);
hb_font_set_scale (font3, 20, 30); hb_font_set_scale (font3, 20, 30);
x = y = 1; x = y = 1;