Sk_API for SkImageGenerator and SkInstallDiscardablePixelRef

src/images/SkDecodingImageGenerator.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 "SkDecodingImageGenerator.h"
 #include "SkData.h"
-#include "SkDiscardablePixelRef.h"
 #include "SkImageDecoder.h"
+#include "SkImageGenerator.h"
 #include "SkImagePriv.h"
 #include "SkStream.h"
 
 
 namespace {
 /**
  *  Special allocator used by getPixels(). Uses preallocated memory
  *  provided.
  */
 class TargetAllocator : public SkBitmap::Allocator {
@@ skipping 162 matching lines @@
         SkBitmap bm8888;
         bitmap.copyTo(&bm8888, SkBitmap::kARGB_8888_Config, &allocator);
     }
     return true;
 }
 bool SkDecodingImageGenerator::Install(SkData* data, SkBitmap* dst,
                                        SkDiscardableMemory::Factory* factory) {
     SkASSERT(data != NULL);
     SkASSERT(dst != NULL);
     SkImageGenerator* gen(SkNEW_ARGS(SkDecodingImageGenerator, (data)));
-    return SkDiscardablePixelRef::Install(gen, dst, factory);
+    return SkInstallDiscardablePixelRef(gen, dst, factory);
 }
 
 bool SkDecodingImageGenerator::Install(SkStreamRewindable* stream,
                                        SkBitmap* dst,
                                        SkDiscardableMemory::Factory* factory) {
     SkASSERT(stream != NULL);
     SkASSERT(dst != NULL);
     if ((stream == NULL) || !stream->unique()) {
         SkSafeUnref(stream);
         return false;
     }
     SkImageGenerator* gen(SkNEW_ARGS(SkDecodingImageGenerator, (stream)));
-    return SkDiscardablePixelRef::Install(gen, dst, factory);
+    return SkInstallDiscardablePixelRef(gen, dst, factory);
 }