diff options
| author |  Mike Reed <reed@google.com> | 2017-06-29 08:53:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-29 13:21:53 +0000 |
| commit | 4a0f180211dbcf5c400f797aafe6cc3ff6fc021f (patch) | |
| tree | f47233d47c8b00016e9416dc2a15fcb4cb59d3aa /src | |
| parent | bb3bf14ad1c7763a4b25ca314cd8271113ef8b34 (diff) | |
remove unused flag SK_SUPPORT_LEGACY_COLORFILTER_FILTERSPAN
Bug: skia:
Change-Id: I884f79f9a162f38365930d1ccca889fca2850557
Reviewed-on: https://skia-review.googlesource.com/21202
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkBlitter.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkBlitter_Sprite.cpp | 2 | ||||
| -rw-r--r-- | src/shaders/SkColorFilterShader.h | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index e8e2bd3953..418ac242f8 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -795,11 +795,9 @@ bool SkBlitter::UseRasterPipelineBlitter(const SkPixmap& device, const SkPaint& if (paint.getShader() && as_SB(paint.getShader())->isRasterPipelineOnly()) { return true; } -#ifndef SK_SUPPORT_LEGACY_COLORFILTER_FILTERSPAN if (paint.getColorFilter()) { return true; } -#endif #ifndef SK_SUPPORT_LEGACY_HQ_SCALER if (paint.getFilterQuality() == kHigh_SkFilterQuality) { return true; diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp index 9b1ee2946e..8d841c2caf 100644 --- a/src/core/SkBlitter_Sprite.cpp +++ b/src/core/SkBlitter_Sprite.cpp @@ -185,11 +185,9 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint, if (source.alphaType() == kUnpremul_SkAlphaType) { return nullptr; } -#ifndef SK_SUPPORT_LEGACY_COLORFILTER_FILTERSPAN if (paint.getColorFilter()) { return nullptr; } -#endif SkSpriteBlitter* blitter = nullptr; diff --git a/src/shaders/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h index b454c4f6e3..7c931543e8 100644 --- a/src/shaders/SkColorFilterShader.h +++ b/src/shaders/SkColorFilterShader.h @@ -52,10 +52,7 @@ protected: bool onAppendStages(SkRasterPipeline*, SkColorSpace* dstCS, SkArenaAlloc*, const SkMatrix&, const SkPaint&, const SkMatrix* localM) const override; bool isRasterPipelineOnly() const override { -#ifndef SK_SUPPORT_LEGACY_COLORFILTER_FILTERSPAN return true; -#endif - return as_SB(fShader)->isRasterPipelineOnly(); } private: |