Merge 149966 "Fix multipart images, regressed in r148560".

Source/core/loader/cache/CachedImage.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 359 matching lines @@
         }
 
         // It would be nice to only redraw the decoded band of the image, but with the current design
         // (decoding delayed until painting) that seems hard.
         notifyObservers();
     }
 }
 
 void CachedImage::finishOnePart()
 {
+    if (m_loadingMultipartContent)
+        clear();
     updateImage(true);
+    if (m_loadingMultipartContent)
+        m_data.clear();
     CachedResource::finishOnePart();
 }
 
 void CachedImage::error(CachedResource::Status status)
 {
     clear();
     CachedResource::error(status);
     notifyObservers();
 }
 
 void CachedImage::responseReceived(const ResourceResponse& response)
 {
-    if (m_loadingMultipartContent) {
-        if (m_data)
-            finishOnePart();
-        clear();
-    } else if (response.isMultipart())
+    if (m_loadingMultipartContent && m_data)
+        finishOnePart();
+    else if (response.isMultipart())
         m_loadingMultipartContent = true;
     CachedResource::responseReceived(response);
 }
 
 void CachedImage::destroyDecodedData()
 {
     bool canDeleteImage = !m_image || (m_image->hasOneRef() && m_image->isBitmapImage());
     if (isSafeToMakePurgeable() && canDeleteImage && !isLoading()) {
         // Image refs the data buffer so we should not make it purgeable while the image is alive.
         // Invoking addClient() will reconstruct the image object.
@@ skipping 67 matching lines @@
 
 bool CachedImage::currentFrameKnownToBeOpaque(const RenderObject* renderer)
 {
     Image* image = imageForRenderer(renderer);
     if (image->isBitmapImage())
         image->nativeImageForCurrentFrame(); // force decode
     return image->currentFrameKnownToBeOpaque();
 }
 
 } // namespace WebCore