Simplify CachedResource::data

Source/WebCore/loader/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 448 matching lines @@
         m_requestCountTracker.clear();
         if (!m_resource->isImage()) {
             cancel();
             return;
         }
     }
 
     RefPtr<ResourceBuffer> buffer = resourceData();
     if (m_loadingMultipartContent && buffer && buffer->size()) {
         sendDataToResource(buffer->data(), buffer->size());
+        m_resource->finishOnePart();
         clearResourceData();
         // Since a subresource loader does not load multipart sections progressively, data was delivered to the loader all at once.
         // After the first multipart section is complete, signal to delegates that this load is "finished"
         m_documentLoader->subresourceLoaderFinishedLoadingOnePart(this);
         didFinishLoadingOnePart(0);
     }
 
     if (m_resource->response().httpStatusCode() < 400 || m_resource->shouldIgnoreHTTPStatusCodeErrors())
         return;
     m_state = Finishing;
@@ skipping 30 matching lines @@
 }
 
 void ResourceLoader::sendDataToResource(const char* data, int length)
 {
     // There are two cases where we might need to create our own SharedBuffer instead of copying the one in ResourceLoader.
     // (1) Multipart content: The loader delivers the data in a multipart section all at once, then sends eof.
     //     The resource data will change as the next part is loaded, so we need to make a copy.
     // (2) Our client requested that the data not be buffered at the ResourceLoader level via ResourceLoaderOptions. In this case,
     //     ResourceLoader::resourceData() will be null. However, unlike the multipart case, we don't want to tell the CachedResource
     //     that all data has been received yet.
-    if (m_loadingMultipartContent || !resourceData()) {
-        RefPtr<ResourceBuffer> copiedData = ResourceBuffer::create(data, length);
-        m_resource->data(copiedData.release(), m_loadingMultipartContent);
-    } else
-        m_resource->data(resourceData(), false);
+    RefPtr<ResourceBuffer> buffer;
+    if (m_loadingMultipartContent || !resourceData())
+        buffer = ResourceBuffer::create(data, length);
+    else
+        buffer = resourceData();
+     m_resource->data(buffer.release());
 }
 
 void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
 {
     if (m_state != Initialized)
         return;
     ASSERT(!reachedTerminalState());
     ASSERT(!m_resource->resourceToRevalidate());
     ASSERT(!m_resource->errorOccurred());
     LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
 
     RefPtr<ResourceLoader> protect(this);
     CachedResourceHandle<CachedResource> protectResource(m_resource);
     m_state = Finishing;
     m_resource->setLoadFinishTime(finishTime);
-    m_resource->data(resourceData(), true);
     m_resource->finish();
     didFinishLoadingOnePart(finishTime);
 
     // If the load has been cancelled by a delegate in response to didFinishLoad(), do not release
     // the resources a second time, they have been released by cancel.
     if (m_cancelled)
         return;
     releaseResources();
 }
 
@@ skipping 49 matching lines @@
     info.addMember(m_originalRequest, "originalRequest");
     info.addMember(m_resourceData, "resourceData");
     info.addMember(m_deferredRequest, "deferredRequest");
     info.addMember(m_options, "options");
     info.addMember(m_resource, "resource");
     info.addMember(m_documentLoader, "documentLoader");
     info.addMember(m_requestCountTracker, "requestCountTracker");
 }
 
 }