| Index: third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh
|
| index 64829ac784c17c7a1c3094b9354aea0df79b318d..6c7bac098b4ba265602d7663007eb0054eeda2e0 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh
|
| @@ -1170,6 +1170,21 @@ struct Device
|
| inline hb_position_t get_y_delta (hb_font_t *font) const
|
| { return get_delta (font->y_ppem, font->y_scale); }
|
|
|
| + inline unsigned int get_size (void) const
|
| + {
|
| + unsigned int f = deltaFormat;
|
| + if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * USHORT::static_size;
|
| + return USHORT::static_size * (4 + ((endSize - startSize) >> (4 - f)));
|
| + }
|
| +
|
| + inline bool sanitize (hb_sanitize_context_t *c) const
|
| + {
|
| + TRACE_SANITIZE (this);
|
| + return_trace (c->check_struct (this) && c->check_range (this, this->get_size ()));
|
| + }
|
| +
|
| + private:
|
| +
|
| inline int get_delta (unsigned int ppem, int scale) const
|
| {
|
| if (!ppem) return 0;
|
| @@ -1180,8 +1195,6 @@ struct Device
|
|
|
| return (int) (pixels * (int64_t) scale / ppem);
|
| }
|
| -
|
| -
|
| inline int get_delta_pixels (unsigned int ppem_size) const
|
| {
|
| unsigned int f = deltaFormat;
|
| @@ -1205,19 +1218,6 @@ struct Device
|
| return delta;
|
| }
|
|
|
| - inline unsigned int get_size (void) const
|
| - {
|
| - unsigned int f = deltaFormat;
|
| - if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * USHORT::static_size;
|
| - return USHORT::static_size * (4 + ((endSize - startSize) >> (4 - f)));
|
| - }
|
| -
|
| - inline bool sanitize (hb_sanitize_context_t *c) const
|
| - {
|
| - TRACE_SANITIZE (this);
|
| - return_trace (c->check_struct (this) && c->check_range (this, this->get_size ()));
|
| - }
|
| -
|
| protected:
|
| USHORT startSize; /* Smallest size to correct--in ppem */
|
| USHORT endSize; /* Largest size to correct--in ppem */
|
|
|