Simplifying finishing a load on Resource

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 306 matching lines @@
 {
     while (!m_clients.isEmpty()) {
         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)
+void Resource::error(const ResourceError& error)
 {
+    ASSERT(!error.isNull());
+    m_error = error;
     if (!m_revalidatingRequest.isNull())
         m_revalidatingRequest = ResourceRequest();
 
-    if (!m_error.isNull() && (m_error.isCancellation() || !isPreloaded()))
+    if (m_error.isCancellation() || !isPreloaded())
         memoryCache()->remove(this);
 
-    setStatus(status);
+    setStatus(LoadError);
     ASSERT(errorOccurred());
     m_data.clear();
     checkNotify();
     markClientsAndObserversFinished();
 }
 
-void Resource::finish()
+void Resource::finish(double loadFinishTime)
 {
     ASSERT(m_revalidatingRequest.isNull());
+    m_loadFinishTime = loadFinishTime;
     if (!errorOccurred())

[yhirano, 2016/05/02 09:31:34]

The CL description suggests we can make this branch an assertion, right?

[Nate Chapin, 2016/05/02 19:32:24]

I don't think it's guaranteed, because a DecodeError causes errorOccurred() to
return true, but won't call error().

         m_status = Cached;
     checkNotify();
     markClientsAndObserversFinished();
 }
 
 AtomicString Resource::httpContentType() const
 {
     return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
@@ skipping 718 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink