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

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #ifndef Resource_h
 #define Resource_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/CachedMetadataHandler.h"
+#include "core/fetch/MultipartImageResourceParser.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "platform/Timer.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/scheduler/CancellableTaskFactory.h"
 #include "public/platform/WebDataConsumerHandle.h"
 #include "public/platform/WebMemoryDumpProvider.h"
 #include "wtf/Allocator.h"
@@ skipping 14 matching lines @@
 class ResourceFetcher;
 class ResourceTimingInfo;
 class InspectorResource;
 class ResourceLoader;
 class SecurityOrigin;
 class SharedBuffer;
 
 // A resource that is held in the cache. Classes who want to use this object should derive
 // from ResourceClient, to get the function calls in case the requested data has arrived.
 // This class also does the actual communication with the loader to obtain the resource from the network.
-class CORE_EXPORT Resource : public RefCountedWillBeGarbageCollectedFinalized<Resource> {
+class CORE_EXPORT Resource : public RefCountedWillBeGarbageCollectedFinalized<Resource>, public MultipartImageResourceParser::Client {

[Nate Chapin, 2016/02/25 22:07:53]

We should at least take a look at weather we can make just ImageResource a
MultipartImageResourceParser::Client.

[yhirano, 2016/02/27 01:27:45]

It's not possible at this moment because ImageDocument wants the resource
parsed.  The next CL (https://codereview.chromium.org/1738553002/) moves this
interface to ImageResource.

     WTF_MAKE_NONCOPYABLE(Resource);
     USING_FAST_MALLOC_WITH_TYPE_NAME_WILL_BE_REMOVED(blink::Resource);
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Resource);
     friend class InspectorResource;
 
 public:
     enum Type {
         MainResource,
         Image,
         CSSStyleSheet,
         Script,
         Font,
         Raw,
@@ skipping 22 matching lines @@
     }
     virtual ~Resource();
 
     virtual void removedFromMemoryCache();
     DECLARE_VIRTUAL_TRACE();
 
     virtual void load(ResourceFetcher*, const ResourceLoaderOptions&);
 
     virtual void setEncoding(const String&) { }
     virtual String encoding() const { return String(); }
-    virtual void appendData(const char*, size_t);
+    void appendData(const char*, size_t);
     virtual void error(Resource::Status);
     virtual void setCORSFailed() { }
 
     void setNeedsSynchronousCacheHit(bool needsSynchronousCacheHit) { m_needsSynchronousCacheHit = needsSynchronousCacheHit; }
 
     void setLinkPreload(bool isLinkPreload) { m_linkPreload = isLinkPreload; }
     bool isLinkPreload() const { return m_linkPreload; }
 
     void setResourceError(const ResourceError& error) { m_error = error; }
     const ResourceError& resourceError() const { return m_error; }
@@ skipping 133 matching lines @@
     void prune();
 
     virtual void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*) const;
 
     static const char* resourceTypeToString(Type, const FetchInitiatorInfo&);
     static const char* resourceTypeName(Type);
 
     // TODO(japhet): Remove once oilpan ships, it doesn't need the WeakPtr.
     WeakPtrWillBeRawPtr<Resource> asWeakPtr();
 
+    bool isMultipartImage() const;
+
 #ifdef ENABLE_RESOURCE_IS_DELETED_CHECK
     void assertAlive() const { RELEASE_ASSERT(!m_deleted); }
 #else
     void assertAlive() const { }
 #endif
 
+    // MultipartImageResourceParser::Client
+    void didReceiveResponse(const ResourceResponse&) final;
+    void didReceiveData(const char*, size_t) final;
+
 protected:
     Resource(const ResourceRequest&, Type);
 
     virtual void checkNotify();
     virtual void finishOnePart();
 
     virtual void destroyDecodedDataForFailedRevalidation() { }
+    virtual void appendDataInternal(const char*, size_t);
 
     void setEncodedSize(size_t);
     void setDecodedSize(size_t);
     void didAccessDecodedData();
 
     void finishPendingClients();
 
     HashCountedSet<ResourceClient*> m_clients;
     HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
     HashCountedSet<ResourceClient*> m_finishedClients;
@@ skipping 62 matching lines @@
     CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
 
     String m_fragmentIdentifierForRequest;
 
 #if !ENABLE(OILPAN)
     WeakPtrFactory<Resource> m_weakPtrFactory;
 #endif
 
     RefPtr<CachedMetadata> m_cachedMetadata;
     OwnPtrWillBeMember<CacheHandler> m_cacheHandler;
+    PersistentWillBeMember<MultipartImageResourceParser> m_multipartParser;
 
     ResourceError m_error;
 
     double m_loadFinishTime;
 
     unsigned long m_identifier;
 
     size_t m_encodedSize;
     size_t m_decodedSize;
     unsigned m_preloadCount;
@@ skipping 31 matching lines @@
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() == Resource::typeName, resource.type() == Resource::typeName); \
     inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif