Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink …

samplecode/SamplePicture.cpp

Index: samplecode/SamplePicture.cpp
===================================================================
--- samplecode/SamplePicture.cpp	(revision 12666)
+++ samplecode/SamplePicture.cpp	(working copy)
@@ -40,9 +40,7 @@
 
         if (SkImageDecoder::DecodeStream(stream, &bm, SkBitmap::kNo_Config,
                                          SkImageDecoder::kDecodeBounds_Mode)) {
-            SkImageInfo info;
-            bm.asImageInfo(&info);
-            SkPixelRef* pr = new SkImageRef_GlobalPool(info, stream, 1);
+            SkPixelRef* pr = new SkImageRef_GlobalPool(stream, bm.config(), 1);
             bm.setPixelRef(pr)->unref();
         }
     }