Fix unref order in SkGpuDevice

src/gpu/SkGpuDevice.h

Index: src/gpu/SkGpuDevice.h
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index a35e92bc250ec01a93d7ddeb5458e4db9c781c61..a1e2fc8a2aa41e1ee7cd798feb2e80eacf8fa00a 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -15,6 +15,7 @@
 #include "SkPicture.h"
 #include "SkRegion.h"
 #include "SkSurface.h"
+#include "GrDrawContext.h"
 #include "GrContext.h"
 #include "GrSurfacePriv.h"
 
@@ -53,7 +54,7 @@ public:
     static SkGpuDevice* Create(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                int sampleCount, const SkSurfaceProps*, InitContents);
 

[robertphillips, 2016/01/07 22:08:39]

Shouldn't this actually be override ?

-    virtual ~SkGpuDevice();
+    virtual ~SkGpuDevice() {}
 
     SkGpuDevice* cloneDevice(const SkSurfaceProps& props) {
         SkBaseDevice* dev = this->onCreateDevice(CreateInfo(this->imageInfo(), kPossible_TileUsage,
@@ -153,12 +154,13 @@ protected:
                                           const SkMatrix*, const SkPaint*) override;
 
 private:

[robertphillips, 2016/01/07 22:08:39]

// We want these unreffed in DrawContext, RenderTarget, GrContext order.

?

-    GrContext*                      fContext;
+    SkAutoTUnref<GrContext>         fContext;
+    SkAutoTUnref<GrRenderTarget>    fRenderTarget;
+    SkAutoTUnref<GrDrawContext>     fDrawContext;
+
     SkAutoTUnref<const SkClipStack> fClipStack;
     SkIPoint                        fClipOrigin;
-    GrClip                          fClip;
-    SkAutoTUnref<GrDrawContext>     fDrawContext;
-    GrRenderTarget*                 fRenderTarget;
+    GrClip                          fClip;;
     // remove when our clients don't rely on accessBitmap()
     SkBitmap                        fLegacyBitmap;
     bool                            fNeedClear;