Tighten up SkSpecialSurface factory functions

src/core/SkSpecialSurface.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #ifndef SkSpecialSurface_DEFINED
 #define SkSpecialSurface_DEFINED
 
@@ skipping 34 matching lines @@
     *  Returns an image of the current state of the surface pixels up to this
     *  point. The canvas returned by 'getCanvas' becomes invalidated by this
     *  call and no more drawing to this surface is allowed.
     *
     *  Note: the caller inherits a ref from this call that must be balanced
     */
     sk_sp<SkSpecialImage> makeImageSnapshot();
 
 #if SK_SUPPORT_GPU
     /**
-     *  Use an existing (renderTarget-capable) GrTexture as the backing store.
-     */
-    static sk_sp<SkSpecialSurface> MakeFromTexture(const SkIRect& subset, sk_sp<GrTexture>,
-                                                   const SkSurfaceProps* = nullptr);
-
-    /**
      *  Allocate a new GPU-backed SkSpecialSurface. If the requested surface cannot
      *  be created, nullptr will be returned.
      */
-    static sk_sp<SkSpecialSurface> MakeRenderTarget(GrContext*, const GrSurfaceDesc&,
-                                                    const SkSurfaceProps* = nullptr);
+    static sk_sp<SkSpecialSurface> MakeRenderTarget(GrContext*,
+                                                    int width, int height,
+                                                    GrPixelConfig config);
 #endif
 
     /**
      * Use and existing SkBitmap as the backing store.
      */
     static sk_sp<SkSpecialSurface> MakeFromBitmap(const SkIRect& subset, SkBitmap& bm,
                                                   const SkSurfaceProps* = nullptr);
 
     /**
      *  Return a new CPU-backed surface, with the memory for the pixels automatically
@@ skipping 13 matching lines @@
     const SkIRect& subset() const { return fSubset; }
 
 private:
     const SkSurfaceProps fProps;
     const SkIRect        fSubset;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif