diff options
author | 2017-02-06 15:26:09 -0500 | |
---|---|---|
committer | 2017-02-07 15:43:45 +0000 | |
commit | 2b57b7f7a7fc97db57f190b5a8ebcf68e177ee2d (patch) | |
tree | 9b50da8887f7826d7f7f83ecab7f30eaddb7d7cf /src/effects/SkPerlinNoiseShader.cpp | |
parent | e970d5965d041a9f67de7f49a0e27b9f1f6554a6 (diff) |
Use SkArenaAlloc instead of SkSmallAllocator in the SkAutoBlitterChoose code.
TBR=reed@google.com
Change-Id: Iefb044bf7657fbf982f23aa91a3f4d013ce2c626
Reviewed-on: https://skia-review.googlesource.com/7786
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/effects/SkPerlinNoiseShader.cpp')
-rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 92f2946c74..7582196573 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -6,6 +6,8 @@ */ #include "SkPerlinNoiseShader.h" + +#include "SkArenaAlloc.h" #include "SkColorFilter.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" @@ -434,13 +436,9 @@ SkPMColor SkPerlinNoiseShader::PerlinNoiseShaderContext::shade( return SkPreMultiplyARGB(rgba[3], rgba[0], rgba[1], rgba[2]); } -SkShader::Context* SkPerlinNoiseShader::onCreateContext(const ContextRec& rec, - void* storage) const { - return new (storage) PerlinNoiseShaderContext(*this, rec); -} - -size_t SkPerlinNoiseShader::onContextSize(const ContextRec&) const { - return sizeof(PerlinNoiseShaderContext); +SkShader::Context* SkPerlinNoiseShader::onMakeContext( + const ContextRec& rec, SkArenaAlloc* alloc) const { + return alloc->make<PerlinNoiseShaderContext>(*this, rec); } SkPerlinNoiseShader::PerlinNoiseShaderContext::PerlinNoiseShaderContext( |