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

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

Index: third_party/WebKit/Source/core/fetch/ImageResource.h
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.h b/third_party/WebKit/Source/core/fetch/ImageResource.h
index c17849ad11da963117c19fe7663c0aedca164987..cc4f7aba07f3f8a0c3763d2779538d2ef5877059 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.h
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.h
@@ -24,6 +24,7 @@
 #define ImageResource_h
 
 #include "core/CoreExport.h"
+#include "core/fetch/MultipartImageResourceParser.h"
 #include "core/fetch/Resource.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/IntSizeHash.h"
@@ -42,7 +43,7 @@ class Length;
 class MemoryCache;
 class SecurityOrigin;
 
-class CORE_EXPORT ImageResource final : public Resource, public ImageObserver {
+class CORE_EXPORT ImageResource final : public Resource, public ImageObserver, public MultipartImageResourceParser::Client {
     friend class MemoryCache;
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageResource);
 public:
@@ -96,6 +97,8 @@ public:
     // the Lo-Fi state set to off and bypassing the cache.
     void reloadIfLoFi(ResourceFetcher*);
 
+    bool isMultipartImage() const { return m_multipartParser; }

[Nate Chapin, 2016/03/01 19:02:15]

This is only used for ASSERTs in ImageResource. Maybe remove this and ASSERT
m_multipartParser directly.

[yhirano, 2016/03/01 19:43:23]

Done.

+
     void didAddClient(ResourceClient*) override;
     void didRemoveClient(ResourceClient*) override;
 
@@ -104,7 +107,7 @@ public:
     void appendData(const char*, size_t) override;
     void error(Resource::Status) override;
     void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
-    void finishOnePart() override;
+    void finish() override;
 
     // For compatibility, images keep loading even if there are HTTP errors.
     bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
@@ -120,6 +123,10 @@ public:
     void animationAdvanced(const blink::Image*) override;
     void changedInRect(const blink::Image*, const IntRect&) override;
 
+    // MultipartImageResourceParser::Client
+    void onePartInMultipartReceived(const ResourceResponse&, bool isFirstPart) final;
+    void multipartDataReceived(const char*, size_t) final;
+
     DECLARE_VIRTUAL_TRACE();
 
 protected:
@@ -151,10 +158,10 @@ private:
     void clearImage();
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(const IntRect* changeRect = nullptr);
-    bool loadingMultipartContent() const;
 
     float m_devicePixelRatioHeaderValue;
 
+    PersistentWillBeMember<MultipartImageResourceParser> m_multipartParser;
     RefPtr<blink::Image> m_image;
     bool m_hasDevicePixelRatioHeaderValue;
 };