diff options
author | bungeman <bungeman@google.com> | 2016-06-09 08:01:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-09 08:01:03 -0700 |
commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/gpu/GrPaint.cpp | |
parent | 897a8e38879643d81a64d2bb6bed4e22af982aa4 (diff) |
sk_sp for Ganesh.
Convert use of GrFragmentProcessor, GrGeometryProcessor, and
GrXPFactory to sk_sp. This clarifies ownership and should
reduce reference count churn by moving ownership.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041113004
Review-Url: https://codereview.chromium.org/2041113004
Diffstat (limited to 'src/gpu/GrPaint.cpp')
-rw-r--r-- | src/gpu/GrPaint.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp index f41469e08e..fd78f9f819 100644 --- a/src/gpu/GrPaint.cpp +++ b/src/gpu/GrPaint.cpp @@ -19,36 +19,34 @@ 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 { GrProcOptInfo colorProcInfo; - colorProcInfo.calcWithInitialValues(fColorFragmentProcessors.begin(), - this->numColorFragmentProcessors(), fColor, - kRGBA_GrColorComponentFlags, false); + colorProcInfo.calcWithInitialValues( + sk_sp_address_as_pointer_address(fColorFragmentProcessors.begin()), + this->numColorFragmentProcessors(), fColor, kRGBA_GrColorComponentFlags, false); GrXPFactory::InvariantBlendedColor blendedColor; if (fXPFactory) { |