Remove some ancillary users of SkSurface::MakeRenderTargetDirect

debugger/QT/SkGLWidget.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkGLWidget.h"
@@ skipping 20 matching lines @@
     }
     if (!fCurIntf) {
         return;
     }
     // The call may come multiple times, for example after setSampleCount().  The QGLContext will be
     // different, but we do not have a mechanism to catch the destroying of QGLContext, so that
     // proper resource cleanup could be made.
     if (fCurContext) {
         fCurContext->abandonContext();
     }
-    fGpuDevice.reset(nullptr);
-    fCanvas.reset(nullptr);
+
+    fGpuSurface = nullptr;
+    fCanvas = nullptr;
 
     fCurContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext) fCurIntf.get()));
 }
 
 void SkGLWidget::createRenderTarget() {
     if (!fCurContext) {
         return;
     }
 
     glDisable(GL_SCISSOR_TEST);
     glStencilMask(0xffffffff);
     glClearStencil(0);
     glClear(GL_STENCIL_BUFFER_BIT);
     fCurContext->resetContext();
 
-    fGpuDevice.reset(nullptr);
-    fCanvas.reset(nullptr);
-
     GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height());
     desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-    sk_sp<GrRenderTarget> curRenderTarget(
-            fCurContext->textureProvider()->wrapBackendRenderTarget(desc));
-    SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
-    fGpuDevice.reset(SkGpuDevice::Make(std::move(curRenderTarget), nullptr, &props,
-                                       SkGpuDevice::kUninit_InitContents).release());
-    fCanvas.reset(new SkCanvas(fGpuDevice));
+
+    fGpuSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, desc, nullptr);
+    fCanvas = fGpuSurface->getCanvas();
 }
 
 void SkGLWidget::resizeGL(int w, int h) {
     SkASSERT(w == this->width() && h == this->height());
     this->createRenderTarget();
 }
 
 void SkGLWidget::paintGL() {
     if (!this->isHidden() && fCanvas) {
         fCurContext->resetContext();
-        fDebugger->draw(fCanvas.get());
+        fDebugger->draw(fCanvas);
         // TODO(chudy): Implement an optional flush button in Gui.
         fCanvas->flush();
         Q_EMIT drawComplete();
     }
 }
 
 GrBackendRenderTargetDesc SkGLWidget::getDesc(int w, int h) {
     GrBackendRenderTargetDesc desc;
     desc.fWidth = SkScalarRoundToInt(this->width());
     desc.fHeight = SkScalarRoundToInt(this->height());
     desc.fConfig = kSkia8888_GrPixelConfig;
     GR_GL_GetIntegerv(fCurIntf, GR_GL_SAMPLES, &desc.fSampleCnt);
     GR_GL_GetIntegerv(fCurIntf, GR_GL_STENCIL_BITS, &desc.fStencilBits);
     GrGLint buffer;
     GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer);
     desc.fRenderTargetHandle = buffer;
 
     return desc;
 }
 
 #endif