| Index: third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| index 933023eeb1171a19c7a7b7e4938d58f9a630b070..2382ab7ae8b3ebd5c31b7d484eba88d6e14b1597 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| @@ -86,10 +86,7 @@ class ExternalMemoryAllocator final : public SkBitmap::Allocator {
|
| if (!CompatibleInfo(info_, info) || row_bytes_ != dst->rowBytes())
|
| return false;
|
|
|
| - if (!dst->installPixels(info, pixels_, row_bytes_))
|
| - return false;
|
| - dst->lockPixels();
|
| - return true;
|
| + return dst->installPixels(info, pixels_, row_bytes_);
|
| }
|
|
|
| private:
|
| @@ -165,7 +162,6 @@ bool ImageFrameGenerator::DecodeAndScale(
|
| // provided. If not, make a copy.
|
| DCHECK_EQ(bitmap.width(), scaled_size.width());
|
| DCHECK_EQ(bitmap.height(), scaled_size.height());
|
| - SkAutoLockPixels bitmap_lock(bitmap);
|
| if (bitmap.getPixels() != pixels)
|
| CopyPixels(pixels, row_bytes, bitmap.getPixels(), bitmap.rowBytes(), info);
|
| return true;
|
|
|