diff options
| author |  bsalomon <bsalomon@google.com> | 2015-05-22 12:41:05 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-22 12:41:05 -0700 |
| commit | 08bf86d1b7b03cc6829f2488d9adcb0502e84b97 (patch) | |
| tree | 8f500d64bce505989fec53c8e4164cdda44df363 /tools/PictureRenderer.h | |
| parent | f28cff71db2cbb1ff18a8fbf1e80ca761d1f69bc (diff) | |
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
Diffstat (limited to 'tools/PictureRenderer.h')
| -rw-r--r-- | tools/PictureRenderer.h | 17 |
1 files changed, 8 insertions, 9 deletions
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 |