diff options
| author |  Herb Derby <herb@google.com> | 2017-02-07 14:25:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-07 20:01:20 +0000 |
| commit | 83e939bcb79790f5ae3b28c398fbcf034675a6e5 (patch) | |
| tree | 40b52134dece685757f7a1c1c69aa575a82f5100 /experimental | |
| parent | 77a7a1b57c16c97f056c1e50c03bdc954947778c (diff) | |
Use SkArenaAlloc in the SkAutoBlitterChoose code.
- Added default implementation of onMakeContext to support use in android.
Searches for uses:
"public SkShader" package:^chromium$ -file:^src/third_party/skia
package:^aosp.* "public SkShader" -file:external/skia -file:.*third_party/skia
package:^android$ "public SkShader" -file:external/skia -file:.*third_party/skia
... shows that no subclass overrides onCreateContext.
TBR=reed@google.com
TBR=mtklein@google.com
Change-Id: I8bd5f57a79534574e344b165d31dccee41c31767
Reviewed-on: https://skia-review.googlesource.com/8140
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp | 14 | ||||
| -rw-r--r-- | experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp index 401d3c3e2e..06589f287d 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp @@ -5,8 +5,10 @@ * found in the LICENSE file. */ -#include "SkDither.h" #include "SkPerlinNoiseShader2.h" + +#include "SkArenaAlloc.h" +#include "SkDither.h" #include "SkColorFilter.h" #include "SkReadBuffer.h" #include "SkWriteBuffer.h" @@ -569,13 +571,9 @@ SkPMColor SkPerlinNoiseShader2::PerlinNoiseShaderContext::shade( return SkPreMultiplyARGB(rgba[3], rgba[0], rgba[1], rgba[2]); } -SkShader::Context* SkPerlinNoiseShader2::onCreateContext(const ContextRec& rec, - void* storage) const { - return new (storage) PerlinNoiseShaderContext(*this, rec); -} - -size_t SkPerlinNoiseShader2::onContextSize(const ContextRec&) const { - return sizeof(PerlinNoiseShaderContext); +SkShader::Context* SkPerlinNoiseShader2::onMakeContext(const ContextRec& rec, + SkArenaAlloc* alloc) const { + return alloc->make<PerlinNoiseShaderContext>(*this, rec); } SkPerlinNoiseShader2::PerlinNoiseShaderContext::PerlinNoiseShaderContext( diff --git a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h index f1b94e1c80..1f4839c8b4 100644 --- a/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h +++ b/experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h @@ -114,8 +114,7 @@ public: protected: void flatten(SkWriteBuffer&) const override; - size_t onContextSize(const ContextRec&) const override; - Context* onCreateContext(const ContextRec&, void* storage) const override; + Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override; private: SkPerlinNoiseShader2(SkPerlinNoiseShader2::Type type, SkScalar baseFrequencyX, |