Expand pixelref to return SkImageInfo and rowbytes

src/lazy/SkCachingPixelRef.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCachingPixelRef.h"
 #include "SkScaledImageCache.h"
 
@@ skipping 27 matching lines @@
 
 bool SkCachingPixelRef::configure(SkBitmap* bitmap) {
     SkASSERT(bitmap != NULL);
     SkImageInfo info;
     if (!this->getInfo(&info)) {
         return false;
     }
     return bitmap->setConfig(info, 0);
 }
 
-void* SkCachingPixelRef::onLockPixels(SkColorTable** colorTable) {
-    (void)colorTable;
+void* SkCachingPixelRef::onLockPixels(SkImageInfo* infoPtr, size_t* rowBytes,
+                                      SkColorTable** colorTable) {
     SkImageInfo info;
     if (!this->getInfo(&info)) {
         return NULL;
     }
     SkBitmap bitmap;
 
     fScaledCacheId = SkScaledImageCache::FindAndLock(this->getGenerationID(),
                                                      info.fWidth,
                                                      info.fHeight,
                                                      &bitmap);
     if (NULL == fScaledCacheId) {
         // Cache has been purged, must re-decode.
         if (!this->onDecodeInto(0, &bitmap)) {
             return NULL;
         }
         fScaledCacheId = SkScaledImageCache::AddAndLock(this->getGenerationID(),
                                                         info.fWidth,
                                                         info.fHeight,
                                                         bitmap);
         SkASSERT(fScaledCacheId != NULL);
     }
     // Now bitmap should contain a concrete PixelRef of the decoded
     // image.
     SkAutoLockPixels autoLockPixels(bitmap);
     void* pixels = bitmap.getPixels();
     SkASSERT(pixels != NULL);
+
+    *infoPtr = info;
+    *rowBytes = bitmap.rowBytes();
+    *colorTable = NULL;
+    
     // At this point, the autoLockPixels will unlockPixels()
     // to remove bitmap's lock on the pixels.  We will then
     // destroy bitmap.  The *only* guarantee that this pointer
     // remains valid is the guarantee made by
     // SkScaledImageCache that it will not destroy the *other*
     // bitmap (SkScaledImageCache::Rec.fBitmap) that holds a
     // reference to the concrete PixelRef while this record is
     // locked.
     return pixels;
 }
@@ skipping 16 matching lines @@
         return false;
     }
     SkAssertResult(this->getInfo(&info));  // since configure() succeeded.
     if (!this->onDecodePixels(info, tmp.getPixels(), tmp.rowBytes())) {
         fErrorInDecoding = true;
         return false;
     }
     *bitmap = tmp;
     return true;
 }