Enforce 16byte alignment in shader contexts (patchset #1 id:1 of https://codereview.chromium.org/17…

src/core/SkColorShader.h

Index: src/core/SkColorShader.h
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index 6e4e42ad95479a2eb0daffdad7e5857676158426..985ab201cdd38354bcb0dc827ced659aa2757736 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -26,10 +26,6 @@ public:
 
     bool isOpaque() const override;
 
-    size_t contextSize(const ContextRec&) const override {
-        return sizeof(ColorShaderContext);
-    }
-
     class ColorShaderContext : public SkShader::Context {
     public:
         ColorShaderContext(const SkColorShader& shader, const ContextRec&);
@@ -61,6 +57,9 @@ protected:
     SkColorShader(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     Context* onCreateContext(const ContextRec&, void* storage) const override;
+    size_t onContextSize(const ContextRec&) const override {
+        return SkAlign16(sizeof(ColorShaderContext));
+    }
     bool onAsLuminanceColor(SkColor* lum) const override {
         *lum = fColor;
         return true;