| Index: src/gpu/GrPaint.cpp
|
| diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp
|
| index dc1644b014d76edd01ae2fd9acc444a5dfbe79e8..3b383681b21de8afcf6c7d87ba4d2694536681f4 100644
|
| --- a/src/gpu/GrPaint.cpp
|
| +++ b/src/gpu/GrPaint.cpp
|
| @@ -16,35 +16,34 @@
|
| GrPaint::GrPaint()
|
| : fAntiAlias(false)
|
| , fDither(false)
|
| - , fColor(GrColor_WHITE)
|
| - , fProcDataManager(new GrProcessorDataManager) {}
|
| + , fColor(GrColor_WHITE) {}
|
|
|
| void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) {
|
| fXPFactory.reset(GrCoverageSetOpXPFactory::Create(regionOp, invertCoverage));
|
| }
|
|
|
| void GrPaint::addColorTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
|
| - this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture,
|
| - matrix))->unref();
|
| + this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(&fProcDataManager, texture,
|
| + matrix))->unref();
|
| }
|
|
|
| void GrPaint::addCoverageTextureProcessor(GrTexture* texture, const SkMatrix& matrix) {
|
| - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture,
|
| - matrix))->unref();
|
| + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(&fProcDataManager, texture,
|
| + matrix))->unref();
|
| }
|
|
|
| void GrPaint::addColorTextureProcessor(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const GrTextureParams& params) {
|
| - this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix,
|
| - params))->unref();
|
| + this->addColorFragmentProcessor(GrSimpleTextureEffect::Create(&fProcDataManager, texture,
|
| + matrix, params))->unref();
|
| }
|
|
|
| void GrPaint::addCoverageTextureProcessor(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| const GrTextureParams& params) {
|
| - this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(fProcDataManager, texture, matrix,
|
| - params))->unref();
|
| + this->addCoverageFragmentProcessor(GrSimpleTextureEffect::Create(&fProcDataManager, texture,
|
| + matrix, params))->unref();
|
| }
|
|
|
| bool GrPaint::isConstantBlendedColor(GrColor* color) const {
|
|
|