Change SkDecodingImageGenerator API

src/core/SkBitmap.cpp

Index: src/core/SkBitmap.cpp
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index d4c3a47d81f42519dbb08c15c9fbb6ad5cbcb4cf..75fae8799ac20f0b24ab69245c7614e149d7a8e1 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -222,6 +222,16 @@ size_t SkBitmap::ComputeSize(Config c, int width, int height) {
     return isPos32Bits(size) ? size.get32() : 0;
 }
 
+Sk64 SkBitmap::ComputeSize64(const SkImageInfo& info) {

[reed1, 2013/12/17 17:38:52]

Why are these in bitmap, rather than SkImageInfo?

[hal.canary, 2013/12/17 21:00:22]

Good question.  Now that I look in SkImageInfo, I see I can replace

	SkBitmap::ComputeSize(info)

with

	info.getSafeSize(info.minRowBytes())

+    return SkBitmap::ComputeSize64(SkImageInfoToBitmapConfig(info),
+                                   info.fWidth, info.fHeight);
+}
+
+size_t SkBitmap::ComputeSize(const SkImageInfo& info) {
+    return SkBitmap::ComputeSize(SkImageInfoToBitmapConfig(info),
+                                 info.fWidth, info.fHeight);
+}
+
 Sk64 SkBitmap::ComputeSafeSize64(Config config,
                                  uint32_t width,
                                  uint32_t height,