diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 16:00:33 +0000 |
|---|---|---|
| committer | Brian Salomon <bsalomon@google.com> | 2017-01-09 16:08:13 +0000 |
| commit | 003312a211e65f35e402d6fe80a32e23d4c94ac4 (patch) | |
| tree | 61635d3df8e7bf873c0ea08b211da03521b8a477 /src/gpu/GrPaint.cpp | |
| parent | a8f80de2bc17672b4b6f26d3cf6b38123ac850c9 (diff) | |
Revert "Removing ref counting from GrXPFactory."
This reverts commit a8f80de2bc17672b4b6f26d3cf6b38123ac850c9.
Reason for revert: nanobench failing on windows bots, possibly others
Change-Id: Iacb8c650064a28654c165665be057377ffb02ba5
Reviewed-on: https://skia-review.googlesource.com/6802
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrPaint.cpp')
| -rw-r--r-- | src/gpu/GrPaint.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/GrPaint.cpp b/src/gpu/GrPaint.cpp index 8d9347b3bf..0954505b80 100644 --- a/src/gpu/GrPaint.cpp +++ b/src/gpu/GrPaint.cpp @@ -13,14 +13,13 @@ #include "effects/GrSimpleTextureEffect.h" GrPaint::GrPaint() - : fXPFactory(nullptr) - , fDisableOutputConversionToSRGB(false) - , fAllowSRGBInputs(false) - , fUsesDistanceVectorField(false) - , fColor(GrColor4f::OpaqueWhite()) {} + : fDisableOutputConversionToSRGB(false) + , fAllowSRGBInputs(false) + , fUsesDistanceVectorField(false) + , fColor(GrColor4f::OpaqueWhite()) {} void GrPaint::setCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage) { - fXPFactory = GrCoverageSetOpXPFactory::Get(regionOp, invertCoverage); + fXPFactory = GrCoverageSetOpXPFactory::Make(regionOp, invertCoverage); } void GrPaint::addColorTextureProcessor(GrTexture* texture, |