Add SkEncodedFormat, used by SkCodec.

include/core/SkImageEncoder.h

Index: include/core/SkImageEncoder.h
diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index 6ee173cb0211ab2644854aacd71ce06a128a61e7..b3e58ca8af2a0625aebc63c2f16033336fb10741 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -8,6 +8,7 @@
 #ifndef SkImageEncoder_DEFINED
 #define SkImageEncoder_DEFINED
 
+#include "SkEncodedFormat.h"
 #include "SkImageInfo.h"
 #include "SkTRegistry.h"
 
@@ -17,18 +18,7 @@ class SkWStream;
 
 class SkImageEncoder {
 public:
-    enum Type {
-        kUnknown_Type,
-        kBMP_Type,
-        kGIF_Type,
-        kICO_Type,
-        kJPEG_Type,
-        kPNG_Type,
-        kWBMP_Type,
-        kWEBP_Type,
-        kKTX_Type,

[scroggo, 2015/03/19 20:00:21]

There's a slight difference between this and the new version. A couple of Types
precede kKTX in SkEncodedFormat. I don't think anyone depends on these values
(Android doesn't use kKTX). The ones that Android cares about have the same
order.

-    };
-    static SkImageEncoder* Create(Type);
+    static SkImageEncoder* Create(SkEncodedFormat);

[scroggo, 2015/03/19 20:00:21]

Now that we've changed this (and SkImageDecoder), we'll need a (simple) change
to Android to update to the new name.

 
     virtual ~SkImageEncoder();
 
@@ -60,12 +50,12 @@ public:
     bool encodeStream(SkWStream* stream, const SkBitmap& bm, int quality);
 
     static SkData* EncodeData(const SkImageInfo&, const void* pixels, size_t rowBytes,
-                              Type, int quality);
-    static SkData* EncodeData(const SkBitmap&, Type, int quality);
+                              SkEncodedFormat, int quality);
+    static SkData* EncodeData(const SkBitmap&, SkEncodedFormat, int quality);
 
-    static bool EncodeFile(const char file[], const SkBitmap&, Type,
+    static bool EncodeFile(const char file[], const SkBitmap&, SkEncodedFormat,
                            int quality);
-    static bool EncodeStream(SkWStream*, const SkBitmap&, Type,
+    static bool EncodeStream(SkWStream*, const SkBitmap&, SkEncodedFormat,
                            int quality);
 
 protected:
@@ -109,5 +99,5 @@ DECLARE_ENCODER_CREATOR(PNGImageEncoder_IOS);
 
 // Typedef to make registering encoder callback easier
 // This has to be defined outside SkImageEncoder. :(
-typedef SkTRegistry<SkImageEncoder*(*)(SkImageEncoder::Type)> SkImageEncoder_EncodeReg;
+typedef SkTRegistry<SkImageEncoder*(*)(SkEncodedFormat)> SkImageEncoder_EncodeReg;
 #endif