| Index: third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| index 2d3ead5190745b4e485ba8e54594294e7344a3da..b78c07ede80ac8651b5f3c80181d319c7f6e4d94 100644
|
| --- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| +++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| @@ -144,9 +144,14 @@ void CanvasAsyncBlobCreator::encodeImageOnEncoderThread(double quality)
|
| {
|
| ASSERT(!isMainThread());
|
|
|
| + bool success;
|
| if (m_mimeType == "image/jpeg") {
|
| - JPEGImageEncoder::encodeWithPreInitializedState(m_jpegEncoderState.get(), m_data->data());
|
| - } else if (!ImageDataBuffer(m_size, m_data->data()).encodeImage(m_mimeType, quality, m_encodedImage.get())) {
|
| + success = JPEGImageEncoder::encodeWithPreInitializedState(m_jpegEncoderState.release(), m_data->data());
|
| + } else {
|
| + success = ImageDataBuffer(m_size, m_data->data()).encodeImage(m_mimeType, quality, m_encodedImage.get());
|
| + }
|
| +
|
| + if (!success) {
|
| scheduleCreateNullptrAndCallOnMainThread();
|
| return;
|
| }
|
|
|