| 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 806350a5e2556e6f898caba4346c80f5bf062b8e..13cc435ee3b82d309024f0e102c9ec7abb3a9df9 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.cpp
|
| @@ -103,6 +103,7 @@ ImageFrameGenerator::ImageFrameGenerator(const SkISize& fullSize, PassRefPtr<Sha
|
| , m_data(adoptRef(new ThreadSafeDataTransport()))
|
| , m_isMultiFrame(isMultiFrame)
|
| , m_decodeFailed(false)
|
| + , m_yuvDecodingFailed(false)
|
| , m_frameCount(0)
|
| , m_encodedData(nullptr)
|
| {
|
| @@ -246,7 +247,7 @@ bool ImageFrameGenerator::decodeToYUV(size_t index, SkISize componentSizes[3], v
|
| }
|
|
|
| ASSERT(decoder->failed());
|
| - m_decodeFailed = true;
|
| + m_yuvDecodingFailed = true;
|
| return false;
|
| }
|
|
|
| @@ -393,6 +394,9 @@ bool ImageFrameGenerator::getYUVComponentSizes(SkISize componentSizes[3])
|
| {
|
| TRACE_EVENT2("blink", "ImageFrameGenerator::getYUVComponentSizes", "width", m_fullSize.width(), "height", m_fullSize.height());
|
|
|
| + if (m_yuvDecodingFailed)
|
| + return false;
|
| +
|
| SharedBuffer* data = 0;
|
| bool allDataReceived = false;
|
| m_data->data(&data, &allDataReceived);
|
|
|