| Index: src/gpu/GrGlyph.h
|
| diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
|
| index fb998a494709eaf89c9afb128551b223ce3d79ba..55e925f09d120a06d455bdc71140be5c1ae5167c 100644
|
| --- a/src/gpu/GrGlyph.h
|
| +++ b/src/gpu/GrGlyph.h
|
| @@ -28,7 +28,7 @@
|
| kCoverage_MaskStyle,
|
| kDistance_MaskStyle
|
| };
|
| -
|
| +
|
| typedef uint32_t PackedID;
|
|
|
| GrBatchAtlas::AtlasID fID;
|
| @@ -49,7 +49,7 @@
|
| fTooLargeForAtlas = GrBatchAtlas::GlyphTooLargeForAtlas(bounds.width(), bounds.height());
|
| }
|
|
|
| - void reset() {
|
| + void free() {
|
| if (fPath) {
|
| delete fPath;
|
| fPath = nullptr;
|
| @@ -86,7 +86,7 @@
|
| static inline MaskStyle UnpackMaskStyle(PackedID packed) {
|
| return ((packed >> 20) & 1) ? kDistance_MaskStyle : kCoverage_MaskStyle;
|
| }
|
| -
|
| +
|
| static inline uint16_t UnpackID(PackedID packed) {
|
| return (uint16_t)packed;
|
| }
|
|
|