diff options
author | 2017-01-09 11:46:10 -0500 | |
---|---|---|
committer | 2017-01-09 17:21:03 +0000 | |
commit | a16339297859f37df69230e64f05624cef511ad3 (patch) | |
tree | 07dbb20733defb86e05bc8cc924b4ced8ca78374 /src/gpu/GrPaint.cpp | |
parent | a7080264d11235d6f469d355b14a7647cba8eb75 (diff) |
Revert "Revert "Removing ref counting from GrXPFactory.""
This reverts commit 003312a211e65f35e402d6fe80a32e23d4c94ac4.
Change-Id: Ib41065e5c356d1dd99e70fa10611ac6756c2b79d
Reviewed-on: https://skia-review.googlesource.com/6803
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPaint.cpp')
-rw-r--r-- | src/gpu/GrPaint.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp index 0954505b80..8d9347b3bf 100644 --- a/src/gpu/GrPaint.cpp +++ b/src/gpu/GrPaint.cpp @@ -13,13 +13,14 @@ #include "effects/GrSimpleTextureEffect.h" GrPaint::GrPaint() - : fDisableOutputConversionToSRGB(false) - , fAllowSRGBInputs(false) - , fUsesDistanceVectorField(false) - , fColor(GrColor4f::OpaqueWhite()) {} + : fXPFactory(nullptr) + , fDisableOutputConversionToSRGB(false) + , fAllowSRGBInputs(false) + , fUsesDistanceVectorField(false) + , fColor(GrColor4f::OpaqueWhite()) {} void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) { - fXPFactory = GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage); + fXPFactory = GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage); } void GrPaint::addColorTextureProcessor(GrTexture* texture, |