Shrink the SkImageGenerator API

generateBitmap was used in one test, so it's easily converted to
tryGenerateBitmap. Then, all calls to tryGenerateBitmap supplied
an image info, so we don't need it to be optional.

BUG=skia:

Change-Id: I19e8f9da7e442a2d37af68b029b5ec85228766f7
Reviewed-on: https://skia-review.googlesource.com/6149
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 5344855dad..550c34b0b5 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -137,9 +137,8 @@ static bool reset_and_return_false(SkBitmap* bitmap) {
     return false;
 }
 
-bool SkImageGenerator::tryGenerateBitmap(SkBitmap* bitmap, const SkImageInfo* infoPtr,
+bool SkImageGenerator::tryGenerateBitmap(SkBitmap* bitmap, const SkImageInfo& info,
                                          SkBitmap::Allocator* allocator) {
-    SkImageInfo info = infoPtr ? *infoPtr : this->getInfo();
     if (0 == info.getSafeSize(info.minRowBytes())) {
         return false;
     }
@@ -155,7 +154,7 @@ bool SkImageGenerator::tryGenerateBitmap(SkBitmap* bitmap, const SkImageInfo* in
         // kIndex_8_SkColorTable.
         // https://bug.skia.org/4355
 #if 1
-        // ignroe the allocator, and see if we can succeed without it
+        // ignore the allocator, and see if we can succeed without it
         if (!bitmap->tryAllocPixels(nullptr, ctable.get())) {
             return reset_and_return_false(bitmap);
         }