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/core/SkPM4fPriv.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 'src/core/SkPM4fPriv.h')
| -rw-r--r-- | src/core/SkPM4fPriv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h index 26d8b7d4e0..dd0e550b32 100644 --- a/src/core/SkPM4fPriv.h +++ b/src/core/SkPM4fPriv.h @@ -11,7 +11,7 @@ #include "SkColorPriv.h" #include "SkColorSpace.h" #include "SkColorSpace_Base.h" -#include "SkFixedAlloc.h" +#include "SkArenaAlloc.h" #include "SkPM4f.h" #include "SkRasterPipeline.h" #include "SkSRGB.h" @@ -130,7 +130,7 @@ static inline bool append_gamut_transform(SkRasterPipeline* p, float scratch_mat return true; } -static inline bool append_gamut_transform(SkRasterPipeline* p, SkFallbackAlloc* scratch, +static inline bool append_gamut_transform(SkRasterPipeline* p, SkArenaAlloc* scratch, SkColorSpace* src, SkColorSpace* dst) { struct matrix_3x4 { float arr[12]; }; return append_gamut_transform(p, scratch->make<matrix_3x4>()->arr, src, dst); |