diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-07 17:28:15 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 17:28:21 +0000 |
| commit | dd8b72ae7319598cfc1024901e860c52f06e6ae1 (patch) | |
| tree | b6e94e11c082c691512f8989ae55794fa2e6b756 /src/core/SkColorShader.cpp | |
| parent | 1f2fff2544a9dc6a0f169a017d374eca9f04c6b5 (diff) | |
Revert "Use SkArenaAlloc instead of SkSmallAllocator in the SkAutoBlitterChoose code."
This reverts commit 2b57b7f7a7fc97db57f190b5a8ebcf68e177ee2d.
Reason for revert: Android compile failing
Original change's description:
> 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>
>
TBR=mtklein@chromium.org,mtklein@google.com,herb@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Id09c35377dddae0811d998b7d0c34c422325a5bc
Reviewed-on: https://skia-review.googlesource.com/8129
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/core/SkColorShader.cpp')
| -rw-r--r-- | src/core/SkColorShader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkColorShader.cpp b/src/core/SkColorShader.cpp index 32d9b430c7..ed2a26b931 100644 --- a/src/core/SkColorShader.cpp +++ b/src/core/SkColorShader.cpp @@ -31,8 +31,8 @@ uint32_t SkColorShader::ColorShaderContext::getFlags() const { return fFlags; } -SkShader::Context* SkColorShader::onMakeContext(const ContextRec& rec, SkArenaAlloc* alloc) const { - return alloc->make<ColorShaderContext>(*this, rec); +SkShader::Context* SkColorShader::onCreateContext(const ContextRec& rec, void* storage) const { + return new (storage) ColorShaderContext(*this, rec); } SkColorShader::ColorShaderContext::ColorShaderContext(const SkColorShader& shader, @@ -149,8 +149,8 @@ uint32_t SkColor4Shader::Color4Context::getFlags() const { return fFlags; } -SkShader::Context* SkColor4Shader::onMakeContext(const ContextRec& rec, SkArenaAlloc* alloc) const { - return alloc->make<Color4Context>(*this, rec); +SkShader::Context* SkColor4Shader::onCreateContext(const ContextRec& rec, void* storage) const { + return new (storage) Color4Context(*this, rec); } SkColor4Shader::Color4Context::Color4Context(const SkColor4Shader& shader, |