commit 195c05b6d5afbd65f803816938e24eebd51292c8
author Brian Osman <brianosman@google.com> Wed Aug 30 15:14:04 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 30 19:35:27 2017 +0000
tree 09464cb77b796259a4ca0d75a32f8ed4d0dcf85a
parent ad8a43f7698071f00ce024a935b0bc04a4b19a41

Move several GrContextOptions fields behind GR_TEST_UTILS

Bug: skia:
Change-Id: I35bc08ad72fb94d8e47fe342d314c4496b954226
Reviewed-on: https://skia-review.googlesource.com/40881
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tools/flags/SkCommonFlagsPathRenderer.h

diff --git a/tools/flags/SkCommonFlagsPathRenderer.h b/tools/flags/SkCommonFlagsPathRenderer.h
index 8ed74aa..02b5d17 100644
--- a/tools/flags/SkCommonFlagsPathRenderer.h
+++ b/tools/flags/SkCommonFlagsPathRenderer.h
@@ -10,7 +10,7 @@
 
 #if SK_SUPPORT_GPU
 
-#include "GrContextOptions.h"
+#include "GrTypesPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkTypes.h"
 
@@ -22,8 +22,7 @@
                   "[[~]all [~]default [~]dashline [~]nvpr [~]msaa [~]aaconvex "    \
                   "[~]aalinearizing [~]small [~]tess]")
 
-inline GrContextOptions::GpuPathRenderers get_named_pathrenderers_flags(const char* name) {
-    using GpuPathRenderers = GrContextOptions::GpuPathRenderers;
+inline GpuPathRenderers get_named_pathrenderers_flags(const char* name) {
     if (!strcmp(name, "all")) {
         return GpuPathRenderers::kAll;
     } else if (!strcmp(name, "default")) {
@@ -51,8 +50,7 @@
     return GpuPathRenderers::kNone;
 }
 
-inline GrContextOptions::GpuPathRenderers CollectGpuPathRenderersFromFlags() {
-    using GpuPathRenderers = GrContextOptions::GpuPathRenderers;
+inline GpuPathRenderers CollectGpuPathRenderersFromFlags() {
     if (FLAGS_pr.isEmpty()) {
         return GpuPathRenderers::kDefault;
     }