| Index: include/core/SkBitmap.h | 
| diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h | 
| index b487285d9380915eedbb04c2f636585c373b09d5..a6acb8713e4bc04aaac4cc565cb24d7249dd3330 100644 | 
| --- a/include/core/SkBitmap.h | 
| +++ b/include/core/SkBitmap.h | 
| @@ -276,7 +276,13 @@ public: | 
| kPremul_SkAlphaType); | 
| } | 
|  | 
| -    bool setConfig(const SkImageInfo& info, size_t rowBytes = 0); | 
| +    bool setInfo(const SkImageInfo&, size_t rowBytes = 0); | 
| + | 
| +#ifdef SK_SUPPORT_LEGACY_SETCONFIG_INFO | 
| +    bool setConfig(const SkImageInfo& info, size_t rowBytes = 0) { | 
| +        return this->setInfo(info, rowBytes); | 
| +    } | 
| +#endif | 
|  | 
| /** | 
| *  Allocate a pixelref to match the specified image info. If the Factory | 
|  |