Move multipart resource handling to core/fetch (2/2)

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

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 30e13864b184ef5e48bd4a9c0070ccbe5bc0b853..f77cb73636cc7317ee5928022b22ff317238107b 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -293,9 +293,9 @@ inline void ImageResource::clearImage()
     m_image.clear();
 }
 
-void ImageResource::appendData(const char* data, size_t length)
+void ImageResource::appendDataInternal(const char* data, size_t length)
 {
-    Resource::appendData(data, length);
+    Resource::appendDataInternal(data, length);
     if (!loadingMultipartContent())
         updateImage(false);
 }
@@ -352,7 +352,8 @@ void ImageResource::error(Resource::Status status)
 
 void ImageResource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
-    if (loadingMultipartContent() && m_data)
+    ASSERT(!handle);
+    if (response.isMultipartPayload() && m_data)
         finishOnePart();
     Resource::responseReceived(response, handle);
     if (RuntimeEnabledFeatures::clientHintsEnabled()) {
@@ -467,7 +468,7 @@ bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin)
 
 bool ImageResource::loadingMultipartContent() const
 {
-    return m_loader && m_loader->loadingMultipartContent();
+    return m_loader && isMultipartImage();
 }
 
 } // namespace blink