Simplify the condition for destroyDecodedData()

third_party/WebKit/Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 191 matching lines @@
 void ImageResource::destroyDecodedDataForFailedRevalidation()
 {
     clearImage();
     setDecodedSize(0);
 }
 
 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()
 {
     if (m_image)
         m_image->resetAnimation();
 }
 
 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)
         if (!ThreadHeap::willObjectBeLazilySwept(this))
             Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&ImageResource::doResetAnimation, wrapWeakPersistent(this)));
         else
             m_image->resetAnimation();
     }
     if (m_multipartParser)
         m_multipartParser->cancel();
@@ skipping 358 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink