| Index: src/gpu/GrPaint.cpp
|
| diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
|
| index f41469e08e3ef9ebbd64b314da960df0d097e208..8d77d07757d96de38211d17bf9b9c86cbf3bf176 100644
|
| --- a/src/gpu/GrPaint.cpp
|
| +++ b/src/gpu/GrPaint.cpp
|
| @@ -19,29 +19,27 @@ GrPaint::GrPaint()
|
| , fColor(GrColor_WHITE) {}
|
|
|
| void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) {
|
| - fXPFactory.reset(GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage));
|
| + fXPFactory = GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage);
|
| }
|
|
|
| void GrPaint::addColorTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
|
| - this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
|
| + this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(texture, matrix));
|
| }
|
|
|
| void GrPaint::addCoverageTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
|
| - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture, matrix))->unref();
|
| + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(texture, matrix));
|
| }
|
|
|
| void GrPaint::addColorTextureProcessor(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const GrTextureParams& params) {
|
| - this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(texture,
|
| - matrix, params))->unref();
|
| + this->addColorFragmentProcessor(GrSimpleTextureEffect::Make(texture, matrix, params));
|
| }
|
|
|
| void GrPaint::addCoverageTextureProcessor(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const GrTextureParams& params) {
|
| - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(texture,
|
| - matrix, params))->unref();
|
| + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(texture, matrix, params));
|
| }
|
|
|
| bool GrPaint::isConstantBlendedColor(GrColor* color) const {
|
|
|