| Index: src/core/SkTypeface.cpp
|
| diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
|
| index 6024c81a17da9d2c2dbcbafb3b8897b8d1ebaaa6..373e78455d6ac4f049d0985f3d6704c142be24c9 100644
|
| --- a/src/core/SkTypeface.cpp
|
| +++ b/src/core/SkTypeface.cpp
|
| @@ -40,7 +40,8 @@ protected:
|
| SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { }
|
|
|
| SkStreamAsset* onOpenStream(int* ttcIndex) const override { return nullptr; }
|
| - SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override {
|
| + SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
|
| + const SkDescriptor*) const override {
|
| return nullptr;
|
| }
|
| void onFilterRec(SkScalerContextRec*) const override { }
|
| @@ -348,7 +349,7 @@ bool SkTypeface::onComputeBounds(SkRect* bounds) const {
|
| desc->init();
|
| desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
|
|
|
| - SkAutoTDelete<SkScalerContext> ctx(this->createScalerContext(desc, true));
|
| + SkAutoTDelete<SkScalerContext> ctx(this->createScalerContext({}, desc, true));
|
| if (ctx.get()) {
|
| SkPaint::FontMetrics fm;
|
| ctx->getFontMetrics(&fm);
|
|
|