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

third_party/WebKit/Source/core/fetch/Resource.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, 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
@@ skipping 186 matching lines @@
 {
     InspectorInstrumentation::removedResourceFromMemoryCache(this);
 }
 
 DEFINE_TRACE(Resource)
 {
     visitor->trace(m_loader);
 #if ENABLE(OILPAN)
     visitor->trace(m_cacheHandler);
 #endif
+    visitor->trace(m_multipartParser);
+    MultipartImageResourceParser::Client::trace(visitor);
 }
 
 void Resource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& options)
 {
     m_options = options;
     m_loading = true;
 
     ResourceRequest request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
     if (!accept().isEmpty())
         request.setHTTPAccept(accept());
@@ skipping 23 matching lines @@
         return;
 
     ResourceClientWalker<ResourceClient> w(m_clients);
     while (ResourceClient* c = w.next())
         c->notifyFinished(this);
 }
 
 void Resource::appendData(const char* data, size_t length)
 {
     TRACE_EVENT0("blink", "Resource::appendData");
+    if (isMultipartImage()) {
+        m_multipartParser->addData(data, length);
+        return;
+    }
+    appendDataInternal(data, length);
+}
+
+void Resource::appendDataInternal(const char* data, size_t length)
+{
     ASSERT(m_revalidatingRequest.isNull());
     ASSERT(!errorOccurred());
     if (m_options.dataBufferingPolicy == DoNotBufferData)
         return;
     if (m_data)
         m_data->append(data, length);
     else
         m_data = SharedBuffer::createPurgeable(data, length);
     setEncodedSize(m_data->size());
 }
@@ skipping 20 matching lines @@
         HashCountedSet<ResourceClient*>::iterator it = m_clients.begin();
         for (int i = it->value; i; i--) {
             m_finishedClients.add(it->key);
             m_clients.remove(it);
         }
     }
 }
 
 void Resource::error(Resource::Status status)
 {
+    if (m_multipartParser)
+        m_multipartParser->cancel();
+
     if (!m_revalidatingRequest.isNull())
         m_revalidatingRequest = ResourceRequest();
 
     if (!m_error.isNull() && (m_error.isCancellation() || !isPreloaded()))
         memoryCache()->remove(this);
 
     setStatus(status);
     ASSERT(errorOccurred());
     m_data.clear();
 
     setLoading(false);
     checkNotify();
     markClientsFinished();
 }
 
 void Resource::finishOnePart()
 {
     setLoading(false);
     checkNotify();
 }
 
 void Resource::finish()
 {
     ASSERT(m_revalidatingRequest.isNull());
     ASSERT(!errorOccurred());
+    if (m_multipartParser)
+        m_multipartParser->finish();
+
     finishOnePart();
     markClientsFinished();
     if (!errorOccurred())
         m_status = Cached;
 }
 
 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const
 {
     String ignoredErrorDescription;
     return passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
@@ skipping 124 matching lines @@
 {
     m_responseTimestamp = currentTime();
 
     if (!m_revalidatingRequest.isNull()) {
         if (response.httpStatusCode() == 304) {
             revalidationSucceeded(response);
             return;
         }
         revalidationFailed();
     }
-
+    // If there's no boundary, just handle the request normally.  In the gecko

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

This comment looks like very outdated.

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

Deleted.

+    // code, nsMultiMixedConv::OnStartRequest throws an exception.
+    if (response.isMultipart() && !response.multipartBoundary().isEmpty() && (m_type == Resource::Image || m_type == Resource::MainResource) && !m_multipartParser)
+        m_multipartParser = new MultipartImageResourceParser(response, response.multipartBoundary(), this);
     setResponse(response);
     String encoding = response.textEncodingName();
     if (!encoding.isNull())
         setEncoding(encoding);
 }
 
 void Resource::setSerializedCachedMetadata(const char* data, size_t size)
 {
     // We only expect to receive cached metadata from the platform once.
     // If this triggers, it indicates an efficiency problem which is most
@@ skipping 39 matching lines @@
 
 WeakPtrWillBeRawPtr<Resource> Resource::asWeakPtr()
 {
 #if ENABLE(OILPAN)
     return this;
 #else
     return m_weakPtrFactory.createWeakPtr();
 #endif
 }
 
+bool Resource::isMultipartImage() const
+{
+    return m_multipartParser;
+}
+
+void Resource::didReceiveResponse(const ResourceResponse& response)
+{
+    ASSERT(isMultipartImage());
+    responseReceived(response, nullptr);
+    if (response.isMultipartPayload()) {
+        // Since a subresource loader does not load multipart sections progressively, data was delivered to the loader all at once.
+        // After the first multipart section is complete, signal to delegates that this load is "finished"
+        m_loader->fetcher()->subresourceLoaderFinishedLoadingOnePart(m_loader);

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

Instead of Exposing ResourceLoader::fetcher(), can we just do this work in
didFinishLoadingOnePart, passing in a boolean isMultipart to
didFinishLoadingOnePart if needed?

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

Done.

+        if (m_loader)
+            m_loader->didFinishLoadingOnePart(0, WebURLLoaderClient::kUnknownEncodedDataLength);
+    }
+}
+
+void Resource::didReceiveData(const char* bytes, size_t size)

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

I agree with hiroshige's comment on https://codereview.chromium.org/1738553002,
these names should mention multipart explicitly. It's confusing to have a name
as general as didReceiveData() and have it then ASSERT(isMultipartImage()).

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

Done.

+{
+    ASSERT(isMultipartImage());
+    appendDataInternal(bytes, size);
+}
+
 String Resource::reasonNotDeletable() const
 {
     StringBuilder builder;
     if (hasClients()) {
         builder.append("hasClients(");
         builder.appendNumber(m_clients.size());
         if (!m_clientsAwaitingCallback.isEmpty()) {
             builder.append(", AwaitingCallback=");
             builder.appendNumber(m_clientsAwaitingCallback.size());
         }
@@ skipping 133 matching lines @@
 
 void Resource::allClientsRemoved()
 {
     if (!m_loader)
         return;
     if (m_type == MainResource || m_type == Raw || !memoryCache()->contains(this))
         cancelTimerFired(&m_cancelTimer);
     else if (!m_cancelTimer.isActive())
         m_cancelTimer.startOneShot(0, BLINK_FROM_HERE);
 
+    if (m_multipartParser)
+        m_multipartParser->cancel();
     unlock();
 }
 
 void Resource::cancelTimerFired(Timer<Resource>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_cancelTimer);
     if (hasClients() || !m_loader)
         return;
     RefPtrWillBeRawPtr<Resource> protect(this);
     m_loader->cancelIfNotFinishing();
@@ skipping 429 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink