| Index: third_party/harfbuzz-ng/src/hb-coretext.cc
|
| diff --git a/third_party/harfbuzz-ng/src/hb-coretext.cc b/third_party/harfbuzz-ng/src/hb-coretext.cc
|
| index 13ba5d94ef1d7c2eba1ae0a3c29ccf987e031a83..199751cd7309c9fa9809fcb9d030f41cc63ad7f3 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-coretext.cc
|
| +++ b/third_party/harfbuzz-ng/src/hb-coretext.cc
|
| @@ -693,7 +693,6 @@ resize_and_retry:
|
| scratch += old_scratch_used;
|
| scratch_size -= old_scratch_used;
|
| }
|
| -retry:
|
| {
|
| string_ref = CFStringCreateWithCharactersNoCopy (NULL,
|
| pchars, chars_len,
|
| @@ -1157,7 +1156,7 @@ _hb_coretext_aat_shaper_face_data_create (hb_face_t *face)
|
| }
|
| hb_blob_destroy (mort_blob);
|
|
|
| - return hb_coretext_shaper_face_data_ensure (face) ? (hb_coretext_aat_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL;
|
| + return hb_coretext_aat_shaper_face_data_ensure (face) ? (hb_coretext_aat_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL;
|
| }
|
|
|
| void
|
| @@ -1175,7 +1174,7 @@ struct hb_coretext_aat_shaper_font_data_t {};
|
| hb_coretext_aat_shaper_font_data_t *
|
| _hb_coretext_aat_shaper_font_data_create (hb_font_t *font)
|
| {
|
| - return hb_coretext_shaper_font_data_ensure (font) ? (hb_coretext_aat_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL;
|
| + return hb_coretext_aat_shaper_font_data_ensure (font) ? (hb_coretext_aat_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED : NULL;
|
| }
|
|
|
| void
|
|
|