Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / fileapi / FileReaderLoader.cpp

diff --git a/src/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp b/src/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp
index 055cff0..af8fac7 100644 (file)
--- a/src/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp
+++ b/src/third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp
@@ -171,8 +171,9 @@ void FileReaderLoader::cleanup()
     }
 }
 
-void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse& response)
+void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
+    ASSERT_UNUSED(handle, !handle);
     if (response.httpStatusCode() != 200) {
         failed(httpStatusCodeToErrorCode(response.httpStatusCode()));
         return;
@@ -227,10 +228,9 @@ void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse&
         m_client->didStartLoading();
 }
 
-void FileReaderLoader::didReceiveData(const char* data, int dataLength)
+void FileReaderLoader::didReceiveData(const char* data, unsigned dataLength)
 {
     ASSERT(data);
-    ASSERT(dataLength > 0);
 
     // Bail out if we already encountered an error.
     if (m_errorCode)
@@ -244,7 +244,7 @@ void FileReaderLoader::didReceiveData(const char* data, int dataLength)
         return;
     }
 
-    unsigned bytesAppended = m_rawData->append(data, static_cast<unsigned>(dataLength));
+    unsigned bytesAppended = m_rawData->append(data, dataLength);
     if (!bytesAppended) {
         m_rawData.clear();
         m_bytesLoaded = 0;