Pseudo-reverted r4396 (SkGrPixelRef files are still in source pool but are unused)
git-svn-id: http://skia.googlecode.com/svn/trunk@4402 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index ee0d3c1..c6f377d 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -14,7 +14,7 @@
#include "GrDefaultTextContext.h"
#include "GrTextContext.h"
-#include "SkGrPixelRef.h"
+#include "SkGrTexturePixelRef.h"
#include "SkColorFilter.h"
#include "SkDrawProcs.h"
@@ -198,9 +198,9 @@
// are ensuring that both objects will live as long as the pixel ref.
SkPixelRef* pr;
if (fTexture) {
- pr = new SkGrPixelRef(fTexture);
+ pr = new SkGrTexturePixelRef(fTexture);
} else {
- pr = new SkGrPixelRef(fRenderTarget);
+ pr = new SkGrRenderTargetPixelRef(fRenderTarget);
}
this->setPixelRef(pr, 0)->unref();
@@ -243,7 +243,7 @@
GrAssert(NULL != fRenderTarget);
// wrap the bitmap with a pixelref to expose our texture
- SkGrPixelRef* pr = new SkGrPixelRef(fTexture);
+ SkGrTexturePixelRef* pr = new SkGrTexturePixelRef(fTexture);
this->setPixelRef(pr, 0)->unref();
} else {
GrPrintf("--- failed to create gpu-offscreen [%d %d]\n",
@@ -1599,7 +1599,7 @@
SkIntToScalar(src.height()));
GrTexture* resultTexture = filter_texture(fContext, texture, filter, rect);
if (resultTexture) {
- result->setPixelRef(new SkGrPixelRef(resultTexture))->unref();
+ result->setPixelRef(new SkGrTexturePixelRef(resultTexture))->unref();
resultTexture->unref();
}
return true;