Modify SkLazyPixelRef to use SkImageGenerator.

include/core/SkMallocPixelRef.h

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMallocPixelRef_DEFINED
 #define SkMallocPixelRef_DEFINED
 
 #include "SkPixelRef.h"
 
+class SkBitmap;
+class SkImageGenerator;
+
 /** We explicitly use the same allocator for our pixels that SkMask does,
     so that we can freely assign memory allocated by one class to the other.
 */
 class SkMallocPixelRef : public SkPixelRef {
 public:
     /** Allocate the specified buffer for pixels. The memory is freed when the
         last owner of this pixelref is gone. If addr is NULL, sk_malloc_throw()
         is called to allocate it.
      */
     SkMallocPixelRef(void* addr, size_t size, SkColorTable* ctable, bool ownPixels = true);
     virtual ~SkMallocPixelRef();
 
-    //! Return the allocation size for the pixels
+    /**
+     * Create a new SkMallocPixelRef and install it in the destination
+     * bitmap, based on the SkImageGenerator.  The SkImageGenerator
+     * will be deleted.
+     *
+     * @returns false on any error.
+     */
+    static bool Install(SkImageGenerator* generator, SkBitmap* destination);

[scroggo, 2013/12/02 19:03:23]

Is there a reason these changes aren't included in
https://codereview.chromium.org/84783002/ ?

+
+    /**
+     * Return the allocation size for the pixels
+     */
     size_t getSize() const { return fSize; }
     void* getAddr() const { return fStorage; }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMallocPixelRef)
 
 protected:
     // overrides from SkPixelRef
-    virtual void* onLockPixels(SkColorTable**);
+    virtual void* onLockPixels(SkColorTable** colorTable);

[reed1, 2013/11/25 18:06:56]

It is ok to leave off these parameter variable names when they don't convey any
more info (other than th e type).

It is also ok to include them, but seems unnecessary.

     virtual void onUnlockPixels();
 
     SkMallocPixelRef(SkFlattenableReadBuffer& buffer);
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
 private:
     void*           fStorage;
     size_t          fSize;
     SkColorTable*   fCTable;
     bool            fOwnPixels;
 
     typedef SkPixelRef INHERITED;
 };
 
 
 #endif