| Index: src/gpu/GrPathRendering.cpp
|
| diff --git a/src/gpu/GrPathRendering.cpp b/src/gpu/GrPathRendering.cpp
|
| index a3bba4bc7f2a163743d0edfb776341883a2f71b5..0287eb08aa82c1a5db5c15fd3fcf8dd65fb2c791 100644
|
| --- a/src/gpu/GrPathRendering.cpp
|
| +++ b/src/gpu/GrPathRendering.cpp
|
| @@ -14,9 +14,8 @@
|
|
|
| class GlyphGenerator : public GrPathRange::PathGenerator {
|
| public:
|
| - GlyphGenerator(const SkTypeface& typeface, const SkScalerContextEffects& effects,
|
| - const SkDescriptor& desc)
|
| - : fScalerContext(typeface.createScalerContext(effects, &desc))
|
| + GlyphGenerator(const SkTypeface& typeface, const SkDescriptor& desc)
|
| + : fScalerContext(typeface.createScalerContext(&desc))
|
| #ifdef SK_DEBUG
|
| , fDesc(desc.copy())
|
| #endif
|
| @@ -52,7 +51,6 @@
|
| };
|
|
|
| GrPathRange* GrPathRendering::createGlyphs(const SkTypeface* typeface,
|
| - const SkScalerContextEffects& effects,
|
| const SkDescriptor* desc,
|
| const GrStrokeInfo& stroke) {
|
| if (nullptr == typeface) {
|
| @@ -61,7 +59,7 @@
|
| }
|
|
|
| if (desc) {
|
| - SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, effects, *desc));
|
| + SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *desc));
|
| return this->createPathRange(generator, stroke);
|
| }
|
|
|
| @@ -78,10 +76,7 @@
|
| genericDesc->init();
|
| genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
|
| genericDesc->computeChecksum();
|
| -
|
| - // No effects, so we make a dummy struct
|
| - SkScalerContextEffects noEffects;
|
|
|
| - SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, noEffects, *genericDesc));
|
| + SkAutoTUnref<GlyphGenerator> generator(new GlyphGenerator(*typeface, *genericDesc));
|
| return this->createPathRange(generator, stroke);
|
| }
|
|
|