diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
| commit | be01689f43cf6882cf670d33df49ead1f570c53a (patch) | |
| tree | 4bb2161d8983b38e3e7ed37b4a50303bfd5e2e85 /Source/WebCore/fileapi | |
| parent | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (diff) | |
| download | qtwebkit-be01689f43cf6882cf670d33df49ead1f570c53a.tar.gz | |
Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)
Diffstat (limited to 'Source/WebCore/fileapi')
| -rw-r--r-- | Source/WebCore/fileapi/FileReader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/fileapi/FileReader.cpp b/Source/WebCore/fileapi/FileReader.cpp index e05b1d971..ab7c2b3b2 100644 --- a/Source/WebCore/fileapi/FileReader.cpp +++ b/Source/WebCore/fileapi/FileReader.cpp @@ -218,6 +218,7 @@ void FileReader::didFinishLoading() ASSERT(m_state != DONE); m_state = DONE; + fireEvent(eventNames().progressEvent); fireEvent(eventNames().loadEvent); fireEvent(eventNames().loadendEvent); @@ -254,7 +255,10 @@ PassRefPtr<ArrayBuffer> FileReader::arrayBufferResult() const String FileReader::stringResult() { - return m_loader ? m_loader->stringResult() : ""; + String ret = m_loader ? m_loader->stringResult() : ""; + if (ret.isEmpty()) + return String(); + return ret; } } // namespace WebCore |