From e901b6de3ef8dea842008a08fc81e92fb1478d61 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 1 May 2014 19:31:31 +0000 Subject: create struct to hold all the params passed around for shader::context BUG=skia: R=scroggo@google.com, dominikg@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/264843006 git-svn-id: http://skia.googlecode.com/svn/trunk@14514 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkComposeShader.cpp | 50 +++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'src/core/SkComposeShader.cpp') diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp index 2c27c9e7d1..33c0912795 100644 --- a/src/core/SkComposeShader.cpp +++ b/src/core/SkComposeShader.cpp @@ -78,11 +78,8 @@ void SkComposeShader::flatten(SkWriteBuffer& buffer) const { really is translucent, then we apply that after the fact. */ -bool SkComposeShader::validContext(const SkBitmap& device, - const SkPaint& paint, - const SkMatrix& matrix, - SkMatrix* totalInverse) const { - if (!this->INHERITED::validContext(device, paint, matrix, totalInverse)) { +bool SkComposeShader::validContext(const ContextRec& rec, SkMatrix* totalInverse) const { + if (!this->INHERITED::validContext(rec, totalInverse)) { return false; } @@ -90,48 +87,49 @@ bool SkComposeShader::validContext(const SkBitmap& device, // before calling our sub-shaders SkMatrix tmpM; + tmpM.setConcat(*rec.fMatrix, this->getLocalMatrix()); - tmpM.setConcat(matrix, this->getLocalMatrix()); + ContextRec newRec(rec); + newRec.fMatrix = &tmpM; - return fShaderA->validContext(device, paint, tmpM) && - fShaderB->validContext(device, paint, tmpM); + return fShaderA->validContext(newRec) && fShaderB->validContext(newRec); } -SkShader::Context* SkComposeShader::createContext(const SkBitmap& device, const SkPaint& paint, - const SkMatrix& matrix, void* storage) const { - if (!this->validContext(device, paint, matrix)) { +SkShader::Context* SkComposeShader::createContext(const ContextRec& rec, void* storage) const { + if (!this->validContext(rec)) { return NULL; } - // we preconcat our localMatrix (if any) with the device matrix - // before calling our sub-shaders - - SkMatrix tmpM; - - tmpM.setConcat(matrix, this->getLocalMatrix()); - - SkAutoAlphaRestore restore(const_cast(&paint), 0xFF); + // TODO : must fix this to not "cheat" and modify fPaint + SkAutoAlphaRestore restore(const_cast(rec.fPaint), 0xFF); char* aStorage = (char*) storage + sizeof(ComposeShaderContext); char* bStorage = aStorage + fShaderA->contextSize(); - SkShader::Context* contextA = fShaderA->createContext(device, paint, tmpM, aStorage); - SkShader::Context* contextB = fShaderB->createContext(device, paint, tmpM, bStorage); + // we preconcat our localMatrix (if any) with the device matrix + // before calling our sub-shaders + + SkMatrix tmpM; + tmpM.setConcat(*rec.fMatrix, this->getLocalMatrix()); + + ContextRec newRec(rec); + newRec.fMatrix = &tmpM; + + SkShader::Context* contextA = fShaderA->createContext(newRec, aStorage); + SkShader::Context* contextB = fShaderB->createContext(newRec, bStorage); // Both functions must succeed; otherwise validContext should have returned // false. SkASSERT(contextA); SkASSERT(contextB); - return SkNEW_PLACEMENT_ARGS(storage, ComposeShaderContext, - (*this, device, paint, matrix, contextA, contextB)); + return SkNEW_PLACEMENT_ARGS(storage, ComposeShaderContext, (*this, rec, contextA, contextB)); } SkComposeShader::ComposeShaderContext::ComposeShaderContext( - const SkComposeShader& shader, const SkBitmap& device, - const SkPaint& paint, const SkMatrix& matrix, + const SkComposeShader& shader, const ContextRec& rec, SkShader::Context* contextA, SkShader::Context* contextB) - : INHERITED(shader, device, paint, matrix) + : INHERITED(shader, rec) , fShaderContextA(contextA) , fShaderContextB(contextB) {} -- cgit v1.2.3