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

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

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 65 matching lines @@
 template <bool Premultiplied> inline bool importPictureBGRX(const unsigned char* pixels, WebPPicture* picture)
 {
     return rgbPictureImport(pixels, Premultiplied, &WebPPictureImportBGRX, &WebPPictureImportBGR, picture);
 }
 
 template <bool Premultiplied> inline bool importPictureRGBX(const unsigned char* pixels, WebPPicture* picture)
 {
     return rgbPictureImport(pixels, Premultiplied, &WebPPictureImportRGBX, &WebPPictureImportRGB, picture);
 }
 
+static bool platformPremultipliedImportPicture(const unsigned char* pixels, WebPPicture* picture)
+{
+    if (SK_B32_SHIFT) // Android
+        return importPictureRGBX<true>(pixels, picture);
+
+    return importPictureBGRX<true>(pixels, picture);
+}
+
 static bool encodePixels(IntSize imageSize, const unsigned char* pixels, bool premultiplied, int quality, Vector<unsigned char>* output)
 {
     WebPConfig config;
     if (!WebPConfigInit(&config))
         return false;
     WebPPicture picture;
     if (!WebPPictureInit(&picture))
         return false;
 
     imageSize.clampNegativeToZero();
     if (!imageSize.width() || imageSize.width() > WEBP_MAX_DIMENSION)
         return false;
     picture.width = imageSize.width();
     if (!imageSize.height() || imageSize.height() > WEBP_MAX_DIMENSION)
         return false;
     picture.height = imageSize.height();
 
-    if (premultiplied && !importPictureBGRX<true>(pixels, &picture))
+    if (premultiplied && !platformPremultipliedImportPicture(pixels, &picture))
         return false;
     if (!premultiplied && !importPictureRGBX<false>(pixels, &picture))
         return false;
 
     picture.custom_ptr = output;
     picture.writer = &writeOutput;
     config.quality = quality;
     config.method = 3;
 
     bool success = WebPEncode(&config, &picture);
@@ skipping 10 matching lines @@
 
     return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<unsigned char *>(bitmap.getPixels()), true, quality, output);
 }
 
 bool WEBPImageEncoder::encode(const ImageDataBuffer& imageData, int quality, Vector<unsigned char>* output)
 {
     return encodePixels(imageData.size(), imageData.data(), false, quality, output);
 }
 
 } // namespace blink