Merge GrGpuObject and GrCacheable.

include/gpu/GrTexture.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTexture_DEFINED
 #define GrTexture_DEFINED
 
 #include "GrSurface.h"
+#include "GrRenderTarget.h"
 #include "SkPoint.h"
-#include "GrRenderTarget.h"
+#include "SkRefCnt.h"
 
 class GrResourceKey;
 class GrTextureParams;
 class GrTextureImpl;
 
 class GrTexture : public GrSurface {
 public:
     /**
      *  Approximate number of bytes used by the texture
      */
@@ skipping 186 matching lines @@
         fTexture.reset(SkSafeRef(texture));
         return texture;
     }
 
 private:
     SkAutoTUnref<GrTexture> fTexture;
     SkIPoint                fOffset;
 };
 
 #endif