Use SkImageCacherator in SkImages

src/image/SkImage_Raster.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 "SkImage_Base.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 210 matching lines @@
     size_t size;
     if (!SkImage_Raster::ValidArgs(info, rowBytes, nullptr, &size) || !pixels) {
         return nullptr;
     }
 
     SkColorTable* ctable = nullptr;
     SkAutoDataUnref data(SkData::NewWithProc(pixels, size, proc, ctx));
     return new SkImage_Raster(info, data, rowBytes, ctable, nullptr);
 }
 
-SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator, const SkIRect* subset) {
-    SkBitmap bitmap;
-    if (!SkInstallDiscardablePixelRef(generator, subset, &bitmap, nullptr)) {
-        return nullptr;
-    }
-    if (0 == bitmap.width() || 0 == bitmap.height()) {
-        return nullptr;
-    }
-
-    return new SkImage_Raster(bitmap, nullptr);
-}
-
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
                                 const SkIPoint& pixelRefOrigin, size_t rowBytes,
                                 const SkSurfaceProps* props) {
     if (!SkImage_Raster::ValidArgs(info, rowBytes, nullptr, nullptr)) {
         return nullptr;
     }
     return new SkImage_Raster(info, pr, pixelRefOrigin, rowBytes, props);
 }
 
 SkImage* SkNewImageFromRasterBitmap(const SkBitmap& bm, const SkSurfaceProps* props,
@@ skipping 38 matching lines @@
         // pixelref since the caller might call setImmutable() themselves
         // (thus changing our state).
         if (fBitmap.isImmutable()) {
             bitmap->setInfo(fBitmap.info(), fBitmap.rowBytes());
             bitmap->setPixelRef(fBitmap.pixelRef(), fBitmap.pixelRefOrigin());
             return true;
         }
     }
     return this->INHERITED::onAsLegacyBitmap(bitmap, mode);
 }
+
+#ifdef SK_SUPPORT_LEGACY_NEWFROMGENERATOR
+SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator, const SkIRect* subset) {
+    SkBitmap bitmap;
+    if (!SkInstallDiscardablePixelRef(generator, subset, &bitmap, nullptr)) {
+            return nullptr;

[robertphillips, 2015/09/10 17:33:30]

indent issues

[reed1, 2015/09/10 21:21:32]

Done.

+        }
+    if (0 == bitmap.width() || 0 == bitmap.height()) {
+            return nullptr;
+        }
+
+    return new SkImage_Raster(bitmap, nullptr);
+}
+#endif