Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: Source/WebCore/loader/cache/CachedRawResource.cpp

Issue 14210003: Simplify CachedResource::data (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/loader/cache/CachedRawResource.h ('k') | Source/WebCore/loader/cache/CachedResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/cache/CachedRawResource.cpp
===================================================================
--- Source/WebCore/loader/cache/CachedRawResource.cpp (revision 148397)
+++ Source/WebCore/loader/cache/CachedRawResource.cpp (working copy)
@@ -42,7 +42,7 @@
{
}
-void CachedRawResource::data(PassRefPtr<ResourceBuffer> data, bool allDataReceived)
+void CachedRawResource::data(PassRefPtr<ResourceBuffer> data)
{
CachedResourceHandle<CachedRawResource> protect(this);
const char* incrementalData = 0;
@@ -57,11 +57,8 @@
incrementalDataLength = data->size() - previousDataLength;
}
- if (m_options.dataBufferingPolicy == BufferData) {
- if (data)
- setEncodedSize(data->size());
- m_data = data;
- }
+ if (m_options.dataBufferingPolicy == BufferData)
+ CachedResource::data(data);
DataBufferingPolicy dataBufferingPolicy = m_options.dataBufferingPolicy;
if (incrementalDataLength) {
@@ -69,7 +66,6 @@
while (CachedRawResourceClient* c = w.next())
c->dataReceived(this, incrementalData, incrementalDataLength);
}
- CachedResource::data(m_data, allDataReceived);
if (dataBufferingPolicy == BufferData && m_options.dataBufferingPolicy == DoNotBufferData) {
if (m_loader)
« no previous file with comments | « Source/WebCore/loader/cache/CachedRawResource.h ('k') | Source/WebCore/loader/cache/CachedResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698