commit c77392ed58ec78ab19fa0e3ff99fb8110854fba2
author reed <reed@google.com> Mon Jun 02 13:07:26 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 02 13:07:26 2014 -0700
tree 35917d403903038c3e266f20fd14886ac22d9c98
parent 80f709a0d7f2f1d0d35a292c0c3189d3a50b4993

use colortype instead of config

clone of https://codereview.chromium.org/305133006/

TBR=

BUG=skia:

Author: reed@google.com

Review URL: https://codereview.chromium.org/301233011

src/utils/debugger/SkObjectParser.cpp

diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp
index a3b2085..b932036 100644
--- a/src/utils/debugger/SkObjectParser.cpp
+++ b/src/utils/debugger/SkObjectParser.cpp
@@ -25,13 +25,13 @@
     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");