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..bb9db7613b02f0b3c0a49755a6157576e7521bf4 100644
--- a/src/lazy/SkCachingPixelRef.h
+++ b/src/lazy/SkCachingPixelRef.h
@@ -30,7 +30,8 @@ public:
     virtual ~SkCachingPixelRef();
 
 protected:
-    virtual void* onLockPixels(SkColorTable** colorTable) SK_OVERRIDE;
+    virtual bool onGetInfo(SkImageInfo*) 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,11 +44,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.
      */