| 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 f76ea742180f3c18f8be9ac47bf0db4609a8fd59..d6c4fc34590f90d78f41595338b3aaec26524d9f 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| @@ -181,7 +181,7 @@ bool ImageFrameGenerator::decodeToYUV(SegmentReader* data,
|
| ASSERT(decoder);
|
|
|
| std::unique_ptr<ImagePlanes> imagePlanes =
|
| - makeUnique<ImagePlanes>(planes, rowBytes);
|
| + WTF::makeUnique<ImagePlanes>(planes, rowBytes);
|
| decoder->setImagePlanes(std::move(imagePlanes));
|
|
|
| ASSERT(decoder->canDecodeToYUV());
|
| @@ -225,7 +225,7 @@ SkBitmap ImageFrameGenerator::tryToResumeDecode(
|
| // the decoder is owned by ImageDecodingStore.
|
| std::unique_ptr<ImageDecoder> decoderContainer;
|
| if (!resumeDecoding)
|
| - decoderContainer = wrapUnique(decoder);
|
| + decoderContainer = WTF::wrapUnique(decoder);
|
|
|
| if (fullSizeImage.isNull()) {
|
| // If decoding has failed, we can save work in the future by
|
| @@ -372,7 +372,8 @@ bool ImageFrameGenerator::getYUVComponentSizes(SegmentReader* data,
|
|
|
| // Setting a dummy ImagePlanes object signals to the decoder that we want to
|
| // do YUV decoding.
|
| - std::unique_ptr<ImagePlanes> dummyImagePlanes = wrapUnique(new ImagePlanes);
|
| + std::unique_ptr<ImagePlanes> dummyImagePlanes =
|
| + WTF::wrapUnique(new ImagePlanes);
|
| decoder->setImagePlanes(std::move(dummyImagePlanes));
|
|
|
| return updateYUVComponentSizes(decoder.get(), sizeInfo->fSizes,
|
|
|