| Index: src/gpu/text/GrFontScaler.h
|
| diff --git a/src/gpu/text/GrFontScaler.h b/src/gpu/text/GrFontScaler.h
|
| index e42c7a1da007f866592b9970d0769bbe57759f86..f6b67706e39ba41a16646bcbbba16585aa264e4b 100644
|
| --- a/src/gpu/text/GrFontScaler.h
|
| +++ b/src/gpu/text/GrFontScaler.h
|
| @@ -17,37 +17,37 @@ class SkGlyph;
|
| class SkPath;
|
|
|
| /*
|
| - * Wrapper class to turn a font cache descriptor into a key
|
| + * Wrapper class to turn a font cache descriptor into a key
|
| * for GrFontScaler-related lookups
|
| */
|
| class GrFontDescKey : public SkRefCnt {
|
| public:
|
| explicit GrFontDescKey(const SkDescriptor& desc) : fDesc(desc), fHash(desc.getChecksum()) {}
|
| -
|
| +
|
| uint32_t getHash() const { return fHash; }
|
|
|
| bool operator==(const GrFontDescKey& rh) const {
|
| return fHash == rh.fHash && fDesc.getDesc()->equals(*rh.fDesc.getDesc());
|
| }
|
| -
|
| +
|
| private:
|
| SkAutoDescriptor fDesc;
|
| uint32_t fHash;
|
| -
|
| +
|
| typedef SkRefCnt INHERITED;
|
| };
|
|
|
| /*
|
| * This is Gr's interface to the host platform's font scaler.
|
| *
|
| - * The client is responsible for instantiating this. The instance is created
|
| + * The client is responsible for instantiating this. The instance is created
|
| * for a specific font+size+matrix.
|
| */
|
| class GrFontScaler : public SkRefCnt {
|
| public:
|
| explicit GrFontScaler(SkGlyphCache* strike);
|
| virtual ~GrFontScaler();
|
| -
|
| +
|
| const GrFontDescKey* getKey();
|
| GrMaskFormat getMaskFormat() const;
|
| GrMaskFormat getPackedGlyphMaskFormat(const SkGlyph&) const;
|
| @@ -58,11 +58,11 @@ public:
|
| bool getPackedGlyphDFImage(const SkGlyph&, int width, int height, void* image);
|
| const SkPath* getGlyphPath(const SkGlyph&);
|
| const SkGlyph& grToSkGlyph(GrGlyph::PackedID);
|
| -
|
| +
|
| private:
|
| SkGlyphCache* fStrike;
|
| GrFontDescKey* fKey;
|
| -
|
| +
|
| typedef SkRefCnt INHERITED;
|
| };
|
|
|
|
|