use colortype instead of config

src/utils/debugger/SkObjectParser.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 "SkObjectParser.h"
 #include "SkData.h"
 #include "SkFontDescriptor.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkStringUtils.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
 
 /* TODO(chudy): Replace all std::strings with char */
 
 SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) {
     SkString* mBitmap = new SkString("SkBitmap: ");
     mBitmap->append("W: ");
     mBitmap->appendS32(bitmap.width());
     mBitmap->append(" H: ");
     mBitmap->appendS32(bitmap.height());
 
-    const char* gConfigStrings[] = {
-        "None", "A8", "Index8", "RGB565", "ARGB4444", "ARGB8888"
+    const char* gColorTypeStrings[] = {
+        "None", "A8", "565", "4444", "RGBA", "BGRA", "Index8"
     };
-    SkASSERT(SkBitmap::kConfigCount == SK_ARRAY_COUNT(gConfigStrings));
+    SkASSERT(kLastEnum_SkColorType + 1 == SK_ARRAY_COUNT(gColorTypeStrings));
 
-    mBitmap->append(" Config: ");
-    mBitmap->append(gConfigStrings[bitmap.config()]);
+    mBitmap->append(" ColorType: ");
+    mBitmap->append(gColorTypeStrings[bitmap.colorType()]);
 
     if (bitmap.isOpaque()) {
         mBitmap->append(" opaque");
     } else {
         mBitmap->append(" not-opaque");
     }
 
     if (bitmap.isImmutable()) {
         mBitmap->append(" immutable");
     } else {
@@ skipping 320 matching lines @@
             }
             break;
         }
         default:
             decodedText->append("Unknown text encoding.");
             break;
     }
 
     return decodedText;
 }