hide SkBitmap::Config entirely (behind a flag)

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleApp.h"
 
 #include "SkData.h"
@@ skipping 26 matching lines @@
 
 #include "SkOSFile.h"
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"
 #include "SkStream.h"
 
 #include "SkGPipe.h"
 #include "SamplePipeControllers.h"
 #include "OverView.h"
 #include "TransitionView.h"
+#include "sk_tool_utils.h"
 
 extern SampleView* CreateSamplePictFileView(const char filename[]);
 
 class PictFileFactory : public SkViewFactory {
     SkString fFilename;
 public:
     PictFileFactory(const SkString& filename) : fFilename(filename) {}
     virtual SkView* operator() () const SK_OVERRIDE {
         return CreateSamplePictFileView(fFilename.c_str());
     }
@@ skipping 2018 matching lines @@
     (void)SampleView::SetUsePipe(view, fPipeState);
     if (SampleView::IsSampleView(view)) {
         SampleView* sampleView = (SampleView*)view;
         sampleView->requestMenu(fSlideMenu);
         sampleView->onTileSizeChanged(this->tileSize());
     }
     this->onUpdateMenu(fSlideMenu);
     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: ",
 #if SK_SUPPORT_GPU
     "opengl: ",
 #if SK_ANGLE
     "angle: ",
 #endif // SK_ANGLE
     "null-gl: "
 #endif // SK_SUPPORT_GPU
@@ skipping 15 matching lines @@
     SkView* view = curr_view(this);
 
     SkString title;
     if (!curr_title(this, &title)) {
         title.set("<unknown>");
     }
 
     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);
     }
     if (fAnimating) {
         title.prepend("<A> ");
     }
     if (fRotate) {
         title.prepend("<R> ");
     }
@@ skipping 382 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }