Merge "Add WEBP to the list of Image formats that support Compression."

core/jni/android/graphics/Bitmap.cpp

@@ -261,7 +261,8 @@ static void Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) {
 // These must match the int values in Bitmap.java
 enum JavaEncodeFormat {
     kJPEG_JavaEncodeFormat = 0,
-    kPNG_JavaEncodeFormat = 1
+    kPNG_JavaEncodeFormat = 1,
+    kWEBP_JavaEncodeFormat = 2
 };
 
 static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
@@ -276,6 +277,9 @@ static bool Bitmap_compress(JNIEnv* env, jobject clazz, SkBitmap* bitmap,
     case kPNG_JavaEncodeFormat:
         fm = SkImageEncoder::kPNG_Type;
         break;
+    case kWEBP_JavaEncodeFormat:
+        fm = SkImageEncoder::kWEBP_Type;
+        break;
     default:
         return false;
     }
@@ -626,4 +630,3 @@ int register_android_graphics_Bitmap(JNIEnv* env)
     return android::AndroidRuntime::registerNativeMethods(env, kClassPathName,
                                 gBitmapMethods, SK_ARRAY_COUNT(gBitmapMethods));
 }
-

graphics/java/android/graphics/Bitmap.java

@@ -546,7 +546,8 @@ public final class Bitmap implements Parcelable {
      */
     public enum CompressFormat {
         JPEG    (0),
-        PNG     (1);
+        PNG     (1),
+        WEBP    (2);
 
         CompressFormat(int nativeInt) {
             this.nativeInt = nativeInt;