Add SkEncodedFormat, used by SkCodec.

include/core/SkImageDecoder.h

 /*
  * 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.
  */
 
 #ifndef SkImageDecoder_DEFINED
 #define SkImageDecoder_DEFINED
 
 #include "SkBitmap.h"
+#include "SkEncodedFormat.h"
 #include "SkImage.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkTRegistry.h"
 #include "SkTypes.h"
 
 class SkStream;
 class SkStreamRewindable;
 
 /** \class SkImageDecoder
 
     Base class for decoding compressed images into a SkBitmap
 */
 class SkImageDecoder : SkNoncopyable {
 public:
     virtual ~SkImageDecoder();
 
-    enum Format {

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

I could leave this unchanged, since we're removing the class anyway...

-        kUnknown_Format,
-        kBMP_Format,
-        kGIF_Format,
-        kICO_Format,
-        kJPEG_Format,
-        kPNG_Format,
-        kWBMP_Format,
-        kWEBP_Format,
-        kPKM_Format,
-        kKTX_Format,
-        kASTC_Format,
-
-        kLastKnownFormat = kKTX_Format,
-    };
-
     /** Return the format of image this decoder can decode. If this decoder can decode multiple
         formats, kUnknown_Format will be returned.
     */
-    virtual Format getFormat() const;
+    virtual SkEncodedFormat getFormat() const;
 
     /** If planes or rowBytes is NULL, decodes the header and computes componentSizes
         for memory allocation.
         Otherwise, decodes the YUV planes into the provided image planes and
         updates componentSizes to the final image size.
         Returns whether the decoding was successful.
     */
     bool decodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], void* planes[3],
                           size_t rowBytes[3], SkYUVColorSpace*);
 
-    /** Return the format of the SkStreamRewindable or kUnknown_Format if it cannot be determined.
+    /** Return the format of the SkStreamRewindable or kUnknown_SkEncodedFormat if it cannot be
+        determined.
         Rewinds the stream before returning.
     */
-    static Format GetStreamFormat(SkStreamRewindable*);
+    static SkEncodedFormat GetStreamFormat(SkStreamRewindable*);
 
     /** Return a readable string of the Format provided.
     */
-    static const char* GetFormatName(Format);
+    static const char* GetFormatName(SkEncodedFormat);
 
     /** Return a readable string of the value returned by getFormat().
     */
     const char* getFormatName() const;
 
     /** Whether the decoder should skip writing zeroes to output if possible.
     */
     bool getSkipWritingZeroes() const { return fSkipWritingZeroes; }
 
     /** Set to true if the decoder should skip writing any zeroes when
@@ skipping 188 matching lines @@
 
     /** Decode the image stored in the specified file, and store the result
         in bitmap. Return true for success or false on failure.
 
         @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                       of the decoded file. On failure it is ignored.
     */
     static bool DecodeFile(const char file[], SkBitmap* bitmap, SkColorType pref, Mode,
-                           Format* format = NULL);
+                           SkEncodedFormat* format = NULL);
     static bool DecodeFile(const char file[], SkBitmap* bitmap) {
         return DecodeFile(file, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL);
     }
 
     /** Decode the image stored in the specified memory buffer, and store the
         result in bitmap. Return true for success or false on failure.
 
         @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                        of the decoded buffer. On failure it is ignored.
      */
     static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap, SkColorType pref,
-                             Mode, Format* format = NULL);
+                             Mode, SkEncodedFormat* format = NULL);
     static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap){
         return DecodeMemory(buffer, size, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL);
     }
 
     /** Decode the image stored in the specified SkStreamRewindable, and store the result
         in bitmap. Return true for success or false on failure.
 
         @param pref Prefer this colortype.
 
         @param format On success, if format is non-null, it is set to the format
                       of the decoded stream. On failure it is ignored.
      */
     static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap, SkColorType pref, Mode,
-                             Format* format = NULL);
+                             SkEncodedFormat* format = NULL);
     static bool DecodeStream(SkStreamRewindable* stream, SkBitmap* bitmap) {
         return DecodeStream(stream, bitmap, kUnknown_SkColorType, kDecodePixels_Mode, NULL);
     }
 
 protected:
     // must be overridden in subclasses. This guy is called by decode(...)
     virtual Result onDecode(SkStream*, SkBitmap* bitmap, Mode) = 0;
 
     // If the decoder wants to support tiled based decoding, this method must be overridden.
     // This is called by buildTileIndex(...)
@@ skipping 142 matching lines @@
 DECLARE_DECODER_CREATOR(JPEGImageDecoder);
 DECLARE_DECODER_CREATOR(PNGImageDecoder);
 DECLARE_DECODER_CREATOR(WBMPImageDecoder);
 DECLARE_DECODER_CREATOR(WEBPImageDecoder);
 DECLARE_DECODER_CREATOR(PKMImageDecoder);
 DECLARE_DECODER_CREATOR(KTXImageDecoder);
 DECLARE_DECODER_CREATOR(ASTCImageDecoder);
 
 // Typedefs to make registering decoder and formatter callbacks easier.
 // These have to be defined outside SkImageDecoder. :(
-typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)>        SkImageDecoder_DecodeReg;
-typedef SkTRegistry<SkImageDecoder::Format(*)(SkStreamRewindable*)> SkImageDecoder_FormatReg;
+typedef SkTRegistry<SkImageDecoder*(*)(SkStreamRewindable*)>    SkImageDecoder_DecodeReg;
+typedef SkTRegistry<SkEncodedFormat(*)(SkStreamRewindable*)>    SkImageDecoder_FormatReg;
 
 #endif