Make all SkSurface_* -related devices all have a device

src/image/SkSurface_Gpu.h

Index: src/image/SkSurface_Gpu.h
diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h
index 636bb018d04b2c17417f1788579b02ccac276c97..e3d478501717263ec70ba578eb26def52ed95ddb 100644
--- a/src/image/SkSurface_Gpu.h
+++ b/src/image/SkSurface_Gpu.h
@@ -9,6 +9,7 @@
 #define SkSurface_Gpu_DEFINED
 
 #include "SkSurface_Base.h"
+#include "SkDevice.h"
 
 #if SK_SUPPORT_GPU
 
@@ -36,8 +37,20 @@ public:
      */
     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;
 };