From b4b4cf36c66900fdfaf63106d54a8fac786a3313 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 4 Apr 2016 05:56:59 -0700 Subject: Revert of Rename enums in GrContextFactory to remove "GL" (patchset #4 id:60001 of https://codereview.chromium.org/1845923004/ ) Reason for revert: Many GM images unexpectedly changed with this CL. Original issue's description: > Rename enums in GrContextFactory to remove "GL" > > Also, remove kNative as a separate context type and instead make it an alias for kGL or kGLES based on OS. > > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1845923004 > > Committed: https://skia.googlesource.com/skia/+/2d9c6f81353597aebf5934547e5cba7a872196fb TBR=egdaniel@google.com,jvanverth@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. Review URL: https://codereview.chromium.org/1856703002 --- tests/GrContextAbandonTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/GrContextAbandonTest.cpp') diff --git a/tests/GrContextAbandonTest.cpp b/tests/GrContextAbandonTest.cpp index e1ad8f7de7..c62973f4da 100644 --- a/tests/GrContextAbandonTest.cpp +++ b/tests/GrContextAbandonTest.cpp @@ -16,10 +16,10 @@ using sk_gpu_test::GrContextFactory; DEF_GPUTEST(GrContext_abandonContext, reporter, /*factory*/) { for (int testType = 0; testType < 6; ++testType) { - for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { - GrContextFactory testFactory; - GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i; - GrContextFactory::ContextInfo info = testFactory.getContextInfo(ctxType); + for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { + GrContextFactory testFactory; + GrContextFactory::GLContextType ctxType = (GrContextFactory::GLContextType) i; + GrContextFactory::ContextInfo info = testFactory.getContextInfo(ctxType); if (GrContext* context = info.fGrContext) { switch (testType) { case 0: -- cgit v1.2.3