Index: src/core/SkComposeShader.cpp |
diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp |
index e4ad6e9edab9099197a5b268b9446e6759b48d14..b6ba3729d1ba641b936d55d85f57811ace7e6fc5 100644 |
--- a/src/core/SkComposeShader.cpp |
+++ b/src/core/SkComposeShader.cpp |
@@ -31,7 +31,7 @@ SkComposeShader::~SkComposeShader() { |
} |
size_t SkComposeShader::onContextSize(const ContextRec& rec) const { |
- return SkAlign16(sizeof(ComposeShaderContext)) |
+ return sizeof(ComposeShaderContext) |
+ fShaderA->contextSize(rec) |
+ fShaderB->contextSize(rec); |
} |
@@ -76,7 +76,7 @@ template <typename T> void safe_call_destructor(T* obj) { |
} |
SkShader::Context* SkComposeShader::onCreateContext(const ContextRec& rec, void* storage) const { |
- char* aStorage = (char*) storage + SkAlign16(sizeof(ComposeShaderContext)); |
+ char* aStorage = (char*) storage + sizeof(ComposeShaderContext); |
char* bStorage = aStorage + fShaderA->contextSize(rec); |
// we preconcat our localMatrix (if any) with the device matrix |