Tighten up SkSpecialSurface factory functions

src/core/SkSpecialSurface.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
@@ skipping 95 matching lines @@
 }
 
 #if SK_SUPPORT_GPU
 ///////////////////////////////////////////////////////////////////////////////
 #include "GrContext.h"
 #include "SkGpuDevice.h"
 
 class SkSpecialSurface_Gpu : public SkSpecialSurface_Base {
 public:
     SkSpecialSurface_Gpu(sk_sp<GrTexture> texture,
+                         int width, int height,
                          const SkIRect& subset,
                          const SkSurfaceProps* props)
         : INHERITED(subset, props)
         , fTexture(std::move(texture)) {
 
         SkASSERT(fTexture->asRenderTarget());
 
-        SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(fTexture->asRenderTarget(), props,
-                                                             SkGpuDevice::kUninit_InitContents));
+        sk_sp<SkGpuDevice> device(SkGpuDevice::Create(fTexture->asRenderTarget(), width, height,
+                                                      props,
+                                                      SkGpuDevice::kUninit_InitContents));
         if (!device) {
             return;
         }
 
-        fCanvas.reset(new SkCanvas(device));
+        fCanvas.reset(new SkCanvas(device.get()));
         fCanvas->clipRect(SkRect::Make(subset));
     }
 
     ~SkSpecialSurface_Gpu() override { }
 
     sk_sp<SkSpecialImage> onMakeImageSnapshot() override {
         // Note: we are intentionally zeroing out 'fTexture' here
         return SkSpecialImage::MakeFromGpu(this->subset(),
                                            kNeedNewImageUniqueID_SpecialImage,
                                            std::move(fTexture),
                                            &this->props());
     }
 
 private:
     sk_sp<GrTexture> fTexture;
 
     typedef SkSpecialSurface_Base INHERITED;
 };
 
-sk_sp<SkSpecialSurface> SkSpecialSurface::MakeFromTexture(const SkIRect& subset,
-                                                          sk_sp<GrTexture> texture,
-                                                          const SkSurfaceProps* props) {
-    if (!texture->asRenderTarget()) {
+sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrContext* context,
+                                                           int width, int height,
+                                                           GrPixelConfig config) {
+    if (!context) {
         return nullptr;
     }
 
-    return sk_make_sp<SkSpecialSurface_Gpu>(std::move(texture), subset, props);
-}
+    GrSurfaceDesc desc;
+    desc.fFlags = kRenderTarget_GrSurfaceFlag;
+    desc.fWidth = width;
+    desc.fHeight = height;
+    desc.fConfig = config;
 
-sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrContext* context,
-                                                           const GrSurfaceDesc& desc,
-                                                           const SkSurfaceProps* props) {
-    if (!context || !SkToBool(desc.fFlags & kRenderTarget_GrSurfaceFlag)) {
+    sk_sp<GrTexture> tex(context->textureProvider()->createApproxTexture(desc));
+    if (!tex) {
         return nullptr;
     }
 
-    sk_sp<GrTexture> temp(context->textureProvider()->createApproxTexture(desc));
-    if (!temp) {
-        return nullptr;
-    }
+    const SkIRect subset = SkIRect::MakeWH(width, height);
 
-    const SkIRect subset = SkIRect::MakeWH(desc.fWidth, desc.fHeight);
-
-    return sk_make_sp<SkSpecialSurface_Gpu>(std::move(temp), subset, props);
+    return sk_make_sp<SkSpecialSurface_Gpu>(std::move(tex), width, height, subset, nullptr);
 }
 
 #endif