Revert of enforce 16byte alignment in shader contexts

include/core/SkShader.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 SkShader_DEFINED
 #define SkShader_DEFINED
 
@@ skipping 174 matching lines @@
     };
 
     /**
      *  Create the actual object that does the shading.
      *  Size of storage must be >= contextSize.
      */
     Context* createContext(const ContextRec&, void* storage) const;
 
     /**
      *  Return the size of a Context returned by createContext.
+     *
+     *  Override this if your subclass overrides createContext, to return the correct size of
+     *  your subclass' context.
      */
-    size_t contextSize(const ContextRec&) const;
+    virtual size_t contextSize(const ContextRec&) const;
 
     /**
      *  Returns true if this shader is just a bitmap, and if not null, returns the bitmap,
      *  localMatrix, and tilemodes. If this is not a bitmap, returns false and ignores the
      *  out-parameters.
      */
     bool isABitmap(SkBitmap* outTexture, SkMatrix* outMatrix, TileMode xy[2]) const {
         return this->onIsABitmap(outTexture, outMatrix, xy);
     }
 
@@ skipping 203 matching lines @@
     void flatten(SkWriteBuffer&) const override;
 
     bool computeTotalInverse(const ContextRec&, SkMatrix* totalInverse) const;
 
     /**
      *  Your subclass must also override contextSize() if it overrides onCreateContext().
      *  Base class impl returns NULL.
      */
     virtual Context* onCreateContext(const ContextRec&, void* storage) const;
 
-    /**
-     *  Override this if your subclass overrides createContext, to return the correct size of
-     *  your subclass' context.
-     */
-    virtual size_t onContextSize(const ContextRec&) const;
-
     virtual bool onAsLuminanceColor(SkColor*) const {
         return false;
     }
 
     virtual bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode[2]) const {
         return false;
     }
 
 private:
     // This is essentially const, but not officially so it can be modified in
     // constructors.
     SkMatrix fLocalMatrix;
 
     // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer constructor.
     friend class SkLocalMatrixShader;
     friend class SkBitmapProcShader;    // for computeTotalInverse()
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif