hide Config in SkImageDecoder -- use SkColorType instead

samplecode/SampleUnpremul.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "gm.h"
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkBlurDrawLooper.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkForceLinking.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
@@ skipping 158 matching lines @@
         }
         SkFILEStream stream(fCurrFile.c_str());
         SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(&stream));
         if (NULL == decoder.get()) {
             fDecodeSucceeded = false;
             return;
         }
         if (!fPremul) {
             decoder->setRequireUnpremultipliedColors(true);
         }
-        fDecodeSucceeded = decoder->decode(&stream, &fBitmap,
-                                           SkBitmap::kARGB_8888_Config,
+        fDecodeSucceeded = decoder->decode(&stream, &fBitmap, kN32_SkColorType,
                                            SkImageDecoder::kDecodePixels_Mode);
         this->inval(NULL);
     }
 
     void togglePremul() {
         fPremul = !fPremul;
         this->decodeCurrFile();
     }
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() {
     return new UnpremulView(skiagm::GM::GetResourcePath());
 }
 static SkViewRegister reg(MyFactory);