Index: src/core/SkGlyphCache.h |
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h |
index fd3ef66028aba7500dc3c84cf1582d813d7eaecd..9ae47c6207f281ede60c78cb4049e89e9b47cec8 100644 |
--- a/src/core/SkGlyphCache.h |
+++ b/src/core/SkGlyphCache.h |
@@ -129,7 +129,7 @@ |
If the proc() returns true, detach the cache and return it, otherwise leave it and return |
nullptr. |
*/ |
- static SkGlyphCache* VisitCache(SkTypeface*, const SkScalerContextEffects&, const SkDescriptor*, |
+ static SkGlyphCache* VisitCache(SkTypeface*, const SkDescriptor* desc, |
bool (*proc)(const SkGlyphCache*, void*), |
void* context); |
@@ -146,9 +146,8 @@ |
more than 1 strike for the same descriptor, but that will eventually get purged, and the |
win is that different thread will never block each other while a strike is being used. |
*/ |
- static SkGlyphCache* DetachCache(SkTypeface* typeface, const SkScalerContextEffects& effects, |
- const SkDescriptor* desc) { |
- return VisitCache(typeface, effects, desc, DetachProc, nullptr); |
+ static SkGlyphCache* DetachCache(SkTypeface* typeface, const SkDescriptor* desc) { |
+ return VisitCache(typeface, desc, DetachProc, nullptr); |
} |
static void Dump(); |
@@ -279,9 +278,8 @@ |
SkGlyphCache* getCache() const { return this->get(); } |
SkAutoGlyphCache(SkGlyphCache* cache) : INHERITED(cache) {} |
- SkAutoGlyphCache(SkTypeface* typeface, const SkScalerContextEffects& effects, |
- const SkDescriptor* desc) |
- : INHERITED(SkGlyphCache::DetachCache(typeface, effects, desc)) |
+ SkAutoGlyphCache(SkTypeface* typeface, const SkDescriptor* desc) |
+ : INHERITED(SkGlyphCache::DetachCache(typeface, desc)) |
{} |
/** deprecated: always enables fake gamma */ |
SkAutoGlyphCache(const SkPaint& paint, |