diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/loader/appcache | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/loader/appcache')
| -rw-r--r-- | Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/loader/appcache/ApplicationCacheGroup.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/loader/appcache/ApplicationCacheHost.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp index 01c3836..1d347a8 100644 --- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp +++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp @@ -553,9 +553,9 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res m_currentResource = ApplicationCacheResource::create(url, response, type); } -void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, int length, int lengthReceived) +void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, int length, int encodedDataLength) { - UNUSED_PARAM(lengthReceived); + UNUSED_PARAM(encodedDataLength); #if ENABLE(INSPECTOR) InspectorInstrumentation::didReceiveContentLength(m_frame, m_currentResourceIdentifier, length, 0); diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h index f3a117e..ab7b16b 100644 --- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h +++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h @@ -112,7 +112,7 @@ private: virtual bool shouldUseCredentialStorage(ResourceHandle*) { return true; } virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&); - virtual void didReceiveData(ResourceHandle*, const char*, int length, int lengthReceived); + virtual void didReceiveData(ResourceHandle*, const char*, int length, int encodedDataLength); virtual void didFinishLoading(ResourceHandle*, double finishTime); virtual void didFail(ResourceHandle*, const ResourceError&); diff --git a/Source/WebCore/loader/appcache/ApplicationCacheHost.h b/Source/WebCore/loader/appcache/ApplicationCacheHost.h index 56a5f57..24073cf 100644 --- a/Source/WebCore/loader/appcache/ApplicationCacheHost.h +++ b/Source/WebCore/loader/appcache/ApplicationCacheHost.h @@ -126,7 +126,7 @@ namespace WebCore { void maybeLoadMainResourceForRedirect(ResourceRequest&, SubstituteData&); bool maybeLoadFallbackForMainResponse(const ResourceRequest&, const ResourceResponse&); bool maybeLoadFallbackForMainError(const ResourceRequest&, const ResourceError&); - void mainResourceDataReceived(const char* data, int length, long long lengthReceived, bool allAtOnce); + void mainResourceDataReceived(const char* data, int length, long long encodedDataLength, bool allAtOnce); void finishedLoadingMainResource(); void failedLoadingMainResource(); |