Expand pixelref to return SkImageInfo and rowbytes

include/images/SkImageRef.h

Index: include/images/SkImageRef.h
diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h
index 0599a8d9633dfe8a7284801b49b5d3efc78a8b9b..2f428fc8514cbdf9219744867ebe3f7852eed23d 100644
--- a/include/images/SkImageRef.h
+++ b/include/images/SkImageRef.h
@@ -72,9 +72,10 @@ protected:
         When these are called, we will have already acquired the mutex!
      */
 
-    virtual void* onLockPixels(SkColorTable**);
+    virtual void* onLockPixels(SkImageInfo*, size_t* rowBytes,
+                               SkColorTable**) SK_OVERRIDE;
     // override this in your subclass to clean up when we're unlocking pixels
-    virtual void onUnlockPixels() {}
+    virtual void onUnlockPixels() SK_OVERRIDE {}
 
     SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL);
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;