aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/image
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-03 13:25:25 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-03 13:25:25 -0800
commitd812fb458807245daa812adb7af0733cf5b54d96 (patch)
tree8a25dc8ae4bc984c78bb0a730b17130f5396d9cc /src/image
parente79586bf82997477b8bc95469147cd25a8e22ff0 (diff)
enforce 16byte alignment in shader contexts
Diffstat (limited to 'src/image')
-rw-r--r--src/image/SkImageShader.cpp2
-rw-r--r--src/image/SkImageShader.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/image/SkImageShader.cpp b/src/image/SkImageShader.cpp
index a07603c671..4c7ded906c 100644
--- a/src/image/SkImageShader.cpp
+++ b/src/image/SkImageShader.cpp
@@ -42,7 +42,7 @@ bool SkImageShader::isOpaque() const {
return fImage->isOpaque();
}
-size_t SkImageShader::contextSize(const ContextRec& rec) const {
+size_t SkImageShader::onContextSize(const ContextRec& rec) const {
return SkBitmapProcShader::ContextSize(rec);
}
diff --git a/src/image/SkImageShader.h b/src/image/SkImageShader.h
index d51dc5d4e4..07b938d202 100644
--- a/src/image/SkImageShader.h
+++ b/src/image/SkImageShader.h
@@ -16,7 +16,6 @@ public:
static SkShader* Create(const SkImage*, TileMode tx, TileMode ty, const SkMatrix* localMatrix);
bool isOpaque() const override;
- size_t contextSize(const ContextRec&) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader)
@@ -28,6 +27,7 @@ public:
protected:
void flatten(SkWriteBuffer&) const override;
+ size_t onContextSize(const ContextRec&) const override;
Context* onCreateContext(const ContextRec&, void* storage) const override;
SkAutoTUnref<const SkImage> fImage;