commit d881bc194d7c24294029b5c08e6e549a9fd9b6f3
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jun 28 20:02:39 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jun 28 20:02:39 2012 +0000
tree 8f05adad1714663ea427d6d4a5ef814ae58eef58
parent fc937347bf293651d696e34506e641871ea3e04d

Collapsed SkGrTexturePixelRef and SkGrRenderTargetPixelRef into SkGrPixelRef using new GrSurface class

http://codereview.appspot.com/6359045/



git-svn-id: http://skia.googlecode.com/svn/trunk@4396 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index c6f377d..c0feff2 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -198,9 +198,9 @@
     // are ensuring that both objects will live as long as the pixel ref.
     SkPixelRef* pr;
     if (fTexture) {
-        pr = new SkGrTexturePixelRef(fTexture);
+        pr = new SkGrPixelRef(fTexture);
     } else {
-        pr = new SkGrRenderTargetPixelRef(fRenderTarget);
+        pr = new SkGrPixelRef(fRenderTarget);
     }
     this->setPixelRef(pr, 0)->unref();
 
@@ -243,7 +243,7 @@
         GrAssert(NULL != fRenderTarget);
 
         // wrap the bitmap with a pixelref to expose our texture
-        SkGrTexturePixelRef* pr = new SkGrTexturePixelRef(fTexture);
+        SkGrPixelRef* pr = new SkGrPixelRef(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 SkGrTexturePixelRef(resultTexture))->unref();
+        result->setPixelRef(new SkGrPixelRef(resultTexture))->unref();
         resultTexture->unref();
     }
     return true;