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/fileapi/FileReaderLoader.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/fileapi/FileReaderLoader.cpp')
| -rw-r--r-- | Source/WebCore/fileapi/FileReaderLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/fileapi/FileReaderLoader.cpp b/Source/WebCore/fileapi/FileReaderLoader.cpp index 918ffba..c9ef688 100644 --- a/Source/WebCore/fileapi/FileReaderLoader.cpp +++ b/Source/WebCore/fileapi/FileReaderLoader.cpp @@ -154,16 +154,16 @@ void FileReaderLoader::didReceiveResponse(const ResourceResponse& response) m_client->didStartLoading(); } -void FileReaderLoader::didReceiveData(const char* data, int lengthReceived) +void FileReaderLoader::didReceiveData(const char* data, int dataLength) { ASSERT(data); - ASSERT(lengthReceived > 0); + ASSERT(dataLength > 0); // Bail out if we already encountered an error. if (m_errorCode) return; - int length = lengthReceived; + int length = dataLength; unsigned remainingBufferSpace = m_totalBytes - m_bytesLoaded; if (length > static_cast<long long>(remainingBufferSpace)) length = static_cast<int>(remainingBufferSpace); |