remove GetDeviceConfig/SetDeviceConfig

remove GetDeviceConfig/SetDeviceConfig

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/2f785a24eba5b59da30f5ffa0c53cc731e4c3078

[reed1, 2014-06-11 17:06:46]

will wait for removing in android before landing.

[scroggo, 2014-06-11 17:08:00]

On 2014/06/11 17:06:46, reed1 wrote:
> will wait for removing in android before landing.

LGTM

[scroggo, 2014-06-11 23:16:41]

On 2014/06/11 17:08:00, scroggo wrote:
> On 2014/06/11 17:06:46, reed1 wrote:
> > will wait for removing in android before landing.
> 
> LGTM

CL has been landed in Android.

[scroggo, 2014-06-11 23:16:44]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-06-11 23:17:09]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/332453002/1

[commit-bot: I haz the power, 2014-06-11 23:17:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-11 23:17:11]

Failed to apply patch for src/images/SkImageDecoder.cpp:
While running git apply --index -p1;
  error: patch failed: src/images/SkImageDecoder.cpp:14
  error: src/images/SkImageDecoder.cpp: patch does not apply

Patch:       src/images/SkImageDecoder.cpp
Index: src/images/SkImageDecoder.cpp
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index
5d38b40412f6700073841c9b66a4bc7e600193b4..f7b7836293c7902d412458aa31788dca41c585e9
100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -14,20 +14,6 @@
 #include "SkTemplates.h"
 #include "SkCanvas.h"
 
-static SkBitmap::Config gDeviceConfig = SkBitmap::kNo_Config;
-
-SkBitmap::Config SkImageDecoder::GetDeviceConfig()
-{
-    return gDeviceConfig;
-}
-
-void SkImageDecoder::SetDeviceConfig(SkBitmap::Config config)
-{
-    gDeviceConfig = config;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 SkImageDecoder::SkImageDecoder()
     : fPeeker(NULL)
     , fChooser(NULL)
@@ -149,8 +135,7 @@ void SkImageDecoder::setPrefConfigTable(const
PrefConfigTable& prefTable) {
     fPrefTable = prefTable;
 }
 
-// TODO: use colortype in fPrefTable, fDefaultPref and GetDeviceConfig()
-//       so we can stop using SkBitmapConfigToColorType()
+// TODO: use colortype in fPrefTable, fDefaultPref so we can stop using
SkBitmapConfigToColorType()
 //
 SkColorType SkImageDecoder::getPrefColorType(SrcDepth srcDepth, bool
srcHasAlpha) const {
     SkBitmap::Config config = SkBitmap::kNo_Config;
@@ -173,9 +158,6 @@ SkColorType SkImageDecoder::getPrefColorType(SrcDepth
srcDepth, bool srcHasAlpha
         config = fDefaultPref;
     }
 
-    if (SkBitmap::kNo_Config == config) {
-        config = SkImageDecoder::GetDeviceConfig();
-    }
     return SkBitmapConfigToColorType(config);
 }

[reed1, 2014-06-12 15:57:35]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-06-12 15:58:03]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/reed@google.com/332453002/20001

[commit-bot: I haz the power, 2014-06-12 16:21:36]

Change committed as 2f785a24eba5b59da30f5ffa0c53cc731e4c3078