| Index: src/core/SkPictureShader.cpp
|
| diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
|
| index 81e13752f6aabd8185fd0e88ea4321cbf91abbcd..07de4588fca9cf1ccf1f1de5d6c95c61b08ae30d 100644
|
| --- a/src/core/SkPictureShader.cpp
|
| +++ b/src/core/SkPictureShader.cpp
|
| @@ -188,12 +188,12 @@ void SkPictureShader::toString(SkString* str) const {
|
| #endif
|
|
|
| #if SK_SUPPORT_GPU
|
| -GrEffectRef* SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint,
|
| - const SkMatrix* localMatrix) const {
|
| +bool SkPictureShader::asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor,
|
| + GrEffectRef** grEffect, const SkMatrix* localMatrix) const {
|
| SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(context->getMatrix(), localMatrix));
|
| if (!bitmapShader) {
|
| - return NULL;
|
| + return false;
|
| }
|
| - return bitmapShader->asNewEffect(context, paint, NULL);
|
| + return bitmapShader->asNewEffect(context, paint, grColor, grEffect, NULL);
|
| }
|
| #endif
|
|
|