Make sk_app::WindowContext directly create a SkSurface without an intermediate GrRenderTarget

tools/viewer/sk_app/GLWindowContext.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 "GrContext.h"
 #include "SkSurface.h"
@@ skipping 65 matching lines @@
             GrBackendRenderTargetDesc desc;
             desc.fWidth = this->fWidth;
             desc.fHeight = this->fHeight;
             desc.fConfig = fPixelConfig;
             desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
             desc.fSampleCnt = fSampleCount;
             desc.fStencilBits = fStencilBits;
             GrGLint buffer;
             GR_GL_CALL(fBackendContext, GetIntegerv(GR_GL_FRAMEBUFFER_BINDING, &buffer));
             desc.fRenderTargetHandle = buffer;
-            fRenderTarget.reset(fContext->textureProvider()->wrapBackendRenderTarget(desc));
 
-            fSurface = this->createRenderSurface(fRenderTarget, fActualColorBits);
+            fSurface = this->createRenderSurface(desc, fActualColorBits);
         }
     }
 
     return fSurface;
 }
 
 void GLWindowContext::swapBuffers() {
     this->presentRenderSurface(fSurface, fRenderTarget, fActualColorBits);
     this->onSwapBuffers();
 }
 
 void GLWindowContext::resize(uint32_t w, uint32_t h) {
     this->destroyContext();
 
     this->initializeContext(nullptr, fDisplayParams);
 }
 
 void GLWindowContext::setDisplayParams(const DisplayParams& params) {
     this->destroyContext();
 
     this->initializeContext(nullptr, params);
 }
 
 }   //namespace sk_app