Remove redundant findImage, and remove glyph cache plumbing
Change-Id: I2dd8231b4159afa15604fe533f9e4cd00d20a420
Reviewed-on: https://skia-review.googlesource.com/c/174800
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/src/gpu/text/GrGlyphCache.h b/src/gpu/text/GrGlyphCache.h
index 11c8120..03789a9 100644
--- a/src/gpu/text/GrGlyphCache.h
+++ b/src/gpu/text/GrGlyphCache.h
@@ -31,11 +31,10 @@
GrTextStrike(const SkDescriptor& fontScalerKey);
~GrTextStrike();
- GrGlyph* getGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed,
- SkGlyphCache* cache) {
+ GrGlyph* getGlyph(const SkGlyph& skGlyph, GrGlyph::PackedID packed) {
GrGlyph* glyph = fCache.find(packed);
if (!glyph) {
- glyph = this->generateGlyph(skGlyph, packed, cache);
+ glyph = this->generateGlyph(skGlyph, packed);
}
return glyph;
}
@@ -53,7 +52,7 @@
// potentially little benefit(ie, if the glyph is not in our font cache, then its not
// in the atlas and we're going to be doing a texture upload anyways).
const SkGlyph& skGlyph = GrToSkGlyph(cache, packed);
- glyph = this->generateGlyph(skGlyph, packed, cache);
+ glyph = this->generateGlyph(skGlyph, packed);
glyph->fMaskFormat = expectedMaskFormat;
}
return glyph;
@@ -98,7 +97,7 @@
GrGlyph::UnpackFixedY(id));
}
- GrGlyph* generateGlyph(const SkGlyph&, GrGlyph::PackedID, SkGlyphCache*);
+ GrGlyph* generateGlyph(const SkGlyph&, GrGlyph::PackedID);
friend class GrGlyphCache;
};