| Index: src/core/SkLocalMatrixShader.h
|
| diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
|
| index b8e4714615eacd830ca0efd31aba7ed082caae01..aad5668033543278d2cea4bbc6516669da2d0d0e 100644
|
| --- a/src/core/SkLocalMatrixShader.h
|
| +++ b/src/core/SkLocalMatrixShader.h
|
| @@ -33,7 +33,7 @@ public:
|
| }
|
|
|
| #if SK_SUPPORT_GPU
|
| -
|
| +
|
| virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
|
| const SkMatrix* localMatrix, GrColor* grColor,
|
| GrFragmentProcessor** fp) const SK_OVERRIDE {
|
| @@ -43,17 +43,17 @@ public:
|
| }
|
| return fProxyShader->asFragmentProcessor(context, paint, &tmp, grColor, fp);
|
| }
|
| -
|
| -#else
|
| -
|
| +
|
| +#else
|
| +
|
| virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix*, GrColor*,
|
| GrFragmentProcessor**) const SK_OVERRIDE {
|
| SkDEBUGFAIL("Should not call in GPU-less build");
|
| return false;
|
| }
|
| -
|
| +
|
| #endif
|
| -
|
| +
|
| virtual SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
|
| if (localMatrix) {
|
| *localMatrix = this->getLocalMatrix();
|
| @@ -65,9 +65,6 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
|
|
|
| protected:
|
| -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| - SkLocalMatrixShader(SkReadBuffer&);
|
| -#endif
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| virtual Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
|
|
|
|
|