Expand pixelref to return SkImageInfo and rowbytes

src/lazy/SkCachingPixelRef.h

Index: src/lazy/SkCachingPixelRef.h
diff --git a/src/lazy/SkCachingPixelRef.h b/src/lazy/SkCachingPixelRef.h
index db968dfcdde27ce29cdab589be07413075d084be..b49d84c0be2e413cce9d6b9fc02e87944c0a4f74 100644
--- a/src/lazy/SkCachingPixelRef.h
+++ b/src/lazy/SkCachingPixelRef.h
@@ -26,11 +26,11 @@ class SkColorTable;
  */
 class SkCachingPixelRef : public SkPixelRef {
 public:
-    SkCachingPixelRef();
+    SkCachingPixelRef(const SkImageInfo&);
     virtual ~SkCachingPixelRef();
 
 protected:
-    virtual void* onLockPixels(SkColorTable** colorTable) SK_OVERRIDE;
+    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
     virtual void onUnlockPixels() SK_OVERRIDE;
     virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; }
     virtual bool onImplementsDecodeInto() SK_OVERRIDE  { return true; }
@@ -43,16 +43,6 @@ protected:
     bool configure(SkBitmap* bitmap);
 
     /**
-     *  Cache info from onDecodeInfo(). Returns false on failure.
-     */
-    bool getInfo(SkImageInfo* info);
-
-    /**
-     *  Return some information about the pixels, allowing this class
-     *  to allocate pixels.  @return false if anything goes wrong.
-     */
-    virtual bool onDecodeInfo(SkImageInfo* info) = 0;
-    /**
      *  Decode into the given pixels, a block of memory of size
      *  (info.fHeight - 1) * rowBytes + (info.fWidth * bytesPerPixel)
      *
@@ -65,14 +55,11 @@ protected:
      *
      *  @return false if anything goes wrong.
      */
-    virtual bool onDecodePixels(const SkImageInfo& info,
-                                void* pixels,
-                                size_t rowBytes) = 0;
+    virtual bool onDecodePixels(void* pixels, size_t rowBytes) = 0;
 
 private:
-    bool                        fErrorInDecoding;
-    void*                       fScaledCacheId;
-    SkImageInfo                 fInfo;
+    void*   fScaledCacheId;
+    bool    fErrorInDecoding;
 
     typedef SkPixelRef INHERITED;
 };