| Index: src/core/SkGlyphCache.cpp
|
| diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp
|
| index 309f494828231cd0697ec981f81afbde367f1c7f..241854eb5a6028fdf90894544e30ca52ceac1cb7 100644
|
| --- a/src/core/SkGlyphCache.cpp
|
| +++ b/src/core/SkGlyphCache.cpp
|
| @@ -508,10 +508,9 @@
|
| - call a fontscaler (which might call into the cache)
|
| */
|
| SkGlyphCache* SkGlyphCache::VisitCache(SkTypeface* typeface,
|
| - const SkScalerContextEffects& effects,
|
| - const SkDescriptor* desc,
|
| - bool (*proc)(const SkGlyphCache*, void*),
|
| - void* context) {
|
| + const SkDescriptor* desc,
|
| + bool (*proc)(const SkGlyphCache*, void*),
|
| + void* context) {
|
| if (!typeface) {
|
| typeface = SkTypeface::GetDefaultTypeface();
|
| }
|
| @@ -543,10 +542,10 @@
|
| {
|
| // pass true the first time, to notice if the scalercontext failed,
|
| // so we can try the purge.
|
| - SkScalerContext* ctx = typeface->createScalerContext(effects, desc, true);
|
| + SkScalerContext* ctx = typeface->createScalerContext(desc, true);
|
| if (!ctx) {
|
| get_globals().purgeAll();
|
| - ctx = typeface->createScalerContext(effects, desc, false);
|
| + ctx = typeface->createScalerContext(desc, false);
|
| SkASSERT(ctx);
|
| }
|
| cache = new SkGlyphCache(typeface, desc, ctx);
|
|
|