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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/core/SkEmptyShader.h b/src/core/SkEmptyShader.h
index c1713d1a2e..42b61c52fe 100644
--- a/src/core/SkEmptyShader.h
+++ b/src/core/SkEmptyShader.h
@@ -20,16 +20,16 @@ class SK_API SkEmptyShader : public SkShader {
 public:
     SkEmptyShader() {}
 
-    size_t contextSize(const ContextRec&) const override {
-        // Even though createContext returns nullptr we have to return a value of at least
-        // sizeof(SkShader::Context) to satisfy SkSmallAllocator.
-        return sizeof(SkShader::Context);
-    }
-
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
 
 protected:
+    size_t onContextSize(const ContextRec&) const override {
+        // Even though createContext returns nullptr we have to return a value of at least
+        // sizeof(SkShader::Context) to satisfy SkSmallAllocator.
+        return SkAlign16(sizeof(SkShader::Context));
+    }
+
     SkShader::Context* onCreateContext(const ContextRec&, void*) const override {
         return nullptr;
     }