diff options
| author |  reed <reed@google.com> | 2014-06-02 13:07:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 13:07:26 -0700 |
| commit | c77392ed58ec78ab19fa0e3ff99fb8110854fba2 (patch) | |
| tree | 35917d403903038c3e266f20fd14886ac22d9c98 /src/utils/debugger | |
| parent | 80f709a0d7f2f1d0d35a292c0c3189d3a50b4993 (diff) | |
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
Diffstat (limited to 'src/utils/debugger')
| -rw-r--r-- | src/utils/debugger/SkObjectParser.cpp | 10 | ||||
| -rw-r--r-- | src/utils/debugger/SkObjectParser.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp index a3b208544e..b932036a89 100644 --- a/src/utils/debugger/SkObjectParser.cpp +++ b/src/utils/debugger/SkObjectParser.cpp @@ -25,13 +25,13 @@ SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) { 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"); diff --git a/src/utils/debugger/SkObjectParser.h b/src/utils/debugger/SkObjectParser.h index 911b778921..da842653ff 100644 --- a/src/utils/debugger/SkObjectParser.h +++ b/src/utils/debugger/SkObjectParser.h @@ -20,7 +20,7 @@ class SkObjectParser { public: /** - Returns a string about a bitmaps bounds and config. + Returns a string about a bitmaps bounds and colortype. @param bitmap SkBitmap */ static SkString* BitmapToString(const SkBitmap& bitmap); |