remove SkBitmap::asImageInfo

include/core/SkBitmap.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmap_DEFINED
 #define SkBitmap_DEFINED
 
@@ skipping 70 matching lines @@
 
     ///////////////////////////////////////////////////////////////////////////
 
     const SkImageInfo& info() const { return fInfo; }
 
     int width() const { return fInfo.fWidth; }
     int height() const { return fInfo.fHeight; }
     SkColorType colorType() const { return fInfo.fColorType; }
     SkAlphaType alphaType() const { return fInfo.fAlphaType; }
 
+#ifdef SK_SUPPORT_LEGACY_ASIMAGEINFO
+    bool asImageInfo(SkImageInfo* info) const {
+        // compatibility: return false for kUnknown
+        if (kUnknown_SkColorType == this->colorType()) {
+            return false;
+        }
+        if (info) {
+            *info = this->info();
+        }
+        return true;
+    }
+#endif
+
     /** Return the number of bytes per pixel based on the config. If the config
      does not have at least 1 byte per (e.g. kA1_Config) then 0 is returned.
      */
     int bytesPerPixel() const { return fInfo.bytesPerPixel(); }
 
     /** Return the rowbytes expressed as a number of pixels (like width and
      height). Note, for 1-byte per pixel configs like kA8_Config, this will
      return the same as rowBytes(). Is undefined for configs that are less
      than 1-byte per pixel (e.g. kA1_Config)
      */
@@ skipping 216 matching lines @@
         return this->installPixels(info, pixels, rowBytes, NULL, NULL);
     }
 
     /**
      *  Calls installPixels() with the value in the SkMask. The caller must
      *  ensure that the specified mask pixels are valid for the lifetime
      *  of the created bitmap (and its pixelRef).
      */
     bool installMaskPixels(const SkMask&);
 
-    /**
-     *  DEPRECATED: call info().
-     */
-    bool asImageInfo(SkImageInfo* info) const {
-        // compatibility: return false for kUnknown
-        if (kUnknown_SkColorType == this->colorType()) {
-            return false;
-        }
-        if (info) {
-            *info = this->info();
-        }
-        return true;
-    }
-
     /** Use this to assign a new pixel address for an existing bitmap. This
         will automatically release any pixelref previously installed. Only call
         this if you are handling ownership/lifetime of the pixel memory.
 
         If the bitmap retains a reference to the colortable (assuming it is
         not null) it will take care of incrementing the reference count.
 
         @param pixels   Address for the pixels, managed by the caller.
         @param ctable   ColorTable (or null) that matches the specified pixels
     */
@@ skipping 549 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Helpers until we can fully deprecate SkBitmap::Config
 //
 extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType);
 extern SkColorType SkBitmapConfigToColorType(SkBitmap::Config);
 
 #endif