Simplifying finishing a load on Resource

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

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 6c23408758d9af40db04572e91476aa76ebbb761..ff49288d3c89a16b80c715ef6e3e207f82c5b55a 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -324,24 +324,27 @@ void Resource::markClientsAndObserversFinished()
     }
 }
 
-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())
         m_status = Cached;
     checkNotify();