remove SkBitmap::asImageInfo

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 543 matching lines @@
         gm->draw(canvas);
         canvas->setDrawFilter(NULL);
     }
 
     static ErrorCombination generate_image(GM* gm, const ConfigData& gRec,
                                            GrSurface* gpuTarget,
                                            SkBitmap* bitmap,
                                            bool deferred) {
         SkISize size (gm->getISize());
         setup_bitmap(gRec, size, bitmap);
-        SkImageInfo info;
-        bitmap->asImageInfo(&info);
+        const SkImageInfo info = bitmap->info();
 
         SkAutoTUnref<SkSurface> surface;
         SkAutoTUnref<SkCanvas> canvas;
 
         if (gRec.fBackend == kRaster_Backend) {
             surface.reset(SkSurface::NewRasterDirect(info,
                                                      bitmap->getPixels(),
                                                      bitmap->rowBytes()));
             if (deferred) {
                 canvas.reset(SkDeferredCanvas::Create(surface));
@@ skipping 1891 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif