Adds read pixels to GrTexture and GrRenderTarget

Adds SkGrRenderTargetPixelRef for SkBitmaps that are backed by RTs that aren't textures.
Adds onReadPixels implementations for SkGr pixel ref types



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

1 files changed, 4 insertions, 4 deletions

diff --git a/gpu/src/GrAtlas.cpp b/gpu/src/GrAtlas.cpp
index a37df9c89a..dfc0a691f6 100644
--- a/gpu/src/GrAtlas.cpp
+++ b/gpu/src/GrAtlas.cpp
@@ -142,16 +142,16 @@ GrAtlasMgr::~GrAtlasMgr() {
     fGpu->unref();
 }
 
-static GrTexture::PixelConfig maskformat2pixelconfig(GrMaskFormat format) {
+static GrPixelConfig maskformat2pixelconfig(GrMaskFormat format) {
     switch (format) {
         case kA8_GrMaskFormat:
-            return GrTexture::kAlpha_8_PixelConfig;
+            return kAlpha_8_GrPixelConfig;
         case kA565_GrMaskFormat:
-            return GrTexture::kRGB_565_PixelConfig;
+            return kRGB_565_GrPixelConfig;
         default:
             GrAssert(!"unknown maskformat");
     }
-    return GrTexture::kUnknown_PixelConfig;
+    return kUnknown_GrPixelConfig;
 }
 
 GrAtlas* GrAtlasMgr::addToAtlas(GrAtlas* atlas,