From f2f1c17e331fe1e0ce695969970ecebc81e12ceb Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 5 Apr 2016 12:59:06 -0700 Subject: One signature for creating unit tests that run on premade GrContexts GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1860593002 Review URL: https://codereview.chromium.org/1860593002 --- tests/GrContextFactoryTest.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/GrContextFactoryTest.cpp') diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 6e51b2fda3..395fa6a37f 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -13,7 +13,7 @@ #include "GrCaps.h" #include "Test.h" -using sk_gpu_test::GrContextFactory; +using namespace sk_gpu_test; DEF_GPUTEST(GrContextFactory_NVPRContextOptionHasPathRenderingSupport, reporter, /*factory*/) { // Test that if NVPR is requested, the context always has path rendering @@ -74,7 +74,7 @@ DEF_GPUTEST(GrContextFactory_abandon, reporter, /*factory*/) { GrContextFactory testFactory; for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i; - GrContextFactory::ContextInfo info1 = testFactory.getContextInfo(ctxType); + ContextInfo info1 = testFactory.getContextInfo(ctxType); if (!info1.fGrContext) { continue; } @@ -84,8 +84,7 @@ DEF_GPUTEST(GrContextFactory_abandon, reporter, /*factory*/) { testFactory.abandonContexts(); // Test that we get different context after abandon. - GrContextFactory::ContextInfo info2 = - testFactory.getContextInfo(ctxType); + ContextInfo info2 = testFactory.getContextInfo(ctxType); REPORTER_ASSERT(reporter, info2.fGrContext); REPORTER_ASSERT(reporter, info2.fGLContext); REPORTER_ASSERT(reporter, info1.fGrContext != info2.fGrContext); -- cgit v1.2.3