From be01689f43cf6882cf670d33df49ead1f570c53a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 27 May 2012 21:51:42 +0200 Subject: Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629) --- Source/WebCore/fileapi/FileReader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/fileapi/FileReader.cpp') 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 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 -- cgit v1.2.1