Add SkEncodedFormat, used by SkCodec.

src/images/SkImageDecoder_libwebp.cpp

 /*
  * Copyright 2010, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 80 matching lines @@
 }
 
 class SkWEBPImageDecoder: public SkImageDecoder {
 public:
     SkWEBPImageDecoder() {
         fOrigWidth = 0;
         fOrigHeight = 0;
         fHasAlpha = 0;
     }
 
-    Format getFormat() const SK_OVERRIDE {
-        return kWEBP_Format;
+    SkEncodedFormat getFormat() const SK_OVERRIDE {
+        return kWEBP_SkEncodedFormat;
     }
 
 protected:
     bool onBuildTileIndex(SkStreamRewindable *stream, int *width, int *height) SK_OVERRIDE;
     bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) SK_OVERRIDE;
     Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     /**
      *  Called when determining the output config to request to webp.
@@ skipping 540 matching lines @@
 static SkImageDecoder* sk_libwebp_dfactory(SkStreamRewindable* stream) {
     int width, height, hasAlpha;
     if (!webp_parse_header(stream, &width, &height, &hasAlpha)) {
         return NULL;
     }
 
     // Magic matches, call decoder
     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);
 static SkImageDecoder_FormatReg gFormatReg(get_format_webp);
 static SkImageEncoder_EncodeReg gEReg(sk_libwebp_efactory);