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 231 matching lines @@
 
     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");
     ASSERT(m_revalidatingRequest.isNull());
     ASSERT(!errorOccurred());

[hiroshige, 2016/03/01 22:34:24]

This assertion fails on mac bots in layout test
http/tests/multipart/stop-crash.html (seems flaky though), probably due to this
CL:
https://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel...

[yhirano, 2016/03/02 00:32:10]

Nice catch! Fixed.

     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());
 }
 
 void Resource::setResourceBuffer(PassRefPtr<SharedBuffer> resourceBuffer)
@@ skipping 33 matching lines @@
 
     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());
-    finishOnePart();
+    setLoading(false);
+    checkNotify();
     markClientsFinished();
     if (!errorOccurred())
         m_status = Cached;
 }
 
 AtomicString Resource::httpContentType() const
 {
     return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
@@ skipping 128 matching lines @@
 {
     m_responseTimestamp = currentTime();
 
     if (!m_revalidatingRequest.isNull()) {
         if (response.httpStatusCode() == 304) {
             revalidationSucceeded(response);
             return;
         }
         revalidationFailed();
     }
-
     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 641 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink