Partially rolled forward the SkGrPixelRef changes
http://codereview.appspot.com/6354060/
git-svn-id: http://skia.googlecode.com/svn/trunk@4415 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/SkGrTexturePixelRef.h b/include/gpu/SkGrTexturePixelRef.h
index e4f521c..ffa4bef 100644
--- a/include/gpu/SkGrTexturePixelRef.h
+++ b/include/gpu/SkGrTexturePixelRef.h
@@ -11,81 +11,10 @@
#ifndef SkGrTexturePixelRef_DEFINED
#define SkGrTexturePixelRef_DEFINED
-#include "SkBitmap.h"
-#include "SkPixelRef.h"
-#include "GrTexture.h"
-#include "GrRenderTarget.h"
+#include "SkGrPixelRef.h"
-
-/**
- * Common baseclass that implements onLockPixels() by calling onReadPixels().
- * Since it has a copy, it always returns false for onLockPixelsAreWritable().
- */
-class SK_API SkROLockPixelsPixelRef_Deprecated : public SkPixelRef {
-public:
- SkROLockPixelsPixelRef_Deprecated();
- virtual ~SkROLockPixelsPixelRef_Deprecated();
-
-protected:
- // override from SkPixelRef
- virtual void* onLockPixels(SkColorTable** ptr);
- virtual void onUnlockPixels();
- virtual bool onLockPixelsAreWritable() const; // return false;
-
-private:
- SkBitmap fBitmap;
- typedef SkPixelRef INHERITED;
-};
-
-/**
- * PixelRef that wraps a GrTexture
- */
-class SK_API SkGrTexturePixelRef : public SkROLockPixelsPixelRef_Deprecated {
-public:
- SkGrTexturePixelRef(GrTexture*);
- virtual ~SkGrTexturePixelRef();
-
- // override from SkPixelRef
- virtual SkGpuTexture* getTexture();
-
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-
-protected:
- // override from SkPixelRef
- virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset);
-
- // override from SkPixelRef
- virtual SkPixelRef* deepCopy(SkBitmap::Config dstConfig) SK_OVERRIDE;
-
-private:
- GrTexture* fTexture;
- typedef SkROLockPixelsPixelRef_Deprecated INHERITED;
-};
-
-/**
- * PixelRef that wraps a GrRenderTarget
- */
-class SK_API SkGrRenderTargetPixelRef : public SkROLockPixelsPixelRef_Deprecated {
-public:
- SkGrRenderTargetPixelRef(GrRenderTarget* rt);
- virtual ~SkGrRenderTargetPixelRef();
-
- // override from SkPixelRef
- virtual SkGpuTexture* getTexture();
-
- SK_DECLARE_UNFLATTENABLE_OBJECT()
-
-protected:
- // override from SkPixelRef
- virtual bool onReadPixels(SkBitmap* dst, const SkIRect* subset);
-
- // override from SkPixelRef
- virtual SkPixelRef* deepCopy(SkBitmap::Config dstConfig) SK_OVERRIDE;
-
-private:
- GrRenderTarget* fRenderTarget;
- typedef SkROLockPixelsPixelRef_Deprecated INHERITED;
-};
+typedef SkGrPixelRef SkGrTexturePixelRef;
+typedef SkGrPixelRef SkGrRenderTargetPixelRef;
#endif