Remove SkSurface::MakeRenderTargetDirect

src/gpu/SkGpuDevice.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
 
@@ skipping 20 matching lines @@
  *  canvas.
  */
 class SK_API SkGpuDevice : public SkBaseDevice {
 public:
     enum InitContents {
         kClear_InitContents,
         kUninit_InitContents
     };
 
     /**
-     * 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
      * sampleCount. The Budgeted param controls whether the device's backing store counts against
      * the resource cache budget. On failure, returns nullptr.
      */
     static sk_sp<SkGpuDevice> Make(GrContext*, SkBudgeted, const SkImageInfo&,
                                    int sampleCount, GrSurfaceOrigin, 
                                    const SkSurfaceProps*, InitContents);
 
     ~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
     void clearAll();
 
     void replaceDrawContext(bool shouldRetainContent);
 
     GrDrawContext* accessDrawContext() override;
 
     SkImageInfo imageInfo() const override {
@@ skipping 184 matching lines @@
                                                 int sampleCount,
                                                 GrSurfaceOrigin,
                                                 const SkSurfaceProps*);
 
     friend class GrAtlasTextContext;
     friend class SkSurface_Gpu;      // for access to surfaceProps
     typedef SkBaseDevice INHERITED;
 };
 
 #endif