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 /src/image | |
| 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 'src/image')
| -rw-r--r-- | src/image/SkImageShader.cpp | 4 | ||||
| -rw-r--r-- | src/image/SkImageShader.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/image/SkImageShader.cpp b/src/image/SkImageShader.cpp index 1417ac863e..5b79fb1d9e 100644 --- a/src/image/SkImageShader.cpp +++ b/src/image/SkImageShader.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ +#include "SkArenaAlloc.h" #include "SkBitmapController.h" #include "SkBitmapProcShader.h" #include "SkBitmapProvider.h" #include "SkColorTable.h" #include "SkEmptyShader.h" -#include "SkFixedAlloc.h" #include "SkImage_Base.h" #include "SkImageShader.h" #include "SkImageShaderContext.h" @@ -227,7 +227,7 @@ SkFlattenable::Register("SkBitmapProcShader", SkBitmapProcShader_CreateProc, kSk SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END -bool SkImageShader::onAppendStages(SkRasterPipeline* p, SkColorSpace* dst, SkFallbackAlloc* scratch, +bool SkImageShader::onAppendStages(SkRasterPipeline* p, SkColorSpace* dst, SkArenaAlloc* scratch, const SkMatrix& ctm, const SkPaint& paint) const { auto matrix = SkMatrix::Concat(ctm, this->getLocalMatrix()); if (!matrix.invert(&matrix)) { diff --git a/src/image/SkImageShader.h b/src/image/SkImageShader.h index 074ecca3a7..fa77928cf9 100644 --- a/src/image/SkImageShader.h +++ b/src/image/SkImageShader.h @@ -37,7 +37,7 @@ protected: #endif SkImage* onIsAImage(SkMatrix*, TileMode*) const override; - bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkFallbackAlloc*, + bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, const SkMatrix& ctm, const SkPaint&) const override; sk_sp<SkImage> fImage; |