Revert of Store context options on caps.

tools/PictureRenderer.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef PictureRenderer_DEFINED
 #define PictureRenderer_DEFINED
 
@@ skipping 10 matching lines @@
 #include "SkTDArray.h"
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #include "GrContext.h"
 #endif
 
 #include "image_expectations.h"
 
-struct GrContextOptions;
 class SkBitmap;
 class SkCanvas;
 class SkGLContext;
 class SkThread;
 
 namespace sk_tools {
 
 class TiledPictureRenderer;
 
 class PictureRenderer : public SkRefCnt {
@@ skipping 344 matching lines @@
             default:
                 return NULL;
         }
         return fGrContextFactory.getGLContext(glContextType);
     }
 
     GrContext* getGrContext() {
         return fGrContext;
     }
 
-    const GrContextOptions& getGrContextOptions() {
+    const GrContext::Options& getGrContextOptions() {
         return fGrContextFactory.getGlobalOptions();
     }
 #endif
 
     SkCanvas* getCanvas() {
         return fCanvas;
     }
 
     const SkPicture* getPicture() {
         return fPicture;
     }
 
 #if SK_SUPPORT_GPU
-    explicit PictureRenderer(const GrContextOptions &opts)
+    explicit PictureRenderer(const GrContext::Options &opts)
 #else
     PictureRenderer()
 #endif
         : fJsonSummaryPtr(NULL)
         , fDeviceType(kBitmap_DeviceType)
         , fEnableWrites(false)
         , fBBoxHierarchyType(kNone_BBoxHierarchyType)
         , fScaleFactor(SK_Scalar1)
 #if SK_SUPPORT_GPU
         , fGrContextFactory(opts)
@@ skipping 71 matching lines @@
     typedef SkRefCnt INHERITED;
 };
 
 /**
  * This class does not do any rendering, but its render function executes recording, which we want
  * to time.
  */
 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;
 
     SkString getPerIterTimeFormat() override { return SkString("%.4f"); }
 
     SkString getNormalTimeFormat() override { return SkString("%6.4f"); }
 
 protected:
     SkCanvas* setupCanvas(int width, int height) override;
 
 private:
     SkString getConfigNameInternal() override;
 
     typedef PictureRenderer INHERITED;
 };
 
 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;
 
 private:
     SkString getConfigNameInternal() override;
 
     typedef PictureRenderer INHERITED;
 };
 
 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,
                       const SkString* writePath,
                       const SkString* mismatchPath,
                       const SkString* inputFilename,
                       bool useChecksumBasedFilenames,
                       bool useMultiPictureDraw) override;
 
     bool render(SkBitmap** out = NULL) override;
 
 private:
     SkString getConfigNameInternal() override;
 
     typedef PictureRenderer INHERITED;
 };
 
 class TiledPictureRenderer : public PictureRenderer {
 public:
 #if SK_SUPPORT_GPU
-    TiledPictureRenderer(const GrContextOptions &opts);
+    TiledPictureRenderer(const GrContext::Options &opts);
 #else
     TiledPictureRenderer();
 #endif
 
     virtual void init(const SkPicture* pict,
                       const SkString* writePath,
                       const SkString* mismatchPath,
                       const SkString* inputFilename,
                       bool useChecksumBasedFilenames,
                       bool useMultiPictureDraw) override;
@@ skipping 114 matching lines @@
     typedef PictureRenderer INHERITED;
 };
 
 /**
  * This class does not do any rendering, but its render function executes turning an SkPictureRecord
  * into an SkPicturePlayback, which we want to time.
  */
 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;
 
     bool render(SkBitmap** out = NULL) override;
 
     SkString getPerIterTimeFormat() override { return SkString("%.4f"); }
 
     SkString getNormalTimeFormat() override { return SkString("%6.4f"); }
 
 private:
     SkAutoTDelete<SkPictureRecorder> fRecorder;
 
     SkString getConfigNameInternal() override;
 
     typedef PictureRenderer INHERITED;
 };
 
 #if SK_SUPPORT_GPU
-extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContextOptions& opts);
+extern PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts);
 #else
 extern PictureRenderer* CreateGatherPixelRefsRenderer();
 #endif
 
 }
 
 #endif  // PictureRenderer_DEFINED