aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-02-06 15:26:09 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-07 15:43:45 +0000
commit2b57b7f7a7fc97db57f190b5a8ebcf68e177ee2d (patch)
tree9b50da8887f7826d7f7f83ecab7f30eaddb7d7cf /experimental
parente970d5965d041a9f67de7f49a0e27b9f1f6554a6 (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 'experimental')
-rw-r--r--experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp14
-rw-r--r--experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.h3
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,