Expand pixelref to return SkImageInfo and rowbytes

src/lazy/SkLazyPixelRef.h

Index: src/lazy/SkLazyPixelRef.h
diff --git a/src/lazy/SkLazyPixelRef.h b/src/lazy/SkLazyPixelRef.h
index f8a16d168914326b52726241358bab7d77b5c2d7..480eac913fcb2b8c0024a4e18b953a701ac7327c 100644
--- a/src/lazy/SkLazyPixelRef.h
+++ b/src/lazy/SkLazyPixelRef.h
@@ -39,7 +39,8 @@ public:
      *         the pixel memory, as needed.  If NULL, use the global
      *         SkScaledImageCache.
      */
-    SkLazyPixelRef(SkData*, SkBitmapFactory::DecodeProc, SkImageCache*);
+    SkLazyPixelRef(const SkImageInfo&, SkData*, SkBitmapFactory::DecodeProc,
+                   SkImageCache*);
 
     virtual ~SkLazyPixelRef();
 
@@ -60,7 +61,7 @@ public:
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 
 protected:
-    virtual void* onLockPixels(SkColorTable**) SK_OVERRIDE;
+    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
     virtual void onUnlockPixels() SK_OVERRIDE;
     virtual bool onLockPixelsAreWritable() const SK_OVERRIDE { return false; }
     virtual SkData* onRefEncodedData() SK_OVERRIDE;
@@ -86,8 +87,8 @@ private:
 
     // lazily initialized our cached info. Returns NULL on failure.
     const SkImage::Info* getCachedInfo();
-    void* lockScaledImageCachePixels();
-    void* lockImageCachePixels();
+    bool lockScaledImageCachePixels(LockRec*);
+    bool lockImageCachePixels(LockRec*);
 
 
     typedef SkPixelRef INHERITED;