Remove SkSurface::MakeRenderTargetDirect

src/gpu/SkGpuDevice.h

Index: src/gpu/SkGpuDevice.h
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index 1b41bde3a9c7545315f1b93b4a496755e21744b4..fbbcc4ed2ef3ba5554c0e1ee0521c325c1d46817 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -38,23 +38,12 @@ public:
     };
 
     /**
-     * Creates an SkGpuDevice from a GrRenderTarget.
-     * TODO: rm this factory. It is used by SkSurface::MakeRenderTargetDirect,
-     *       MakeFromBackendTexture, MakeFromBackendRenderTarget,
-     *       and MakeFromBackendTextureAsRenderTarget. Only the first is worrisome.
-     */
-    static sk_sp<SkGpuDevice> Make(sk_sp<GrRenderTarget> target,
-                                   sk_sp<SkColorSpace> colorSpace,
-                                   const SkSurfaceProps*,
-                                   InitContents);
-
-    /**
      * Creates an SkGpuDevice from a GrDrawContext whose backing width/height is
      * different than its actual width/height (e.g., approx-match scratch texture).
      */

[robertphillips, 2016/08/04 13:38:11]

This is an unfortunate side-effect of how SkSurface_gpu operates directly on
SkGpuDevices :(

-    static sk_sp<SkBaseDevice> Make(sk_sp<GrDrawContext> drawContext,
-                                    int width, int height,
-                                    InitContents);
+    static sk_sp<SkGpuDevice> Make(sk_sp<GrDrawContext> drawContext,
+                                   int width, int height,
+                                   InitContents);
 
     /**
      * New device that will create an offscreen renderTarget based on the ImageInfo and
@@ -67,13 +56,6 @@ public:
 
     ~SkGpuDevice() override {}
 
-    SkGpuDevice* cloneDevice(const SkSurfaceProps& props) {
-        SkBaseDevice* dev = this->onCreateDevice(CreateInfo(this->imageInfo(), kPossible_TileUsage,
-                                                            props.pixelGeometry()),
-                                                 nullptr);
-        return static_cast<SkGpuDevice*>(dev);
-    }
-
     GrContext* context() const override { return fContext; }
 
     // set all pixels to 0