switch bitmapshader internals over to pixmap

src/core/SkBitmapController.h

Index: src/core/SkBitmapController.h
diff --git a/src/core/SkBitmapController.h b/src/core/SkBitmapController.h
index bc3c69691c508c056541a75076a12767b2ea3174..ead4b783bd749cd4fd3e6a75af94bf85e907f2ec 100644
--- a/src/core/SkBitmapController.h
+++ b/src/core/SkBitmapController.h
@@ -21,12 +21,12 @@ public:
     public:
         virtual ~State() {}
 
-        const SkBitmap& lockedBitmap() const { return fLockedBitmap; }
+        const SkPixmap& pixmap() const { return fPixmap; }
         const SkMatrix& invMatrix() const { return fInvMatrix; }
         SkFilterQuality quality() const { return fQuality; }
     
     protected:
-        SkBitmap        fLockedBitmap;
+        SkPixmap        fPixmap;
         SkMatrix        fInvMatrix;
         SkFilterQuality fQuality;