Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache

gm/factory.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
-#include "SkBitmapFactory.h"
 #include "SkCanvas.h"
 #include "SkData.h"
+#include "SkDecodingImageGenerator.h"
+#include "SkDiscardablePixelRef.h"
 #include "SkImageDecoder.h"
-#include "SkLruImageCache.h"
 #include "SkOSFile.h"
+#include "SkDiscardableMemoryPool.h"
 #include "SkStream.h"
 
 namespace skiagm {
 
 /**
  *  Draw a PNG created by SkBitmapFactory.
  */
 class FactoryGM : public GM {
 public:
     FactoryGM() {}
 
 protected:
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
         // Copyright-free file from http://openclipart.org/detail/29213/paper-plane-by-ddoo
         SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath.c_str(),
                                                  "plane.png");
 
         SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(filename.c_str()));
         if (NULL != stream.get()) {
             stream->rewind();
             size_t length = stream->getLength();
             void* buffer = sk_malloc_throw(length);
             stream->read(buffer, length);
             SkAutoDataUnref data(SkData::NewFromMalloc(buffer, length));
-            SkBitmapFactory factory(&SkImageDecoder::DecodeMemoryToTarget);
+
+            SkASSERT(NULL == data.get());

[scroggo, 2013/12/03 23:00:01]

How is data NULL here? Did you test with the resource path set?

[hal.canary, 2013/12/04 00:01:36]

I meant to write !=, and I haven't gotten around to running gm.  I'll be sure to
test this code path. 

[hal.canary, 2013/12/04 14:30:33]

Tested with `out/Debug/gm --match factory --resourcePath resources` and verified
that this function gets executed.

             // Create a cache which will boot the pixels out anytime the
             // bitmap is unlocked.
-            SkAutoTUnref<SkLruImageCache> cache(SkNEW_ARGS(SkLruImageCache, (1)));
-            factory.setImageCache(cache);
-            factory.installPixelRef(data, &fBitmap);
+            SkAutoTUnref<SkDiscardableMemoryPool> pool(
+                SkNEW_ARGS(SkDiscardableMemoryPool, (1)));
+            SkAssertResult(SkDecodingImageGenerator::Install(data,
+                                                             &fBitmap, pool));
         }
     }
 
     virtual SkString onShortName() {
         return SkString("factory");
     }
 
     virtual SkISize onISize() {
         return make_isize(640, 480);
     }
@@ skipping 12 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FactoryGM; }
 static GMRegistry reg(MyFactory);
 
 }