| Index: src/fonts/SkRandomScalerContext.cpp
|
| diff --git a/src/fonts/SkRandomScalerContext.cpp b/src/fonts/SkRandomScalerContext.cpp
|
| index 245052053e3d40f77413913d4bf7ff7d60e93908..c555dd2294457012f5384bfcf0a0e840554c7083 100644
|
| --- a/src/fonts/SkRandomScalerContext.cpp
|
| +++ b/src/fonts/SkRandomScalerContext.cpp
|
| @@ -13,8 +13,7 @@
|
|
|
| class SkRandomScalerContext : public SkScalerContext {
|
| public:
|
| - SkRandomScalerContext(SkRandomTypeface*, const SkScalerContextEffects&,
|
| - const SkDescriptor*, bool fFakeIt);
|
| + SkRandomScalerContext(SkRandomTypeface*, const SkDescriptor*, bool fFakeIt);
|
| virtual ~SkRandomScalerContext();
|
|
|
| protected:
|
| @@ -36,14 +35,12 @@
|
|
|
| #include "SkDescriptor.h"
|
|
|
| -SkRandomScalerContext::SkRandomScalerContext(SkRandomTypeface* face,
|
| - const SkScalerContextEffects& effects,
|
| - const SkDescriptor* desc,
|
| +SkRandomScalerContext::SkRandomScalerContext(SkRandomTypeface* face, const SkDescriptor* desc,
|
| bool fakeIt)
|
| - : SkScalerContext(face, effects, desc)
|
| + : SkScalerContext(face, desc)
|
| , fFace(face)
|
| , fFakeIt(fakeIt) {
|
| - fProxy = face->proxy()->createScalerContext(effects, desc);
|
| + fProxy = face->proxy()->createScalerContext(desc);
|
| }
|
|
|
| SkRandomScalerContext::~SkRandomScalerContext() { delete fProxy; }
|
| @@ -200,9 +197,9 @@
|
| fProxy->unref();
|
| }
|
|
|
| -SkScalerContext* SkRandomTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
|
| - const SkDescriptor* desc) const {
|
| - return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), effects, desc, fFakeIt);
|
| +SkScalerContext* SkRandomTypeface::onCreateScalerContext(
|
| + const SkDescriptor* desc) const {
|
| + return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), desc, fFakeIt);
|
| }
|
|
|
| void SkRandomTypeface::onFilterRec(SkScalerContextRec* rec) const {
|
|
|