Make multipart image documents work again.

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 11 matching lines @@
 */
 
 #include "config.h"
 #include "core/fetch/ImageResource.h"
 
 #include "core/fetch/ImageResourceClient.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceClient.h"
 #include "core/fetch/ResourceClientWalker.h"
 #include "core/fetch/ResourceFetcher.h"
+#include "core/fetch/ResourceLoader.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "core/svg/graphics/SVGImageForContainer.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/SharedBuffer.h"
 #include "platform/TraceEvent.h"
 #include "platform/graphics/BitmapImage.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 ImageResource::ImageResource(const ResourceRequest& resourceRequest)
     : Resource(resourceRequest, Image)
     , m_devicePixelRatioHeaderValue(1.0)
     , m_image(nullptr)
-    , m_loadingMultipartContent(false)
     , m_hasDevicePixelRatioHeaderValue(false)
 {
     WTF_LOG(Timers, "new ImageResource(ResourceRequest) %p", this);
     setStatus(Unknown);
     setCustomAcceptHeader();
 }
 
 ImageResource::ImageResource(blink::Image* image)
     : Resource(ResourceRequest(""), Image)
     , m_devicePixelRatioHeaderValue(1.0)
     , m_image(image)
-    , m_loadingMultipartContent(false)
     , m_hasDevicePixelRatioHeaderValue(false)
 {
     WTF_LOG(Timers, "new ImageResource(Image) %p", this);
     setStatus(Cached);
     setLoading(false);
     setCustomAcceptHeader();
 }
 
 ImageResource::ImageResource(const ResourceRequest& resourceRequest, blink::Image* image)
     : Resource(resourceRequest, Image)
@@ skipping 238 matching lines @@
     // If our Image has an observer, it's always us so we need to clear the back pointer
     // before dropping our reference.
     if (m_image)
         m_image->setImageObserver(nullptr);
     m_image.clear();
 }
 
 void ImageResource::appendData(const char* data, unsigned length)
 {
     Resource::appendData(data, length);
-    if (!m_loadingMultipartContent)
+    if (!loadingMultipartContent())
         updateImage(false);
 }
 
 void ImageResource::updateImage(bool allDataReceived)
 {
     TRACE_EVENT0("blink", "ImageResource::updateImage");
 
     if (m_data)
         createImage();
 
@@ skipping 18 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 ImageResource::finishOnePart()
 {
-    if (m_loadingMultipartContent)
+    if (loadingMultipartContent())
         clear();
     updateImage(true);
-    if (m_loadingMultipartContent)
+    if (loadingMultipartContent())
         m_data.clear();
     Resource::finishOnePart();
 }
 
 void ImageResource::error(Resource::Status status)
 {
     clear();
     Resource::error(status);
     notifyObservers();
 }
 
 void ImageResource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
-    if (m_loadingMultipartContent && m_data)
+    if (loadingMultipartContent() && m_data)
         finishOnePart();
-    else if (response.isMultipart())
-        m_loadingMultipartContent = true;
     if (RuntimeEnabledFeatures::clientHintsEnabled()) {
         m_devicePixelRatioHeaderValue = response.httpHeaderField("content-dpr").toFloat(&m_hasDevicePixelRatioHeaderValue);
         if (!m_hasDevicePixelRatioHeaderValue || m_devicePixelRatioHeaderValue <= 0.0) {
             m_devicePixelRatioHeaderValue = 1.0;
             m_hasDevicePixelRatioHeaderValue = false;
         }
     }
     Resource::responseReceived(response, handle);
 }
 
@@ skipping 118 matching lines @@
     Node* node = layoutObject->node();
     if (node && isHTMLImageElement(node)) {
         const AtomicString& urlString = toHTMLImageElement(node)->imageSourceURL();
         KURL url = node->document().completeURL(urlString);
         imageForContainer->setURL(url);
     }
 
     return imageForContainer.get();
 }
 
+bool ImageResource::loadingMultipartContent() const
+{
+    return m_loader && m_loader->loadingMultipartContent();
+}
+
 } // namespace blink