hide SkBitmap::Config entirely (behind a flag)

src/animator/SkDrawBitmap.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawBitmap.h"
@@ skipping 38 matching lines @@
     SK_MEMBER(format, BitmapFormat),
     SK_MEMBER(height, Int),
     SK_MEMBER(rowBytes, Int),
     SK_MEMBER(width, Int),
 };
 
 #endif
 
 DEFINE_GET_MEMBER(SkDrawBitmap);
 
-SkDrawBitmap::SkDrawBitmap() : format((SkBitmap::Config) -1), height(-1),
+SkDrawBitmap::SkDrawBitmap() : format((SkColorType) -1), height(-1),
     rowBytes(0),    width(-1), fColor(0), fColorSet(false) {
 }
 
 SkDrawBitmap::~SkDrawBitmap() {
 }
 
 #ifdef SK_DUMP_ENABLED
 void SkDrawBitmap::dump(SkAnimateMaker* maker) {
     dumpBase(maker);
     dumpAttrs(maker);
@@ skipping 11 matching lines @@
         case 4: formatName = "RGB32"; break;
     }
     SkDebugf("format=\"%s\" />\n", formatName);
 }
 #endif
 
 void SkDrawBitmap::onEndElement(SkAnimateMaker&) {
     SkASSERT(width != -1);
     SkASSERT(height != -1);
     SkASSERT(rowBytes >= 0);
-    SkColorType colorType = SkBitmapConfigToColorType((SkBitmap::Config)format);
+    SkColorType colorType = SkColorType(format);
     fBitmap.setInfo(SkImageInfo::Make(width, height, colorType, kPremul_SkAlphaType), rowBytes);
     fBitmap.allocPixels();
     if (fColorSet)
         fBitmap.eraseColor(fColor);
 }
 
 bool SkDrawBitmap::setProperty(int index, SkScriptValue& value)
 {
     switch (index) {
         case SK_PROPERTY(erase):
@@ skipping 86 matching lines @@
         fLast.set(src);
         fBitmap.reset();
 
         //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str());
         SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str()));
         if (stream.get()) {
             SkImageDecoder::DecodeStream(stream, &fBitmap);
         }
     }
 }