Remove WEBP encoder SkBitmap API

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/image-encoders/skia/WEBPImageEncoder.h"
 
-#include "SkBitmap.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "webp/encode.h"
 
 typedef int (*WebPImporter)(WebPPicture* const, const uint8_t* const data, int rowStride);
 
 namespace blink {
 
 static int writeOutput(const uint8_t* data, size_t size, const WebPPicture* const picture)
 {
     static_cast<Vector<unsigned char>*>(picture->custom_ptr)->append(data, size);
     return 1;
 }
 
-static bool rgbPictureImport(const unsigned char* pixels, bool premultiplied, WebPImporter importRGBX, WebPImporter importRGB, WebPPicture* picture)
+static bool rgbPictureImport(const unsigned char* pixels, WebPImporter importRGB, WebPPicture* picture)
 {
-    if (premultiplied)
-        return importRGBX(picture, pixels, picture->width * 4);
-
     // Write the RGB pixels to an rgb data buffer, alpha premultiplied, then import the rgb data.
 
     size_t pixelCount = picture->height * picture->width;
 
     OwnPtr<unsigned char[]> rgb = adoptArrayPtr(new unsigned char[pixelCount * 3]);
     if (!rgb.get())
         return false;
 
     for (unsigned char* data = rgb.get(); pixelCount-- > 0; pixels += 4) {
         unsigned char alpha = pixels[3];
         if (alpha != 255) {
             *data++ = SkMulDiv255Round(pixels[0], alpha);
             *data++ = SkMulDiv255Round(pixels[1], alpha);
             *data++ = SkMulDiv255Round(pixels[2], alpha);
         } else {
             *data++ = pixels[0];
             *data++ = pixels[1];
             *data++ = pixels[2];
         }
     }
 
     return importRGB(picture, rgb.get(), picture->width * 3);
 }
 
-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)
+static bool encodePixels(IntSize imageSize, const unsigned char* pixels, int quality, Vector<unsigned char>* output)
 {
     if (imageSize.width() <= 0 || imageSize.width() > WEBP_MAX_DIMENSION)
         return false;
     if (imageSize.height() <= 0 || imageSize.height() > WEBP_MAX_DIMENSION)
         return false;
 
     WebPConfig config;
     if (!WebPConfigInit(&config))
         return false;
     WebPPicture picture;
     if (!WebPPictureInit(&picture))
         return false;
 
     picture.width = imageSize.width();
     picture.height = imageSize.height();
 
-    if (premultiplied && !platformPremultipliedImportPicture(pixels, &picture))
-        return false;
-    if (!premultiplied && !importPictureRGBX<false>(pixels, &picture))
+    if (!rgbPictureImport(pixels, &WebPPictureImportRGB, &picture))

[urvang, 2015/08/28 17:20:58]

It would be helpful to put a comment that ImageDataBuffer gives
non-premultiplied pixels in RGBA format.
(You can do this in the next patch).

         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)
 {
     if (!imageData.pixels())
         return false;
 
-    return encodePixels(IntSize(imageData.width(), imageData.height()), imageData.pixels(), false, quality, output);
+    return encodePixels(IntSize(imageData.width(), imageData.height()), imageData.pixels(), quality, output);
 }
 
 } // namespace blink