diff options
author | 2014-12-01 10:23:11 -0800 | |
---|---|---|
committer | 2014-12-01 10:23:11 -0800 | |
commit | 52c293547b973f7fb5de3c83f5062b07d759ab88 (patch) | |
tree | fab64afa678274991465ddde70f44e8fdca88c2e /src/core/SkLocalMatrixShader.h | |
parent | 01d6e5f462d1d52203ee1a6660415877e4cf2dde (diff) |
Remove SK_SUPPORT_LEGACY_DEEPFLATTENING.
This was needed for pictures before v33, and we're now requiring v35+.
Will follow up with the same for skia/ext/pixel_ref_utils_unittest.cc
BUG=skia:
Review URL: https://codereview.chromium.org/769953002
Diffstat (limited to 'src/core/SkLocalMatrixShader.h')
-rw-r--r-- | src/core/SkLocalMatrixShader.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index b8e4714615..aad5668033 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; |