| Index: src/gpu/GrTextureParamsAdjuster.cpp
|
| diff --git a/src/gpu/GrTextureParamsAdjuster.cpp b/src/gpu/GrTextureParamsAdjuster.cpp
|
| index 076750ee5a9c530c06d85fc9f565aad9ac35cde2..a68c3d76571a1f02141895eb8fa4961038169eef 100644
|
| --- a/src/gpu/GrTextureParamsAdjuster.cpp
|
| +++ b/src/gpu/GrTextureParamsAdjuster.cpp
|
| @@ -93,9 +93,9 @@ static GrTexture* copy_on_gpu(GrTexture* inputTexture, const SkIRect* subset,
|
| // better!
|
| SkASSERT(copyParams.fFilter != GrTextureParams::kMipMap_FilterMode);
|
| paint.addColorFragmentProcessor(
|
| - GrTextureDomainEffect::Create(inputTexture, SkMatrix::I(), domain,
|
| - GrTextureDomain::kClamp_Mode,
|
| - copyParams.fFilter))->unref();
|
| + GrTextureDomainEffect::Make(inputTexture, SkMatrix::I(), domain,
|
| + GrTextureDomain::kClamp_Mode,
|
| + copyParams.fFilter));
|
| } else {
|
| GrTextureParams params(SkShader::kClamp_TileMode, copyParams.fFilter);
|
| paint.addColorTextureProcessor(inputTexture, SkMatrix::I(), params);
|
| @@ -342,7 +342,7 @@ static DomainMode determine_domain_mode(
|
| return kDomain_DomainMode;
|
| }
|
|
|
| -static const GrFragmentProcessor* create_fp_for_domain_and_filter(
|
| +static sk_sp<GrFragmentProcessor> create_fp_for_domain_and_filter(
|
| GrTexture* texture,
|
| const SkMatrix& textureMatrix,
|
| DomainMode domainMode,
|
| @@ -351,25 +351,25 @@ static const GrFragmentProcessor* create_fp_for_domain_and_filter(
|
| SkASSERT(kTightCopy_DomainMode != domainMode);
|
| if (filterOrNullForBicubic) {
|
| if (kDomain_DomainMode == domainMode) {
|
| - return GrTextureDomainEffect::Create(texture, textureMatrix, domain,
|
| - GrTextureDomain::kClamp_Mode,
|
| - *filterOrNullForBicubic);
|
| + return GrTextureDomainEffect::Make(texture, textureMatrix, domain,
|
| + GrTextureDomain::kClamp_Mode,
|
| + *filterOrNullForBicubic);
|
| } else {
|
| GrTextureParams params(SkShader::kClamp_TileMode, *filterOrNullForBicubic);
|
| - return GrSimpleTextureEffect::Create(texture, textureMatrix, params);
|
| + return GrSimpleTextureEffect::Make(texture, textureMatrix, params);
|
| }
|
| } else {
|
| if (kDomain_DomainMode == domainMode) {
|
| - return GrBicubicEffect::Create(texture, textureMatrix, domain);
|
| + return GrBicubicEffect::Make(texture, textureMatrix, domain);
|
| } else {
|
| static const SkShader::TileMode kClampClamp[] =
|
| { SkShader::kClamp_TileMode, SkShader::kClamp_TileMode };
|
| - return GrBicubicEffect::Create(texture, textureMatrix, kClampClamp);
|
| + return GrBicubicEffect::Make(texture, textureMatrix, kClampClamp);
|
| }
|
| }
|
| }
|
|
|
| -const GrFragmentProcessor* GrTextureAdjuster::createFragmentProcessor(
|
| +sk_sp<GrFragmentProcessor> GrTextureAdjuster::createFragmentProcessor(
|
| const SkMatrix& origTextureMatrix,
|
| const SkRect& origConstraintRect,
|
| FilterConstraint filterConstraint,
|
| @@ -467,7 +467,7 @@ GrTexture* GrTextureMaker::refTextureForParams(const GrTextureParams& params,
|
| return result;
|
| }
|
|
|
| -const GrFragmentProcessor* GrTextureMaker::createFragmentProcessor(
|
| +sk_sp<GrFragmentProcessor> GrTextureMaker::createFragmentProcessor(
|
| const SkMatrix& textureMatrix,
|
| const SkRect& constraintRect,
|
| FilterConstraint filterConstraint,
|
|
|