| Index: third_party/WebKit/Source/core/frame/ImageBitmap.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
|
| index b13f38d430f962e385c0e7d2cd1cf5309c7bd8c7..279710f53f8f36905f798bef2fd58c65b554b5a7 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
|
| @@ -413,10 +413,11 @@ ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, Optional<IntRect> cropRect,
|
| m_image->setPremultiplied(parsedOptions.premultiplyAlpha);
|
| }
|
|
|
| -ImageBitmap::ImageBitmap(std::unique_ptr<uint8_t[]> data, uint32_t width, uint32_t height, bool isImageBitmapPremultiplied, bool isImageBitmapOriginClean)
|
| +ImageBitmap::ImageBitmap(const void* pixelData, uint32_t width, uint32_t height, bool isImageBitmapPremultiplied, bool isImageBitmapOriginClean)
|
| {
|
| SkImageInfo info = SkImageInfo::MakeN32(width, height, isImageBitmapPremultiplied ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);
|
| - m_image = StaticBitmapImage::create(SkImage::MakeRasterCopy(SkPixmap(info, data.get(), info.bytesPerPixel() * width)));
|
| + SkPixmap pixmap(info, pixelData, info.bytesPerPixel() * width);
|
| + m_image = StaticBitmapImage::create(SkImage::MakeRasterCopy(pixmap));
|
| if (!m_image)
|
| return;
|
| m_image->setPremultiplied(isImageBitmapPremultiplied);
|
| @@ -630,9 +631,9 @@ ImageBitmap* ImageBitmap::create(PassRefPtr<StaticBitmapImage> image)
|
| return new ImageBitmap(std::move(image));
|
| }
|
|
|
| -ImageBitmap* ImageBitmap::create(std::unique_ptr<uint8_t[]> data, uint32_t width, uint32_t height, bool isImageBitmapPremultiplied, bool isImageBitmapOriginClean)
|
| +ImageBitmap* ImageBitmap::create(const void* pixelData, uint32_t width, uint32_t height, bool isImageBitmapPremultiplied, bool isImageBitmapOriginClean)
|
| {
|
| - return new ImageBitmap(std::move(data), width, height, isImageBitmapPremultiplied, isImageBitmapOriginClean);
|
| + return new ImageBitmap(pixelData, width, height, isImageBitmapPremultiplied, isImageBitmapOriginClean);
|
| }
|
|
|
| void ImageBitmap::close()
|
|
|