Upstream Android modifications to the image encoders/decoders.

include/images/SkImageEncoder.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkImageEncoder_DEFINED
 #define SkImageEncoder_DEFINED
 
 #include "SkTypes.h"
 
 class SkBitmap;
 class SkWStream;
 
 class SkImageEncoder {
 public:
     enum Type {
         kJPEG_Type,
-        kPNG_Type
+        kPNG_Type,
+        kWEBP_Type
     };
     static SkImageEncoder* Create(Type);
 
     virtual ~SkImageEncoder();
 
     /*  Quality ranges from 0..100 */
     enum {
         kDefaultQuality = 80
     };
 
@@ skipping 42 matching lines @@
 // encoder implementation that registers with the encoder factory must call it.
 #define DEFINE_ENCODER_CREATOR(codec)           \
     SkImageEncoder *Create ## codec () {        \
         return SkNEW( Sk ## codec );            \
     }
 
 // All the encoders known by Skia. Note that, depending on the compiler settings,
 // not all of these will be available
 DECLARE_ENCODER_CREATOR(JPEGImageEncoder);
 DECLARE_ENCODER_CREATOR(PNGImageEncoder);
+DECLARE_ENCODER_CREATOR(WEBPImageEncoder);
 
 #endif