From 08bf86d1b7b03cc6829f2488d9adcb0502e84b97 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 22 May 2015 12:41:05 -0700 Subject: Revert of Store context options on caps. (patchset #3 id:40001 of https://codereview.chromium.org/1158433006/) Reason for revert: breaking chromeos build (???) Original issue's description: > Store context options on caps. > > Committed: https://skia.googlesource.com/skia/+/f28cff71db2cbb1ff18a8fbf1e80ca761d1f69bc TBR=joshualitt@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1151603005 --- bench/nanobench.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'bench') diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 2fba1f0533..85685fb3bc 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -47,8 +47,6 @@ SkAutoTDelete gGrFactory; #endif - struct GrContextOptions; - __SK_FORCE_IMAGE_DECODER_LINKING; static const int kAutoTuneLoops = 0; @@ -846,7 +844,7 @@ int nanobench_main() { SkTaskGroup::Enabler enabled; #if SK_SUPPORT_GPU - GrContextOptions grContextOpts; + GrContext::Options grContextOpts; grContextOpts.fDrawPathToCompressedTexture = FLAGS_gpuCompressAlphaMasks; gGrFactory.reset(SkNEW_ARGS(GrContextFactory, (grContextOpts))); #endif -- cgit v1.2.3