Use SkImageCacherator in SkImages

src/image/SkImage_Raster.cpp

Index: src/image/SkImage_Raster.cpp
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index af8f79010f134047b0ebf25678f9a22364dcb0d3..74f72b4d0d7f93681798305856661b4088a9ee52 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -228,18 +228,6 @@ SkImage* SkImage::NewFromRaster(const SkImageInfo& info, const void* pixels, siz
     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) {
@@ -298,3 +286,17 @@ bool SkImage_Raster::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) c
     }
     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