From 773ceda51ca120b686ba2d1aff1b6d5173143be0 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 3 Mar 2016 18:18:25 -0800 Subject: Enforce 16byte alignment in shader contexts (patchset #1 id:1 of https://codereview.chromium.org/1759653004/ )" This reverts commit e38bcaf24b00066e167e03a5ac63cf828914d747. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1763973002 TBR= Review URL: https://codereview.chromium.org/1763973002 --- src/core/SkDraw.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/SkDraw.cpp') diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index cff4252579..e9b0677c33 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -1698,8 +1698,6 @@ class SkTriColorShader : public SkShader { public: SkTriColorShader() {} - size_t contextSize(const ContextRec&) const override; - class TriColorShaderContext : public SkShader::Context { public: TriColorShaderContext(const SkTriColorShader& shader, const ContextRec&); @@ -1722,6 +1720,7 @@ public: Factory getFactory() const override { sk_throw(); return nullptr; } protected: + size_t onContextSize(const ContextRec&) const override; Context* onCreateContext(const ContextRec& rec, void* storage) const override { return new (storage) TriColorShaderContext(*this, rec); } @@ -1772,9 +1771,10 @@ SkTriColorShader::TriColorShaderContext::TriColorShaderContext(const SkTriColorS SkTriColorShader::TriColorShaderContext::~TriColorShaderContext() {} -size_t SkTriColorShader::contextSize(const ContextRec&) const { - return sizeof(TriColorShaderContext); +size_t SkTriColorShader::onContextSize(const ContextRec&) const { + return SkAlign16(sizeof(TriColorShaderContext)); } + void SkTriColorShader::TriColorShaderContext::shadeSpan(int x, int y, SkPMColor dstC[], int count) { const int alphaScale = Sk255To256(this->getPaintAlpha()); -- cgit v1.2.3