diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 11:46:10 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 17:21:03 +0000 |
| commit | a16339297859f37df69230e64f05624cef511ad3 (patch) | |
| tree | 07dbb20733defb86e05bc8cc924b4ced8ca78374 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/DFPathRendererTest.cpp | 2 | ||||
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 | ||||
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 6 | ||||
| -rw-r--r-- | tests/TessellatingPathRendererTests.cpp | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/tests/DFPathRendererTest.cpp b/tests/DFPathRendererTest.cpp index c499c081e0..ca437da4ed 100644 --- a/tests/DFPathRendererTest.cpp +++ b/tests/DFPathRendererTest.cpp @@ -42,7 +42,7 @@ static void test_far_from_origin(GrRenderTargetContext* renderTargetContext, GrP shape = shape.applyStyle(GrStyle::Apply::kPathEffectAndStrokeRec, 1.f); GrPaint paint; - paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); GrNoClip noClip; GrPathRenderer::DrawPathArgs args; diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 0ab7a1ecb0..94abd1c9ee 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -167,9 +167,7 @@ static sk_sp<GrRenderTargetContext> random_render_target_context(GrContext* cont } static void set_random_xpf(GrPaint* paint, GrProcessorTestData* d) { - sk_sp<GrXPFactory> xpf(GrProcessorTestFactory<GrXPFactory>::Make(d)); - SkASSERT(xpf); - paint->setXPFactory(std::move(xpf)); + paint->setXPFactory(GrXPFactoryTestFactory::Get(d)); } static sk_sp<GrFragmentProcessor> create_random_proc_tree(GrProcessorTestData* d, @@ -368,7 +366,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrProcessorTestData ptd(&random, context, context->caps(), renderTargetContext.get(), dummyTextures); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrProcessorTestFactory<GrFragmentProcessor>::MakeIdx(i, &ptd)); diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 19ba7b8e54..3132feeff8 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -67,7 +67,7 @@ public: struct XPInfo { XPInfo(skiatest::Reporter* reporter, SkBlendMode xfermode, const GrCaps& caps, const GrPipelineAnalysis& analysis) { - sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(xfermode)); + const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(xfermode); sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(analysis, false, nullptr, caps)); TEST_ASSERT(!xpf->willNeedDstTexture(caps, analysis)); xpf->getInvariantBlendedColor(analysis.fColorPOI, &fBlendedColor); @@ -1097,7 +1097,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags()); SkASSERT(covPOI.isFourChannelOutput()); - sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(SkBlendMode::kSrcOver)); + const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(SkBlendMode::kSrcOver); TEST_ASSERT(!xpf->willNeedDstTexture(caps, analysis)); sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(analysis, false, nullptr, caps)); @@ -1171,7 +1171,7 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { } for (int m = 0; m <= (int)SkBlendMode::kLastCoeffMode; m++) { SkBlendMode xfermode = static_cast<SkBlendMode>(m); - sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(xfermode)); + const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(xfermode); GrXferProcessor::DstTexture* dstTexture = xpf->willNeedDstTexture(caps, analysis) ? &fakeDstTexture : 0; sk_sp<GrXferProcessor> xp( diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index ccc24a4aa8..fc93772106 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -254,7 +254,7 @@ static void test_path(GrRenderTargetContext* renderTargetContext, GrResourceProv GrTessellatingPathRenderer tess; GrPaint paint; - paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); GrNoClip noClip; GrStyle style(SkStrokeRec::kFill_InitStyle); |