| Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| index a26594466b40fd22c60878b786095b05772c5a92..68aeeb33d8f77851d11fae729285af747b1b1cd3 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| @@ -83,7 +83,10 @@ bool ImageFrame::CopyBitmapData(const ImageFrame& other) {
|
| DCHECK_NE(this, &other);
|
| has_alpha_ = other.has_alpha_;
|
| bitmap_.reset();
|
| - return other.bitmap_.copyTo(&bitmap_, other.bitmap_.colorType());
|
| + SkImageInfo info = other.bitmap_.info();
|
| + return bitmap_.tryAllocPixels(info) &&
|
| + other.bitmap_.readPixels(info, bitmap_.getPixels(), bitmap_.rowBytes(),
|
| + 0, 0);
|
| }
|
|
|
| bool ImageFrame::TakeBitmapDataIfWritable(ImageFrame* other) {
|
|
|