formalize generate->bitmap

tools/Resources.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCommandLineFlags.h"
@@ skipping 10 matching lines @@
     return SkOSPath::Join(FLAGS_resourcePath[0], resource);
 }
 
 void SetResourcePath(const char* resource) {
     FLAGS_resourcePath.set(0, resource);
 }
 
 bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
     SkString resourcePath = GetResourcePath(resource);
     SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(resourcePath.c_str()));
-    return resourceData && SkInstallDiscardablePixelRef(resourceData, dst);
+    SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData));
+    return gen && gen->tryGenerateBitmap(dst);

[hal.canary, 2015/09/24 20:18:10]

this no longer exercises discardable memory!

[reed1, 2015/09/25 08:05:16]

Yes, discardable bitmaps is a deprecated feature. Use images to get that
feature.

 }
 
 SkImage* GetResourceAsImage(const char* resource) {
     SkString path = GetResourcePath(resource);
     SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(path.c_str()));
     return SkImage::NewFromEncoded(resourceData);
 }
 
 SkStreamAsset* GetResourceAsStream(const char* resource) {
     SkString resourcePath = GetResourcePath(resource);
     SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str()));
     if (stream->isValid()) {
         return stream.detach();
     } else {
         SkDebugf("Resource %s not found.\n", resource);
         return nullptr;
     }
 }
 
 SkTypeface* GetResourceAsTypeface(const char* resource) {
     SkAutoTDelete<SkStreamAsset> stream(GetResourceAsStream(resource));
     if (!stream) {
         return nullptr;
     }
     return SkTypeface::CreateFromStream(stream.detach());
 }