diff options
author | Herb Derby <herb@google.com> | 2017-01-13 17:34:33 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-16 17:01:57 +0000 |
commit | ac04fef619ad3939a25e66bdaef6f6b1e7f5ca50 (patch) | |
tree | d30efcbac91ac1a4b434d910a64487e70efbde0d /include/core/SkColorFilter.h | |
parent | 26e73c057755df4fbffeee372be98e430867034d (diff) |
Remove SkFallbackAlloc and SkFixedAlloc.
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN;skia.primary:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN
TBR=reed@google.com
Change-Id: I1000dc9ed8ad65b249798759d9af99f47fc237d2
Reviewed-on: https://skia-review.googlesource.com/6809
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'include/core/SkColorFilter.h')
-rw-r--r-- | include/core/SkColorFilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index fd3ccbc72a..a59308774f 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -15,9 +15,9 @@ class GrContext; class GrFragmentProcessor; +class SkArenaAlloc; class SkBitmap; class SkColorSpace; -class SkFallbackAlloc; class SkRasterPipeline; /** @@ -73,7 +73,7 @@ public: virtual void filterSpan4f(const SkPM4f src[], int count, SkPM4f result[]) const; - bool appendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*, + bool appendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, bool shaderIsOpaque) const; enum Flags { @@ -160,7 +160,7 @@ public: protected: SkColorFilter() {} - virtual bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*, + virtual bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, bool shaderIsOpaque) const; private: |