Expand pixelref to return SkImageInfo and rowbytes

src/images/SkImageRef.cpp

Index: src/images/SkImageRef.cpp
diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp
index 1a8284bdd4a6e730da950ce244355867295cb0de..423747a2b216268fd98a817c4b4c94b8611d5fac 100644
--- a/src/images/SkImageRef.cpp
+++ b/src/images/SkImageRef.cpp
@@ -143,11 +143,18 @@ bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) {
     return false;
 }
 
-void* SkImageRef::onLockPixels(SkColorTable** ct) {
+void* SkImageRef::onLockPixels(SkImageInfo* info, size_t* rowBytes,
+                               SkColorTable** ct) {
     if (NULL == fBitmap.getPixels()) {
         (void)this->prepareBitmap(SkImageDecoder::kDecodePixels_Mode);
     }
 
+    if (info) {
+        fBitmap.asImageInfo(info);
+    }
+    if (rowBytes) {
+        *rowBytes = fBitmap.rowBytes();
+    }
     if (ct) {
         *ct = fBitmap.getColorTable();
     }