Revert of enforce 16byte alignment in shader contexts

src/core/SkComposeShader.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkComposeShader_DEFINED
@@ skipping 16 matching lines @@
         "dst", and the result from shader B as its "src".
         mode->xfer32(sA_result, sB_result, ...)
         @param shaderA  The colors from this shader are seen as the "dst" by the xfermode
         @param shaderB  The colors from this shader are seen as the "src" by the xfermode
         @param mode     The xfermode that combines the colors from the two shaders. If mode
                         is null, then SRC_OVER is assumed.
     */
     SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL);
     virtual ~SkComposeShader();
 
+    size_t contextSize(const ContextRec&) const override;
+
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor*  asFragmentProcessor(GrContext*,
                                                     const SkMatrix& viewM,
                                                     const SkMatrix* localMatrix,
                                                     SkFilterQuality) const override;
 #endif
 
     class ComposeShaderContext : public SkShader::Context {
     public:
         // When this object gets destroyed, it will call contextA and contextB's destructor
@@ skipping 21 matching lines @@
 #endif
 
     bool asACompose(ComposeRec* rec) const override;
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader)
 
 protected:
     SkComposeShader(SkReadBuffer& );
     void flatten(SkWriteBuffer&) const override;
-    size_t onContextSize(const ContextRec&) const override;
     Context* onCreateContext(const ContextRec&, void*) const override;
 
 private:
     SkShader*   fShaderA;
     SkShader*   fShaderB;
     SkXfermode* fMode;
 
     typedef SkShader INHERITED;
 };
 
 #endif