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

src/core/SkColorFilterShader.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorFilterShader.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
@@ skipping 44 matching lines @@
 SkShader::Context* SkColorFilterShader::onCreateContext(const ContextRec& rec,
                                                         void* storage) const {
     char* shaderContextStorage = (char*)storage + sizeof(FilterShaderContext);
     SkShader::Context* shaderContext = fShader->createContext(rec, shaderContextStorage);
     if (nullptr == shaderContext) {
         return nullptr;
     }
     return new (storage) FilterShaderContext(*this, shaderContext, rec);
 }
 
-size_t SkColorFilterShader::contextSize(const ContextRec& rec) const {
-    return sizeof(FilterShaderContext) + fShader->contextSize(rec);
+size_t SkColorFilterShader::onContextSize(const ContextRec& rec) const {
+    return SkAlign16(sizeof(FilterShaderContext)) + fShader->contextSize(rec);
 }
 
 SkColorFilterShader::FilterShaderContext::FilterShaderContext(
                                                          const SkColorFilterShader& filterShader,
                                                          SkShader::Context* shaderContext,
                                                          const ContextRec& rec)
     : INHERITED(filterShader, rec)
     , fShaderContext(shaderContext)
 {}
 
@@ skipping 60 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 SkShader* SkShader::newWithColorFilter(SkColorFilter* filter) const {
     SkShader* base = const_cast<SkShader*>(this);
     if (!filter) {
         return SkRef(base);
     }
     return new SkColorFilterShader(base, filter);
 }