From 6270e558c31b75d02db6f598e93f2e3b701ccb7f Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Tue, 13 Sep 2016 10:41:49 -0700 Subject: Add ContextOptions field to SkCommandLineConfigGpu Reduces duplicate code by computing the ContextOptions in one spot. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2337163002 Review-Url: https://codereview.chromium.org/2337163002 --- tools/skiaserve/Request.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/skiaserve') diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp index ea2d17afb9..ef1f757595 100644 --- a/tools/skiaserve/Request.cpp +++ b/tools/skiaserve/Request.cpp @@ -72,10 +72,10 @@ SkCanvas* Request::getCanvas() { #if SK_SUPPORT_GPU GrContextFactory* factory = fContextFactory; GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType, - GrContextFactory::kNone_ContextOptions).glContext(); + GrContextFactory::ContextOptions::kNone).glContext(); if (!gl) { gl = factory->getContextInfo(GrContextFactory::kMESA_ContextType, - GrContextFactory::kNone_ContextOptions).glContext(); + GrContextFactory::ContextOptions::kNone).glContext(); } if (gl) { gl->makeCurrent(); @@ -123,10 +123,10 @@ sk_sp Request::writeOutSkp() { GrContext* Request::getContext() { #if SK_SUPPORT_GPU GrContext* result = fContextFactory->get(GrContextFactory::kNativeGL_ContextType, - GrContextFactory::kNone_ContextOptions); + GrContextFactory::ContextOptions::kNone); if (!result) { result = fContextFactory->get(GrContextFactory::kMESA_ContextType, - GrContextFactory::kNone_ContextOptions); + GrContextFactory::ContextOptions::kNone); } return result; #else -- cgit v1.2.3