diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:10:51 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 19:10:51 +0000 |
commit | 87fcd950198a16211b3988610beebb5ca5bcf323 (patch) | |
tree | 50e57f94755c0a398829f1e8ea34649bb6d4e2d7 /src/core/SkBlitter_A8.cpp | |
parent | 2a9e3ad71b6490bbe79c2e7fc38e8d2fcffe4a55 (diff) |
Revert of Revert of Extract most of the mutable state of SkShader into a separate Context object. (https://codereview.chromium.org/249643002/)
Reason for revert:
Chromium side change landed along side DEPS roll that includes r14323.
Original issue's description:
> Revert of Extract most of the mutable state of SkShader into a separate Context object. (https://codereview.chromium.org/207683004/)
>
> Reason for revert:
> This is blocking the DEPS roll into Chromium. Failures can be seen here:
>
> http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/174333
>
> Original issue's description:
> > Extract most of the mutable state of SkShader into a separate Context object.
> >
> > SkShader currently stores some state during draw calls via setContext(...).
> > Move that mutable state into a separate SkShader::Context class that is
> > constructed on demand for the duration of the draw.
> >
> > Calls to setContext() are replaced with createContext() which returns a context
> > corresponding to the shader object or NULL if the parameters to createContext
> > are invalid.
> >
> > TEST=out/Debug/dm
> > BUG=skia:1976
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14216
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14323
>
> TBR=scroggo@google.com,skyostil@chromium.org,tomhudson@chromium.org,senorblanco@chromium.org,reed@google.com,bungeman@google.com,dominikg@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:1976
>
> Committed: http://code.google.com/p/skia/source/detail?r=14326
R=scroggo@google.com, skyostil@chromium.org, tomhudson@chromium.org, senorblanco@chromium.org, reed@google.com, bungeman@google.com, dominikg@chromium.org
TBR=bungeman@google.com, dominikg@chromium.org, reed@google.com, scroggo@google.com, senorblanco@chromium.org, skyostil@chromium.org, tomhudson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:1976
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/246403013
git-svn-id: http://skia.googlecode.com/svn/trunk@14328 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBlitter_A8.cpp')
-rw-r--r-- | src/core/SkBlitter_A8.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/core/SkBlitter_A8.cpp b/src/core/SkBlitter_A8.cpp index 983a226e34..11f425903b 100644 --- a/src/core/SkBlitter_A8.cpp +++ b/src/core/SkBlitter_A8.cpp @@ -228,11 +228,12 @@ void SkA8_Blitter::blitRect(int x, int y, int width, int height) { /////////////////////////////////////////////////////////////////////// -SkA8_Shader_Blitter::SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint) - : INHERITED(device, paint) { +SkA8_Shader_Blitter::SkA8_Shader_Blitter(const SkBitmap& device, const SkPaint& paint, + SkShader::Context* shaderContext) + : INHERITED(device, paint, shaderContext) { if ((fXfermode = paint.getXfermode()) != NULL) { fXfermode->ref(); - SkASSERT(fShader); + SkASSERT(fShaderContext); } int width = device.width(); @@ -250,13 +251,14 @@ void SkA8_Shader_Blitter::blitH(int x, int y, int width) { (unsigned)(x + width) <= (unsigned)fDevice.width()); uint8_t* device = fDevice.getAddr8(x, y); + SkShader::Context* shaderContext = fShaderContext; - if ((fShader->getFlags() & SkShader::kOpaqueAlpha_Flag) && !fXfermode) { + if ((shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag) && !fXfermode) { memset(device, 0xFF, width); } else { SkPMColor* span = fBuffer; - fShader->shadeSpan(x, y, span, width); + shaderContext->shadeSpan(x, y, span, width); if (fXfermode) { fXfermode->xferA8(device, span, width, NULL); } else { @@ -282,12 +284,12 @@ static inline uint8_t aa_blend8(SkPMColor src, U8CPU da, int aa) { void SkA8_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) { - SkShader* shader = fShader; - SkXfermode* mode = fXfermode; - uint8_t* aaExpand = fAAExpand; - SkPMColor* span = fBuffer; - uint8_t* device = fDevice.getAddr8(x, y); - int opaque = fShader->getFlags() & SkShader::kOpaqueAlpha_Flag; + SkShader::Context* shaderContext = fShaderContext; + SkXfermode* mode = fXfermode; + uint8_t* aaExpand = fAAExpand; + SkPMColor* span = fBuffer; + uint8_t* device = fDevice.getAddr8(x, y); + int opaque = shaderContext->getFlags() & SkShader::kOpaqueAlpha_Flag; for (;;) { int count = *runs; @@ -299,7 +301,7 @@ void SkA8_Shader_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[], if (opaque && aa == 255 && mode == NULL) { memset(device, 0xFF, count); } else { - shader->shadeSpan(x, y, span, count); + shaderContext->shadeSpan(x, y, span, count); if (mode) { memset(aaExpand, aa, count); mode->xferA8(device, span, count, aaExpand); @@ -329,11 +331,12 @@ void SkA8_Shader_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) { int height = clip.height(); uint8_t* device = fDevice.getAddr8(x, y); const uint8_t* alpha = mask.getAddr8(x, y); + SkShader::Context* shaderContext = fShaderContext; SkPMColor* span = fBuffer; while (--height >= 0) { - fShader->shadeSpan(x, y, span, width); + shaderContext->shadeSpan(x, y, span, width); if (fXfermode) { fXfermode->xferA8(device, span, width, alpha); } else { |