Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn…

src/ports/SkImageDecoder_CG.cpp

Index: src/ports/SkImageDecoder_CG.cpp
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index 3f850b544dabf288ff64eddcb9951bb5d416aa48..9b93f81112d51e624470f3b4a5f9bcd1a77b5b91 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -219,7 +219,7 @@ bool SkImageEncoder_CG::onEncode(SkWStream* stream, const SkBitmap& bm,
             // format.
             // <Error>: CGImageDestinationFinalize image destination does not have enough images
             // So instead we copy to 8888.
-            if (bm.getConfig() == SkBitmap::kARGB_4444_Config) {
+            if (bm.config() == SkBitmap::kARGB_4444_Config) {
                 bm.copyTo(&bitmap8888, SkBitmap::kARGB_8888_Config);
                 bmPtr = &bitmap8888;
             }