aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkComposeShader.h
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-02-07 14:25:11 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-07 20:01:20 +0000
commit83e939bcb79790f5ae3b28c398fbcf034675a6e5 (patch)
tree40b52134dece685757f7a1c1c69aa575a82f5100 /src/core/SkComposeShader.h
parent77a7a1b57c16c97f056c1e50c03bdc954947778c (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 'src/core/SkComposeShader.h')
-rw-r--r--src/core/SkComposeShader.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/SkComposeShader.h b/src/core/SkComposeShader.h
index 7f9ff69ca8..be788af2af 100644
--- a/src/core/SkComposeShader.h
+++ b/src/core/SkComposeShader.h
@@ -45,8 +45,6 @@ public:
ComposeShaderContext(const SkComposeShader&, const ContextRec&,
SkShader::Context* contextA, SkShader::Context* contextB);
- virtual ~ComposeShaderContext();
-
void shadeSpan(int x, int y, SkPMColor[], int count) override;
private:
@@ -69,8 +67,7 @@ public:
protected:
SkComposeShader(SkReadBuffer&);
void flatten(SkWriteBuffer&) const override;
- size_t onContextSize(const ContextRec&) const override;
- Context* onCreateContext(const ContextRec&, void*) const override;
+ Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override;
private:
sk_sp<SkShader> fShaderA;