Make all SkSurface_* -related devices all have a device

src/image/SkSurface_Gpu.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkSurface_Gpu_DEFINED
 #define SkSurface_Gpu_DEFINED
 
 #include "SkSurface_Base.h"
+#include "SkDevice.h"
 
 #if SK_SUPPORT_GPU
 
 class SkGpuDevice;
 
 class SkSurface_Gpu : public SkSurface_Base {
 public:
     SK_DECLARE_INST_COUNT(SkSurface_Gpu)
 
     SkSurface_Gpu(SkGpuDevice*);
     virtual ~SkSurface_Gpu();
 
     SkCanvas* onNewCanvas() SK_OVERRIDE;
     SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE;
     SkImage* onNewImageSnapshot(Budgeted) SK_OVERRIDE;
     virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y,
                         const SkPaint*) SK_OVERRIDE;
     void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE;
     void onDiscard() SK_OVERRIDE;
 
     SkGpuDevice* getDevice() { return fDevice; }
 
     /** Creates a backing store for a surface.
      * The target can be used as the render target of a gpu device.
      */
     static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                               int sampleCount);
+
+    /** Creates a surface that is attached to a device.
+     * The device will own the reference to the surface, and the surface will go out of scope when
+     * the device goes out of scope.  Note: This function is deprecated, it will be renamed to
+     * SkSurface_Gpu* createCompatibleSurface(const SkBaseDevice::CreateInfo& cinfo)
+     */
+    SkGpuDevice* createCompatibleDeviceDeprecated(const SkBaseDevice::CreateInfo& cinfo);
+
 private:
+    enum ReverseOwnershipDeprecated { kReverseOwnershipDeprecated };
+    SkSurface_Gpu(SkGpuDevice*, ReverseOwnershipDeprecated);
+
     SkGpuDevice* fDevice;
+    bool fOwnsDevice;
 
     typedef SkSurface_Base INHERITED;
 };
 
 #endif // SK_SUPPORT_GPU
 
 #endif // SkSurface_Gpu_DEFINED