diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-08 09:56:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-08 09:56:11 -0700 |
| commit | 83d081ae1d731b5039e99823620f5e287542ee39 (patch) | |
| tree | 5deeda75fa4584b904a129dc4c1981f002b4cc14 /src/core/SkPictureShader.cpp | |
| parent | ca95c19d27b505a1ac8f57b53cb49c198bc29267 (diff) | |
Goodbye GrEffectRef.
Also, reworked some var names and comments around SkShader::asNewEffect.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/374923002
Diffstat (limited to 'src/core/SkPictureShader.cpp')
| -rw-r--r-- | src/core/SkPictureShader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp index e154131dcb..d6b84c356a 100644 --- a/src/core/SkPictureShader.cpp +++ b/src/core/SkPictureShader.cpp @@ -189,18 +189,18 @@ void SkPictureShader::toString(SkString* str) const { #if SK_SUPPORT_GPU bool SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint, - const SkMatrix* localMatrix, GrColor* grColor, - GrEffectRef** grEffect) const { + const SkMatrix* localMatrix, GrColor* paintColor, + GrEffect** effect) const { SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(context->getMatrix(), localMatrix)); if (!bitmapShader) { return false; } - return bitmapShader->asNewEffect(context, paint, NULL, grColor, grEffect); + return bitmapShader->asNewEffect(context, paint, NULL, paintColor, effect); } #else bool SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint, - const SkMatrix* localMatrix, GrColor* grColor, - GrEffect** grEffect) const { + const SkMatrix* localMatrix, GrColor* paintColor, + GrEffect** effect) const { SkDEBUGFAIL("Should not call in GPU-less build"); return false; } |