Simplify CachedResource::data

Source/WebCore/loader/cache/CachedResource.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 331 matching lines @@
 void CachedResource::checkNotify()
 {
     if (isLoading())
         return;
 
     CachedResourceClientWalker<CachedResourceClient> w(m_clients);
     while (CachedResourceClient* c = w.next())
         c->notifyFinished(this);
 }
 
-void CachedResource::data(PassRefPtr<ResourceBuffer>, bool allDataReceived)
+void CachedResource::data(PassRefPtr<ResourceBuffer> data)
 {
-    if (!allDataReceived)
-        return;
-    
-    setLoading(false);
-    checkNotify();
+    m_data = data;
+    setEncodedSize(m_data ? m_data->size() : 0);
 }
 
 void CachedResource::error(CachedResource::Status status)
 {
     setStatus(status);
     ASSERT(errorOccurred());
     m_data.clear();
 
     setLoading(false);
     checkNotify();
 }
 
+void CachedResource::finishOnePart()
+{
+    setLoading(false);
+    checkNotify();
+}
+
 void CachedResource::finish()
 {
+    finishOnePart();
     if (!errorOccurred())
         m_status = Cached;
 }
 
 bool CachedResource::passesAccessControlCheck(SecurityOrigin* securityOrigin)
 {
     String errorDescription;
     return WebCore::passesAccessControlCheck(m_response, resourceRequest().allowCookies() ? AllowStoredCredentials : DoNotAllowStoredCredentials, securityOrigin, errorDescription);
 }
 
@@ skipping 76 matching lines @@
     return m_cachedMetadata.get();
 }
 
 void CachedResource::stopLoading()
 {
     ASSERT(m_loader);            
     m_loader = 0;
 
     CachedResourceHandle<CachedResource> protect(this);
 
-    // All loads finish with data(allDataReceived = true) or error(), except for
+    // All loads finish with finish() or error(), except for
     // canceled loads, which silently set our request to 0. Be sure to notify our
     // client in that case, so we don't seem to continue loading forever.
     if (isLoading()) {
         setLoading(false);
         setStatus(LoadError);
         checkNotify();
     }
 }
 
 void CachedResource::addClient(CachedResourceClient* client)
@@ skipping 452 matching lines @@
     info.addMember(m_proxyResource, "proxyResource");
     info.addMember(m_handlesToRevalidate, "handlesToRevalidate");
     info.addMember(m_options, "options");
     info.addMember(m_decodedDataDeletionTimer, "decodedDataDeletionTimer");
     info.ignoreMember(m_clientsAwaitingCallback);
 
     if (m_purgeableData && !m_purgeableData->wasPurged())
         info.addRawBuffer(m_purgeableData.get(), m_purgeableData->size(), "PurgeableData", "purgeableData");
 }
 }