Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_wbmp.cpp

Index: src/images/SkImageDecoder_wbmp.cpp
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index 1f506dbc4ddf86952fde1476fb4ac7c3f7893148..beaa40fe0b5777ba3094865f777c9ebe61cf4575 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -17,8 +17,8 @@
 
 class SkWBMPImageDecoder : public SkImageDecoder {
 public:
-    Format getFormat() const SK_OVERRIDE {
-        return kWBMP_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kWBMP_SkEncodedFormat;
     }
 
 protected:
@@ -161,12 +161,12 @@ static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) {
     return NULL;
 }
 
-static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_wbmp(SkStreamRewindable* stream) {
     wbmp_head head;
     if (head.init(stream)) {
-        return SkImageDecoder::kWBMP_Format;
+        return kWBMP_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_wbmp_dfactory);