Remove use of MakeRenderTargetDirect from view system

example/HelloWorld.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include "HelloWorld.h"
@@ skipping 11 matching lines @@
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
 }
 
 HelloWorldWindow::HelloWorldWindow(void* hwnd)
     : INHERITED(hwnd) {
     fType = kGPU_DeviceType;
-    fRenderTarget = NULL;
     fRotationAngle = 0;
     this->setTitle();
     this->setUpBackend();
 }
 
 HelloWorldWindow::~HelloWorldWindow() {
     tearDownBackend();
 }
 
 void HelloWorldWindow::tearDownBackend() {
     SkSafeUnref(fContext);
     fContext = NULL;
 
     SkSafeUnref(fInterface);
     fInterface = NULL;
 
-    SkSafeUnref(fRenderTarget);
-    fRenderTarget = NULL;
+    fGpuSurface = nullptr;
 
     INHERITED::release();
 }
 
 void HelloWorldWindow::setTitle() {
     SkString title("Hello World ");
     title.appendf(fType == kRaster_DeviceType ? "raster" : "opengl");
     INHERITED::setTitle(title.c_str());
 }
 
 bool HelloWorldWindow::setUpBackend() {
     this->setVisibleP(true);
     this->setClipToBounds(false);
 
     bool result = attach(kNativeGL_BackEndType, 0 /*msaa*/, false, &fAttachmentInfo);
     if (false == result) {
         SkDebugf("Not possible to create backend.\n");
         release();
         return false;
     }
 
     fInterface = GrGLCreateNativeInterface();
-
     SkASSERT(NULL != fInterface);
 
     fContext = GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fInterface);
     SkASSERT(NULL != fContext);
 
-    this->setUpRenderTarget();
+    this->setUpGpuBackedSurface();
     return true;
 }
 
-void HelloWorldWindow::setUpRenderTarget() {
-    SkSafeUnref(fRenderTarget);
-    fRenderTarget = this->renderTarget(fAttachmentInfo, fInterface, fContext);
+void HelloWorldWindow::setUpGpuBackedSurface() {
+    fGpuSurface = this->makeGpuBackedSurface(fAttachmentInfo, fInterface, fContext);
 }
 
 void HelloWorldWindow::drawContents(SkCanvas* canvas) {
     // Clear background
     canvas->drawColor(SK_ColorWHITE);
 
     SkPaint paint;
     paint.setColor(SK_ColorRED);
 
     // Draw a rectangle with red paint
@@ skipping 39 matching lines @@
     }
     canvas->rotate(fRotationAngle);
 
     // Draw the text:
     canvas->drawText(message, strlen(message), 0, 0, paint);
 
     canvas->restore();
 }
 
 void HelloWorldWindow::draw(SkCanvas* canvas) {
-    drawContents(canvas);
+    this->drawContents(canvas);
     // in case we have queued drawing calls
     fContext->flush();
     // Invalidate the window to force a redraw. Poor man's animation mechanism.
     this->inval(NULL);
 
     if (kRaster_DeviceType == fType) {
         // need to send the raster bits to the (gpu) window
-        sk_sp<SkImage> snap = fSurface->makeImageSnapshot();
+        sk_sp<SkImage> snap = fRasterSurface->makeImageSnapshot();
         SkPixmap pmap;
         if (snap->peekPixels(&pmap)) {
             const SkImageInfo& info = pmap.info();
-            fRenderTarget->writePixels(0, 0, snap->width(), snap->height(),
-                                       SkImageInfo2GrPixelConfig(info, *fContext->caps()),
-                                       pmap.addr(), pmap.rowBytes(),
-                                       GrContext::kFlushWrites_PixelOp);
+
+            SkCanvas* canvas = fGpuSurface->getCanvas();
+
+            canvas->writePixels(info, pmap.addr(), pmap.rowBytes(), 0, 0);
+            canvas->flush();
         }
     }
     INHERITED::present();
 }
 
 void HelloWorldWindow::onSizeChange() {
-    setUpRenderTarget();
+    this->setUpGpuBackedSurface();
 }
 
 bool HelloWorldWindow::onHandleChar(SkUnichar unichar) {
     if (' ' == unichar) {
         fType = fType == kRaster_DeviceType ? kGPU_DeviceType: kRaster_DeviceType;
         tearDownBackend();
         setUpBackend();
         this->setTitle();
         this->inval(NULL);
     }
     return true;
 }
 
 SkOSWindow* create_sk_window(void* hwnd, int , char** ) {
     return new HelloWorldWindow(hwnd);
 }