From ecf3dbe8f2987a08b21be1aff61b7fbfbb69640a Mon Sep 17 00:00:00 2001 From: robertphillips Date: Thu, 28 Jul 2016 15:17:34 -0700 Subject: Remove use of MakeRenderTargetDirect from view system Here is the CL that sent me down the SkGammaColorFilter path GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2178353005 Review-Url: https://codereview.chromium.org/2178353005 --- example/HelloWorld.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'example/HelloWorld.h') diff --git a/example/HelloWorld.h b/example/HelloWorld.h index deb56ba699..d3fc7cfb16 100644 --- a/example/HelloWorld.h +++ b/example/HelloWorld.h @@ -33,14 +33,15 @@ public: DeviceType getDeviceType() const { return fType; } protected: - SkSurface* createSurface() override { + sk_sp makeSurface() override { SkSurfaceProps props(INHERITED::getSurfaceProps()); if (kGPU_DeviceType == fType) { - return SkSurface::MakeRenderTargetDirect(fRenderTarget, nullptr, &props).release(); + return fGpuSurface; } - static const SkImageInfo info = SkImageInfo::MakeN32Premul( - SkScalarRoundToInt(this->width()), SkScalarRoundToInt(this->height())); - return fSurface = SkSurface::MakeRaster(info, &props).release(); + const SkImageInfo info = SkImageInfo::MakeN32Premul(SkScalarRoundToInt(this->width()), + SkScalarRoundToInt(this->height())); + fRasterSurface = SkSurface::MakeRaster(info, &props); + return fRasterSurface; } void draw(SkCanvas* canvas) override; @@ -51,7 +52,7 @@ protected: private: bool findNextMatch(); // Set example to the first one that matches FLAGS_match. void setTitle(); - void setUpRenderTarget(); + void setUpGpuBackedSurface(); bool onHandleChar(SkUnichar unichar) override; void tearDownBackend(); @@ -60,9 +61,9 @@ private: // support framework DeviceType fType; - SkSurface* fSurface; + sk_sp fRasterSurface; GrContext* fContext; - GrRenderTarget* fRenderTarget; + sk_sp fGpuSurface; AttachmentInfo fAttachmentInfo; const GrGLInterface* fInterface; -- cgit v1.2.3