| Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| index f242a1d11733dbba50aefe10c742a6c6ea13acce..5a1acc7ac72b379ededa4592896b96f8820055ae 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp
|
| @@ -328,11 +328,11 @@ sk_sp<SkImage> DeferredImageDecoder::createFrameImageAtIndex(
|
| knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
|
| m_colorSpaceForSkImages);
|
|
|
| - DecodingImageGenerator* generator = new DecodingImageGenerator(
|
| + auto generator = WTF::makeUnique<DecodingImageGenerator>(
|
| m_frameGenerator, info, std::move(segmentReader), m_allDataReceived,
|
| index, m_frameData[index].m_uniqueID);
|
| - sk_sp<SkImage> image = SkImage::MakeFromGenerator(
|
| - generator); // SkImage takes ownership of the generator.
|
| + generator->setCanYUVDecode(m_canYUVDecode);
|
| + sk_sp<SkImage> image = SkImage::MakeFromGenerator(std::move(generator));
|
| if (!image)
|
| return nullptr;
|
|
|
| @@ -346,8 +346,6 @@ sk_sp<SkImage> DeferredImageDecoder::createFrameImageAtIndex(
|
| m_frameData[index].m_uniqueID = image->uniqueID();
|
| }
|
|
|
| - generator->setCanYUVDecode(m_canYUVDecode);
|
| -
|
| return image;
|
| }
|
|
|
|
|