From e812d496aaa5e5e9f2117de8f442c297c9cb1367 Mon Sep 17 00:00:00 2001 From: csmartdalton Date: Tue, 21 Feb 2017 12:36:05 -0700 Subject: Rename GrContextFactory::ContextOptions to ContextOverrides Also changes the behavior of these flags to only override their corresponding context options when set, and to leave them unchanged when not set. BUG=skia: Change-Id: I09f6be09997594fa888d9045dd4901354ef3f880 Reviewed-on: https://skia-review.googlesource.com/8780 Reviewed-by: Brian Salomon Commit-Queue: Chris Dalton --- bench/nanobench.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bench/nanobench.h') diff --git a/bench/nanobench.h b/bench/nanobench.h index ce1e33ec4f..ffd6893c4a 100644 --- a/bench/nanobench.h +++ b/bench/nanobench.h @@ -30,7 +30,7 @@ struct Config { int samples; #if SK_SUPPORT_GPU sk_gpu_test::GrContextFactory::ContextType ctxType; - sk_gpu_test::GrContextFactory::ContextOptions ctxOptions; + sk_gpu_test::GrContextFactory::ContextOverrides ctxOverrides; bool useDFText; #else int bogusInt; -- cgit v1.2.3