[Android] ImageBuffer toDataURL("image/webp") has RGBA pixel input

Source/platform/image-encoders/skia/WEBPImageEncoder.cpp

Index: Source/platform/image-encoders/skia/WEBPImageEncoder.cpp
diff --git a/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp b/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp
index e52a6848809ed6e893f09811758ac0ee9f77cc00..77ddb612fdafd5bd4e7bf076ac83a10c6d295254 100644
--- a/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp
+++ b/Source/platform/image-encoders/skia/WEBPImageEncoder.cpp
@@ -100,8 +100,13 @@ static bool encodePixels(IntSize imageSize, const unsigned char* pixels, bool pr
         return false;
     picture.height = imageSize.height();
 
+#if SK_B32_SHIFT // Little-endian RGBA pixels. (Android)
+    if (premultiplied && !importPictureRGBX<true>(pixels, &picture))
+        return false;
+#else
     if (premultiplied && !importPictureBGRX<true>(pixels, &picture))
         return false;
+#endif
     if (!premultiplied && !importPictureRGBX<false>(pixels, &picture))

[skal, 2014/10/11 13:53:53]

the logic is hard to follow as written. Would be better with:

if (premultiplied) {
#if SK_B32_SHIFT // Little-endian RGBA pixels. (Android)
     if (!importPictureRGBX<true>(pixels, &picture))
          return false;
#else
     if (!importPictureBGRX<true>(pixels, &picture))
          return false;
#endif
} else {
     if (!importPictureRGBX<false>(pixels, &picture))
          return false;
}


btw: won't we need an "#ifdef SK_B32_SHIFT" for the latter case too?

         return false;