aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkGlyphCache.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/SkGlyphCache.h')
-rw-r--r--src/core/SkGlyphCache.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 2f1f417250..4eb6b5bc60 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -181,11 +181,6 @@ public:
private:
friend class SkGlyphCache_Globals;
- enum MetricsType {
- kJustAdvance_MetricsType,
- kFull_MetricsType
- };
-
enum {
kHashBits = 8,
kHashCount = 1 << kHashBits,
@@ -213,15 +208,13 @@ private:
// Return the SkGlyph* associated with MakeID. The id parameter is the
// combined glyph/x/y id generated by MakeID. If it is just a glyph id
// then x and y are assumed to be zero.
- SkGlyph* lookupByPackedGlyphID(PackedGlyphID packedGlyphID, MetricsType type);
+ SkGlyph* lookupByPackedGlyphID(PackedGlyphID packedGlyphID);
// Return a SkGlyph* associated with unicode id and position x and y.
- SkGlyph* lookupByChar(SkUnichar id, MetricsType type, SkFixed x = 0, SkFixed y = 0);
+ SkGlyph* lookupByChar(SkUnichar id, SkFixed x = 0, SkFixed y = 0);
- // Return a new SkGlyph for the glyph ID and subpixel position id. Limit the amount
- // of work
- // using type.
- SkGlyph* allocateNewGlyph(PackedGlyphID packedGlyphID, MetricsType type);
+ // Return a new SkGlyph for the glyph ID and subpixel position id.
+ SkGlyph* allocateNewGlyph(PackedGlyphID packedGlyphID);
static bool DetachProc(const SkGlyphCache*, void*) { return true; }