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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/fetch/MultipartImageResourceParser.h"
 
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLResponse.h"
 #include "wtf/NotFound.h"
 #include "wtf/text/WTFString.h"
 
 #include <algorithm>
 
 namespace blink {
 
 MultipartImageResourceParser::MultipartImageResourceParser(const ResourceResponse& response, const Vector<char>& boundary, Client* client)
     : m_originalResponse(response)
     , m_boundary(boundary)
     , m_client(client)
 {
     // Some servers report a boundary prefixed with "--".  See https://crbug.com/5786.
     if (m_boundary.size() < 2 || m_boundary[0] != '-' || m_boundary[1] != '-')
         m_boundary.prepend("--", 2);
 }
 
 void MultipartImageResourceParser::appendData(const char* bytes, size_t size)
 {
+    ASSERT(!isCancelled());
     // m_sawLastBoundary means that we've already received the final boundary
     // token. The server should stop sending us data at this point, but if it
     // does, we just throw it away.
     if (m_sawLastBoundary)
         return;
     m_data.append(bytes, size);
 
     if (m_isParsingTop) {
         // Eat leading \r\n
         size_t pos = pushOverLine(m_data, 0);
@@ skipping 58 matching lines @@
 
         // We can now throw out data up through the boundary
         size_t offset = pushOverLine(m_data, boundaryEndPosition);
         m_data.remove(0, boundaryEndPosition + offset);
 
         // Ok, back to parsing headers
         if (!parseHeaders()) {
             m_isParsingHeaders = true;
             break;
         }
+        if (isCancelled())
+            return;
     }
 
     // At this point, we should send over any data we have, but keep enough data
     // buffered to handle a boundary that may have been truncated.
     if (!m_isParsingHeaders && m_data.size() > m_boundary.size()) {
         // If the last character is a new line character, go ahead and just send
         // everything we have buffered.  This matches an optimization in Gecko.
         size_t sendLength = m_data.size() - m_boundary.size();
         if (m_data.last() == '\n')
             sendLength = m_data.size();
         m_client->multipartDataReceived(m_data.data(), sendLength);
         m_data.remove(0, sendLength);
     }
 }
 
 void MultipartImageResourceParser::finish()
 {
     ASSERT(!isCancelled());
+    if (m_sawLastBoundary)
+        return;
     // If we have any pending data and we're not in a header, go ahead and send
     // it to the client.
-    if (!m_isParsingHeaders && !m_data.isEmpty() && !m_sawLastBoundary)
+    if (!m_isParsingHeaders && !m_data.isEmpty())
         m_client->multipartDataReceived(m_data.data(), m_data.size());
     m_data.clear();
     m_sawLastBoundary = true;
 }
 
 size_t MultipartImageResourceParser::pushOverLine(const Vector<char>& data, size_t pos)
 {
     size_t offset = 0;
     // TODO(yhirano): This function has two problems. Fix them.
     //  1. It eats "\n\n".
@@ skipping 14 matching lines @@
     // does. See netwerk/streamconv/converters/nsMultiMixedConv.cpp.
     WebURLResponse response(m_originalResponse.url());
     for (const auto& header : m_originalResponse.httpHeaderFields())
         response.addHTTPHeaderField(header.key, header.value);
 
     size_t end = 0;
     if (!Platform::current()->parseMultipartHeadersFromBody(m_data.data(), m_data.size(), &response, &end))
         return false;
     m_data.remove(0, end);
 
-    // To avoid recording every multipart load as a separate visit in
-    // the history database, we want to keep track of whether the response
-    // is part of a multipart payload.  We do want to record the first visit,
-    // so we only set isMultipartPayload to true after the first visit.
-    response.setIsMultipartPayload(!m_isFirstPart);
+    bool isFirstPart = m_isFirstPart;
     m_isFirstPart = false;
     // Send the response!
-    m_client->onePartInMultipartReceived(response.toResourceResponse());
+    m_client->onePartInMultipartReceived(response.toResourceResponse(), isFirstPart);
 
     return true;
 }
 
 // Boundaries are supposed to be preceeded with --, but it looks like gecko
 // doesn't require the dashes to exist.  See nsMultiMixedConv::FindToken.
 size_t MultipartImageResourceParser::findBoundary(const Vector<char>& data, Vector<char>* boundary)
 {
     auto it = std::search(data.data(), data.data() + data.size(), boundary->data(), boundary->data() + boundary->size());
     if (it == data.data() + data.size())
@@ skipping 13 matching lines @@
     }
     return boundaryPosition;
 }
 
 DEFINE_TRACE(MultipartImageResourceParser)
 {
     visitor->trace(m_client);
 }
 
 } // namespace blink