Add SkEncodedFormat, used by SkCodec.

include/core/SkImageEncoder.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageEncoder_DEFINED
 #define SkImageEncoder_DEFINED
 
+#include "SkEncodedFormat.h"
 #include "SkImageInfo.h"
 #include "SkTRegistry.h"
 
 class SkBitmap;
 class SkData;
 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();
 
     /*  Quality ranges from 0..100 */
     enum {
         kDefaultQuality = 80
     };
 
     /**
      *  Encode bitmap 'bm', returning the results in an SkData, at quality level
@@ skipping 11 matching lines @@
     bool encodeFile(const char file[], const SkBitmap& bm, int quality);
 
     /**
      * Encode bitmap 'bm' in the desired format, writing results to
      * stream 'stream', at quality level 'quality' (which can be in
      * range 0-100). Returns false on failure.
      */
     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:
     /**
      * Encode bitmap 'bm' in the desired format, writing results to
      * stream 'stream', at quality level 'quality' (which can be in
      * range 0-100).
      *
      * This must be overridden by each SkImageEncoder implementation.
      */
@@ skipping 23 matching lines @@
 DECLARE_ENCODER_CREATOR(PNGImageEncoder);
 DECLARE_ENCODER_CREATOR(KTXImageEncoder);
 DECLARE_ENCODER_CREATOR(WEBPImageEncoder);
 
 #ifdef SK_BUILD_FOR_IOS
 DECLARE_ENCODER_CREATOR(PNGImageEncoder_IOS);
 #endif
 
 // 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