Remove use of MakeRenderTargetDirect from view system

include/views/SkWindow.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkWindow_DEFINED
 #define SkWindow_DEFINED
 
@@ skipping 60 matching lines @@
     const SkTDArray<SkOSMenu*>* getMenus() { return &fMenus; }
 
     const char* getTitle() const { return fTitle.c_str(); }
     void    setTitle(const char title[]);
 
     const SkMatrix& getMatrix() const { return fMatrix; }
     void    setMatrix(const SkMatrix&);
     void    preConcat(const SkMatrix&);
     void    postConcat(const SkMatrix&);
 
-    virtual SkSurface* createSurface();
+    virtual sk_sp<SkSurface> makeSurface();
 
 protected:
     virtual bool onEvent(const SkEvent&);
     virtual bool onDispatchClick(int x, int y, Click::State, void* owner, unsigned modi);
     // called if part of our bitmap is invalidated
     virtual void onHandleInval(const SkIRect&);
     virtual bool onHandleChar(SkUnichar);
     virtual bool onHandleKey(SkKey);
     virtual bool onHandleKeyUp(SkKey);
     virtual void onAddMenu(const SkOSMenu*) {};
     virtual void onUpdateMenu(const SkOSMenu*) {};
     virtual void onSetTitle(const char title[]) {}
 
     // overrides from SkView
     virtual bool handleInval(const SkRect*);
     virtual bool onGetFocusView(SkView** focus) const;
     virtual bool onSetFocusView(SkView* focus);
 
 #if SK_SUPPORT_GPU
-    GrRenderTarget* renderTarget(const AttachmentInfo& attachmentInfo,
-                                 const GrGLInterface* , GrContext* grContext);
+    sk_sp<SkSurface> makeGpuBackedSurface(const AttachmentInfo& attachmentInfo,
+                                          const GrGLInterface* , GrContext* grContext);
 #endif
 
 private:
     SkSurfaceProps  fSurfaceProps;
     SkBitmap    fBitmap;
     SkRegion    fDirtyRgn;
 
     SkTDArray<Click*>       fClicks; // to track clicks
 
     SkTDArray<SkOSMenu*>    fMenus;
@@ skipping 17 matching lines @@
     #include "SkOSWindow_Win.h"
 #elif defined(SK_BUILD_FOR_ANDROID)
     #error Android does not support SkOSWindow and SampleApp. Please use Viewer instead.
 #elif defined(SK_BUILD_FOR_UNIX)
     #include "SkOSWindow_Unix.h"
 #elif defined(SK_BUILD_FOR_IOS)
     #include "SkOSWindow_iOS.h"
 #endif
 
 #endif