Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is…

src/lazy/SkCachingPixelRef.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCachingPixelRef_DEFINED
 #define SkCachingPixelRef_DEFINED
 
@@ skipping 22 matching lines @@
      *
      *  If Install fails or when the SkCachingPixelRef that is
      *  installed into destination is destroyed, it will call
      *  SkDELETE() on the generator.  Therefore, generator should be
      *  allocated with SkNEW() or SkNEW_ARGS().
      */
     static bool Install(SkImageGenerator* gen, SkBitmap* dst);
 
 protected:
     virtual ~SkCachingPixelRef();
-    virtual void* onLockPixels(SkColorTable** colorTable) 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 {
         return fImageGenerator->refEncodedData();
     }
     // No need to flatten this object. When flattening an SkBitmap,
     // SkOrderedWriteBuffer will check the encoded data and write that
     // instead.
     // Future implementations of SkFlattenableWriteBuffer will need to
     // special case for onRefEncodedData as well.
     SK_DECLARE_UNFLATTENABLE_OBJECT()
 
 private:
     SkImageGenerator* const fImageGenerator;
     bool                    fErrorInDecoding;
     void*                   fScaledCacheId;
-    const SkImageInfo       fInfo;
     const size_t            fRowBytes;
 
     SkCachingPixelRef(SkImageGenerator* imageGenerator,
                       const SkImageInfo& info,
                       size_t rowBytes);
+
     typedef SkPixelRef INHERITED;
 };
 
 #endif  // SkCachingPixelRef_DEFINED