| Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| index 84ff1845cd93b674edf5c89a12f5b25f92fc429c..aa570eceff4acb20e4c83cef9ed92b345dfa74e9 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| @@ -209,8 +209,8 @@ void ImageResource::destroyDecodedDataIfPossible()
|
| {
|
| if (!m_image)
|
| return;
|
| - if ((!hasClientsOrObservers() && !isLoading() && m_image->hasOneRef() && m_image->isBitmapImage()) || !errorOccurred())
|
| - m_image->destroyDecodedData();
|
| + CHECK(!errorOccurred());
|
| + m_image->destroyDecodedData();
|
| }
|
|
|
| void ImageResource::doResetAnimation()
|
| @@ -221,7 +221,8 @@ void ImageResource::doResetAnimation()
|
|
|
| void ImageResource::allClientsAndObserversRemoved()
|
| {
|
| - if (m_image && !errorOccurred()) {
|
| + if (m_image) {
|
| + CHECK(!errorOccurred());
|
| // If possible, delay the resetting until back at the event loop.
|
| // Doing so after a conservative GC prevents resetAnimation() from
|
| // upsetting ongoing animation updates (crbug.com/613709)
|
|
|