remove SkBitmap::asImageInfo

src/image/SkImagePriv.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
@@ skipping 33 matching lines @@
         kIndex_8_SkColorType,   // kIndex8_Config
         kRGB_565_SkColorType,   // kRGB_565_Config
         kARGB_4444_SkColorType, // kARGB_4444_Config
         kN32_SkColorType,   // kARGB_8888_Config
     };
     SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT));
     return gCT[config];
 }
 
 SkImage* SkNewImageFromBitmap(const SkBitmap& bm, bool canSharePixelRef) {
-    SkImageInfo info;
-    if (!bm.asImageInfo(&info)) {
+    const SkImageInfo info = bm.info();
+    if (kUnknown_SkColorType == info.colorType()) {
         return NULL;
     }
 
     SkImage* image = NULL;
     if (canSharePixelRef || bm.isImmutable()) {
         image = SkNewImageFromPixelRef(info, bm.pixelRef(), bm.rowBytes());
     } else {
         bm.lockPixels();
         if (bm.getPixels()) {
             image = SkImage::NewRasterCopy(info, bm.getPixels(), bm.rowBytes());
         }
         bm.unlockPixels();
     }
     return image;
 }