hide SkBitmap::Config entirely (behind a flag)

patch from issue 339463002

TBR=

I think the NoGPU failure is unrelated, so ignoring
NOTRY=True

Author: reed@google.com

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

1 files changed, 2 insertions, 14 deletions

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 35021cba9f..eee379cf8b 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -44,6 +44,7 @@ class GrContext;
 #include "SamplePipeControllers.h"
 #include "OverView.h"
 #include "TransitionView.h"
+#include "sk_tool_utils.h"
 
 extern SampleView* CreateSamplePictFileView(const char filename[]);
 
@@ -2082,19 +2083,6 @@ void SampleWindow::loadView(SkView* view) {
     this->updateTitle();
 }
 
-static const char* gConfigNames[] = {
-    "unknown config",
-    "A8",
-    "Index8",
-    "565",
-    "4444",
-    "8888"
-};
-
-static const char* configToString(SkBitmap::Config c) {
-    return gConfigNames[c];
-}
-
 static const char* gDeviceTypePrefix[] = {
     "raster: ",
     "picture: ",
@@ -2130,7 +2118,7 @@ void SampleWindow::updateTitle() {
     title.prepend(gDeviceTypePrefix[fDeviceType]);
 
     title.prepend(" ");
-    title.prepend(configToString(this->getBitmap().config()));
+    title.prepend(sk_tool_utils::colortype_name(this->getBitmap().colorType()));
 
     if (fTilingMode != kNo_Tiling) {
         title.prependf("<T: %s> ", gTilingInfo[fTilingMode].label);