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

5 files changed, 12 insertions, 15 deletions

diff --git a/tools/CopyTilesRenderer.cpp b/tools/CopyTilesRenderer.cpp
index bc1e32ec11..6f95da758b 100644
--- a/tools/CopyTilesRenderer.cpp
+++ b/tools/CopyTilesRenderer.cpp
@@ -18,7 +18,7 @@
 
 namespace sk_tools {
 #if SK_SUPPORT_GPU
-    CopyTilesRenderer::CopyTilesRenderer(const GrContextOptions& opts, int x, int y)
+    CopyTilesRenderer::CopyTilesRenderer(const GrContext::Options& opts, int x, int y)
     : INHERITED(opts)
     , fXTilesPerLargeTile(x)
     , fYTilesPerLargeTile(y) { }
diff --git a/tools/CopyTilesRenderer.h b/tools/CopyTilesRenderer.h
index 5ff4175eed..3d9a1eb18c 100644
--- a/tools/CopyTilesRenderer.h
+++ b/tools/CopyTilesRenderer.h
@@ -11,7 +11,6 @@
 #include "PictureRenderer.h"
 #include "SkTypes.h"
 
-struct GrContextOptions;
 class SkPicture;
 class SkString;
 
@@ -24,7 +23,7 @@ namespace sk_tools {
 
     public:
 #if SK_SUPPORT_GPU
-        CopyTilesRenderer(const GrContextOptions &opts, int x, int y);
+        CopyTilesRenderer(const GrContext::Options &opts, int x, int y);
 #else
         CopyTilesRenderer(int x, int y);
 #endif
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 0875c5ab65..93701baed9 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -465,7 +465,7 @@ SkString SimplePictureRenderer::getConfigNameInternal() {
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
-TiledPictureRenderer::TiledPictureRenderer(const GrContextOptions& opts)
+TiledPictureRenderer::TiledPictureRenderer(const GrContext::Options& opts)
     : INHERITED(opts)
     , fTileWidth(kDefaultTileWidth)
 #else
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index fadf97085f..e1434686c6 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -28,7 +28,6 @@
 
 #include "image_expectations.h"
 
-struct GrContextOptions;
 class SkBitmap;
 class SkCanvas;
 class SkGLContext;
@@ -393,7 +392,7 @@ public:
         return fGrContext;
     }
 
-    const GrContextOptions& getGrContextOptions() {
+    const GrContext::Options& getGrContextOptions() {
         return fGrContextFactory.getGlobalOptions();
     }
 #endif
@@ -407,7 +406,7 @@ public:
     }
 
 #if SK_SUPPORT_GPU
-    explicit PictureRenderer(const GrContextOptions &opts)
+    explicit PictureRenderer(const GrContext::Options &opts)
 #else
     PictureRenderer()
 #endif
@@ -499,7 +498,7 @@ private:
 class RecordPictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    RecordPictureRenderer(const GrContextOptions &opts) : INHERITED(opts) { }
+    RecordPictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { }
 #endif
 
     bool render(SkBitmap** out = NULL) override;
@@ -520,7 +519,7 @@ private:
 class PipePictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    PipePictureRenderer(const GrContextOptions &opts) : INHERITED(opts) { }
+    PipePictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { }
 #endif
 
     bool render(SkBitmap** out = NULL) override;
@@ -534,7 +533,7 @@ private:
 class SimplePictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    SimplePictureRenderer(const GrContextOptions &opts) : INHERITED(opts) { }
+    SimplePictureRenderer(const GrContext::Options &opts) : INHERITED(opts) { }
 #endif
 
     virtual void init(const SkPicture* pict,
@@ -555,7 +554,7 @@ private:
 class TiledPictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    TiledPictureRenderer(const GrContextOptions &opts);
+    TiledPictureRenderer(const GrContext::Options &opts);
 #else
     TiledPictureRenderer();
 #endif
@@ -690,7 +689,7 @@ private:
 class PlaybackCreationRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    PlaybackCreationRenderer(const GrContextOptions &opts) : INHERITED(opts) { }
+    PlaybackCreationRenderer(const GrContext::Options &opts) : INHERITED(opts) { }
 #endif
 
     void setup() override;
@@ -710,7 +709,7 @@ private:
 };
 
 #if SK_SUPPORT_GPU
-extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContextOptions& opts);
+extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts);
 #else
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 #endif
diff --git a/tools/PictureRenderingFlags.cpp b/tools/PictureRenderingFlags.cpp
index 0cec3e17be..82097e9819 100644
--- a/tools/PictureRenderingFlags.cpp
+++ b/tools/PictureRenderingFlags.cpp
@@ -8,7 +8,6 @@
 #include "PictureRenderingFlags.h"
 
 #include "CopyTilesRenderer.h"
-#include "GrContextOptions.h"
 #include "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SkCommandLineFlags.h"
@@ -95,7 +94,7 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
     const char* mode = NULL;
 
 #if SK_SUPPORT_GPU
-    GrContextOptions grContextOpts;
+    GrContext::Options grContextOpts;
     grContextOpts.fDrawPathToCompressedTexture = FLAGS_gpuCompressAlphaMasks;
   #define RENDERER_ARGS (grContextOpts)
 #else