Expand pixelref to return SkImageInfo and rowbytes

src/lazy/SkDiscardablePixelRef.h

Index: src/lazy/SkDiscardablePixelRef.h
diff --git a/src/lazy/SkDiscardablePixelRef.h b/src/lazy/SkDiscardablePixelRef.h
index bbe19b8b20727dc5672bf6dcadcdd9c278a8fc35..42260e1bd91083c0e85b2c12c174e361d1672ed9 100644
--- a/src/lazy/SkDiscardablePixelRef.h
+++ b/src/lazy/SkDiscardablePixelRef.h
@@ -37,7 +37,8 @@ public:
 
 protected:
     ~SkDiscardablePixelRef();
-    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; }
 
@@ -47,7 +48,6 @@ protected:
 
 private:
     SkImageGenerator* const fGenerator;
-    const SkImageInfo fInfo;
     const size_t fSize;  // size of memory to be allocated
     const size_t fRowBytes;
     // These const members should not change over the life of the
@@ -60,5 +60,7 @@ private:
                           const SkImageInfo& info,
                           size_t size,
                           size_t rowBytes);
+
+    typedef SkPixelRef INHERITED;
 };
 #endif  // SkDiscardablePixelRef_DEFINED