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/NetscapePlugInStreamLoader.cpp | |
| 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/NetscapePlugInStreamLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/NetscapePlugInStreamLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp b/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp index 75a2fe9..97a3ce6 100644 --- a/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp +++ b/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp @@ -92,13 +92,13 @@ void NetscapePlugInStreamLoader::didReceiveResponse(const ResourceResponse& resp didCancel(frameLoader()->fileDoesNotExistError(response)); } -void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long lengthReceived, bool allAtOnce) +void NetscapePlugInStreamLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce) { RefPtr<NetscapePlugInStreamLoader> protect(this); m_client->didReceiveData(this, data, length); - ResourceLoader::didReceiveData(data, length, lengthReceived, allAtOnce); + ResourceLoader::didReceiveData(data, length, encodedDataLength, allAtOnce); } void NetscapePlugInStreamLoader::didFinishLoading(double finishTime) |