From 003312a211e65f35e402d6fe80a32e23d4c94ac4 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 9 Jan 2017 16:00:33 +0000 Subject: 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 Reviewed-by: Brian Salomon --- src/gpu/ops/GrDefaultPathRenderer.cpp | 2 +- src/gpu/ops/GrMSAAPathRenderer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/ops') 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, -- cgit v1.2.3