Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libbmp.cpp

Index: src/images/SkImageDecoder_libbmp.cpp
diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp
index e28713d8a6d94687fc88fd268bbe529e55aadd19..be1954e94f76e54c303c078aeb93bda3d89ebbdf 100644
--- a/src/images/SkImageDecoder_libbmp.cpp
+++ b/src/images/SkImageDecoder_libbmp.cpp
@@ -19,8 +19,8 @@ class SkBMPImageDecoder : public SkImageDecoder {
 public:
     SkBMPImageDecoder() {}
 
-    Format getFormat() const SK_OVERRIDE {
-        return kBMP_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kBMP_SkEncodedFormat;
     }
 
 protected:
@@ -53,11 +53,11 @@ static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) {
 
 static SkImageDecoder_DecodeReg gReg(sk_libbmp_dfactory);
 
-static SkImageDecoder::Format get_format_bmp(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_bmp(SkStreamRewindable* stream) {
     if (is_bmp(stream)) {
-        return SkImageDecoder::kBMP_Format;
+        return kBMP_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_bmp);