remove SkBitmap::asImageInfo

src/image/SkImage.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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkImagePriv.h"
@@ skipping 85 matching lines @@
             return true;
         case kAlpha_8_SkColorType:
             return true;
         default:
             break;
     }
     return false;
 }
 
 bool SkImage_Base::onReadPixels(SkBitmap* bitmap, const SkIRect& subset) const {
-    SkImageInfo info;
-
     if (bitmap->pixelRef()) {
-        if (!bitmap->asImageInfo(&info)) {
+        const SkImageInfo info = bitmap->info();
+        if (kUnknown_SkColorType == info.colorType()) {
             return false;
         }
         if (!raster_canvas_supports(info)) {
             return false;
         }
     } else {
-        SkImageInfo info = SkImageInfo::MakeN32Premul(subset.width(),
-                                                      subset.height());
+        const SkImageInfo info = SkImageInfo::MakeN32Premul(subset.width(), subset.height());
         SkBitmap tmp;
         if (!tmp.allocPixels(info)) {
             return false;
         }
         *bitmap = tmp;
     }
 
     SkRect srcR, dstR;
     srcR.set(subset);
     dstR = srcR;
     dstR.offset(-dstR.left(), -dstR.top());
 
     SkCanvas canvas(*bitmap);
 
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kClear_Mode);
     canvas.drawRect(dstR, paint);
 
     const_cast<SkImage_Base*>(this)->onDrawRectToRect(&canvas, &srcR, dstR, NULL);
     return true;
 }