Index: src/gpu/GrFontScaler.h |
diff --git a/src/gpu/GrFontScaler.h b/src/gpu/GrFontScaler.h |
index 54d1e3f9cca39162719cc4594a80291a2902e9dc..eb93d916ce7f699789ded9b38ec517dd4524d6b2 100644 |
--- a/src/gpu/GrFontScaler.h |
+++ b/src/gpu/GrFontScaler.h |
@@ -13,6 +13,7 @@ |
#include "SkDescriptor.h" |
+class SkGlyph; |
class SkPath; |
/* |
@@ -67,14 +68,14 @@ public: |
const GrFontDescKey* getKey(); |
GrMaskFormat getMaskFormat() const; |
- GrMaskFormat getPackedGlyphMaskFormat(GrGlyph::PackedID) const; |
- bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds); |
- bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height, |
- int rowBytes, void* image); |
- bool getPackedGlyphDFBounds(GrGlyph::PackedID, SkIRect* bounds); |
- bool getPackedGlyphDFImage(GrGlyph::PackedID, int width, int height, |
- void* image); |
- bool getGlyphPath(uint16_t glyphID, SkPath*); |
+ GrMaskFormat getPackedGlyphMaskFormat(const SkGlyph&) const; |
+ bool getPackedGlyphBounds(const SkGlyph&, SkIRect* bounds); |
+ bool getPackedGlyphImage(const SkGlyph&, int width, int height, int rowBytes, |
+ GrMaskFormat expectedMaskFormat, void* image); |
+ bool getPackedGlyphDFBounds(const SkGlyph&, SkIRect* bounds); |
+ bool getPackedGlyphDFImage(const SkGlyph&, int width, int height, void* image); |
+ const SkPath* getGlyphPath(const SkGlyph&); |
+ const SkGlyph& grToSkGlyph(GrGlyph::PackedID); |
private: |
SkGlyphCache* fStrike; |