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/ops | |
| 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/ops')
| -rw-r--r-- | src/gpu/ops/GrDefaultPathRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/ops/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp index cbad5f2a40..d9e0110c06 100644 --- a/src/gpu/ops/GrDefaultPathRenderer.cpp +++ b/src/gpu/ops/GrDefaultPathRenderer.cpp @@ -596,7 +596,7 @@ void GrDefaultPathRenderer::onStencilPath(const StencilPathArgs& args) { SkASSERT(!args.fShape->inverseFilled()); GrPaint paint; - paint.setXPFactory(GrDisableColorXPFactory::Get()); + paint.setXPFactory(GrDisableColorXPFactory::Make()); this->internalDrawPath(args.fRenderTargetContext, paint, args.fAAType, GrUserStencilSettings::kUnused, *args.fClip, *args.fViewMatrix, diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index cc6781cac4..207567beff 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -718,7 +718,7 @@ void GrMSAAPathRenderer::onStencilPath(const StencilPathArgs& args) { SkASSERT(!args.fShape->mayBeInverseFilledAfterStyling()); GrPaint paint; - paint.setXPFactory(GrDisableColorXPFactory::Get()); + paint.setXPFactory(GrDisableColorXPFactory::Make()); this->internalDrawPath(args.fRenderTargetContext, paint, args.fAAType, GrUserStencilSettings::kUnused, *args.fClip, *args.fViewMatrix, |