| Index: src/core/SkBitmapProcShader.cpp
|
| diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
|
| index a9798b8e24c3d4e816eac484b561ae3d00ef7e67..1a451fd5918de64c558edfe2cdb7a5c73b66eec1 100644
|
| --- a/src/core/SkBitmapProcShader.cpp
|
| +++ b/src/core/SkBitmapProcShader.cpp
|
| @@ -337,8 +337,9 @@ static bool bitmapIsTooBig(const SkBitmap& bm) {
|
| return bm.width() > maxSize || bm.height() > maxSize;
|
| }
|
|
|
| -SkShader* CreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx,
|
| - SkShader::TileMode tmy, const SkMatrix* localMatrix, SkTBlitterAllocator* allocator) {
|
| +SkShader* SkCreateBitmapShader(const SkBitmap& src, SkShader::TileMode tmx,
|
| + SkShader::TileMode tmy, const SkMatrix* localMatrix,
|
| + SkTBlitterAllocator* allocator) {
|
| SkShader* shader;
|
| SkColor color;
|
| if (src.isNull() || bitmapIsTooBig(src)) {
|
| @@ -466,7 +467,7 @@ bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint&
|
| "Couldn't convert bitmap to texture.");
|
| return false;
|
| }
|
| -
|
| +
|
| *paintColor = (kAlpha_8_SkColorType == fRawBitmap.colorType()) ?
|
| SkColor2GrColor(paint.getColor()) :
|
| SkColor2GrColorJustAlpha(paint.getColor());
|
| @@ -480,7 +481,7 @@ bool SkBitmapProcShader::asFragmentProcessor(GrContext* context, const SkPaint&
|
| return true;
|
| }
|
|
|
| -#else
|
| +#else
|
|
|
| bool SkBitmapProcShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix*, GrColor*,
|
| GrFragmentProcessor**) const {
|
|
|