[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 82 matching lines @@
         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 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;
 
     picture.custom_ptr = output;
     picture.writer = &writeOutput;
     config.quality = quality;
     config.method = 3;
 
     bool success = WebPEncode(&config, &picture);
     WebPPictureFree(&picture);
     return success;
 }
 
 bool WEBPImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsigned char>* output)
 {
     SkAutoLockPixels bitmapLock(bitmap);
 
     if (bitmap.colorType() != kN32_SkColorType || !bitmap.getPixels())
         return false; // Only support 32 bit/pixel skia bitmaps.
 
     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