Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libwebp.cpp

Index: src/images/SkImageDecoder_libwebp.cpp
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index d2061dbd10deced75e20d3edc75c1b51cab63ef0..069be34aa87d4c0cb5823bc36607d7ebf889870c 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -98,8 +98,8 @@ public:
         fHasAlpha = 0;
     }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kWEBP_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kWEBP_SkEncodedFormat;
     }
 
 protected:
@@ -660,16 +660,16 @@ static SkImageDecoder* sk_libwebp_dfactory(SkStreamRewindable* stream) {
     return SkNEW(SkWEBPImageDecoder);
 }
 
-static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
+static SkEncodedFormat get_format_webp(SkStreamRewindable* stream) {
     int width, height, hasAlpha;
     if (webp_parse_header(stream, &width, &height, &hasAlpha)) {
-        return SkImageDecoder::kWEBP_Format;
+        return kWEBP_SkEncodedFormat;
     }
-    return SkImageDecoder::kUnknown_Format;
+    return kUnknown_SkEncodedFormat;
 }
 
-static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
-      return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
+static SkImageEncoder* sk_libwebp_efactory(SkEncodedFormat t) {
+      return (kWEBP_SkEncodedFormat == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
 }
 
 static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);