Remove some ancillary users of SkSurface::MakeRenderTargetDirect

experimental/SkV8Example/SkV8Example.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 #include <v8.h>
 #include <include/libplatform/libplatform.h>
@@ skipping 30 matching lines @@
 void application_term() {
     SkEvent::Term();
 }
 
 SkV8ExampleWindow::SkV8ExampleWindow(void* hwnd, JsContext* context)
     : INHERITED(hwnd)
     , fJsContext(context)
 #if SK_SUPPORT_GPU
     , fCurContext(NULL)
     , fCurIntf(NULL)
-    , fCurRenderTarget(NULL)
     , fCurSurface(NULL)
 #endif
 {
     this->setVisibleP(true);
     this->setClipToBounds(false);
 
 #if SK_SUPPORT_GPU
     this->windowSizeChanged();
 #endif
 }
 
 SkV8ExampleWindow::~SkV8ExampleWindow() {
 #if SK_SUPPORT_GPU
     SkSafeUnref(fCurContext);
     SkSafeUnref(fCurIntf);
-    SkSafeUnref(fCurRenderTarget);
     SkSafeUnref(fCurSurface);
 #endif
 }
 
 #if SK_SUPPORT_GPU
 void SkV8ExampleWindow::windowSizeChanged() {
     if (FLAGS_gpu) {
         SkOSWindow::AttachmentInfo attachmentInfo;
         bool result = this->attach(
                 SkOSWindow::kNativeGL_BackEndType, 0, false, &attachmentInfo);
@@ skipping 14 matching lines @@
         desc.fWidth = SkScalarRoundToInt(this->width());
         desc.fHeight = SkScalarRoundToInt(this->height());
         desc.fConfig = kSkia8888_GrPixelConfig;
         desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
         desc.fSampleCnt = attachmentInfo.fSampleCount;
         desc.fStencilBits = attachmentInfo.fStencilBits;
         GrGLint buffer;
         GR_GL_GetIntegerv(fCurIntf, GR_GL_FRAMEBUFFER_BINDING, &buffer);
         desc.fRenderTargetHandle = buffer;
 
-        SkSafeUnref(fCurRenderTarget);
-        fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc);
         SkSafeUnref(fCurSurface);
-        fCurSurface = SkSurface::NewRenderTargetDirect(fCurRenderTarget);
+        fCurSurface = SkSurface::MakeFromBackendRenderTarget(fCurContext, desc,
+                                                             nullptr, nullptr).release();
     }
 }
 #endif
 
 #if SK_SUPPORT_GPU
 SkSurface* SkV8ExampleWindow::createSurface() {
     if (FLAGS_gpu) {
         // Increase the ref count since callers of createSurface put the
         // results in a SkAutoTUnref.
         fCurSurface->ref();
@@ skipping 109 matching lines @@
 
     if (!jsContext->initialize()) {
         printf("Failed to initialize.\n");
         exit(1);
     }
     SkV8ExampleWindow* win = new SkV8ExampleWindow(hwnd, jsContext);
     global->setWindow(win);
 
     return win;
 }