Revert of SkImage::NewFromGenerator(SkImageGenerator*), and a unit test.

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 a1cd602a0733c91c782186338acaf191c28f2fea..e4768af0ac17865da8e8bbd22881e57a6660439e 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -10,7 +10,6 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkData.h"
-#include "SkDecodingImageGenerator.h"
 #include "SkMallocPixelRef.h"
 
 class SkImage_Raster : public SkImage_Base {
@@ -70,10 +69,6 @@
                                   SkShader::TileMode,
                                   const SkMatrix* localMatrix) const SK_OVERRIDE;
 
-    SkImage_Raster(const SkBitmap& bm)
-        : INHERITED(bm.width(), bm.height())
-        , fBitmap(bm) {}
-
 private:
     SkImage_Raster() : INHERITED(0, 0) {}
 
@@ -203,14 +198,6 @@
     return SkNEW_ARGS(SkImage_Raster, (info, data, rowBytes));
 }
 
-SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator) {
-    SkBitmap bitmap;
-    if (!SkInstallDiscardablePixelRef(generator, &bitmap)) {
-        return NULL;
-    }
-    return SkNEW_ARGS(SkImage_Raster, (bitmap));
-}
-
 SkImage* SkNewImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
                                 size_t rowBytes) {
     return SkNEW_ARGS(SkImage_Raster, (info, pr, rowBytes));