diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-07 12:03:46 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-07 12:03:46 +0100 |
| commit | f8d1830b530cd553d788b3579d41725d35c4da7f (patch) | |
| tree | c995f1eed357cbeb7ed9bbe9d2319ca802b77a26 /dom/base/FileReader.cpp | |
| parent | 0f3e990615adfd42ae9cfbe13a6259cb6a0368c4 (diff) | |
| parent | e9f79ad46582ca150ef193252851015a031d1556 (diff) | |
| download | UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.gz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.lz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.xz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'dom/base/FileReader.cpp')
| -rw-r--r-- | dom/base/FileReader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dom/base/FileReader.cpp b/dom/base/FileReader.cpp index 003edc61f..63a0ef2ee 100644 --- a/dom/base/FileReader.cpp +++ b/dom/base/FileReader.cpp @@ -452,8 +452,8 @@ FileReader::GetAsText(Blob *aBlob, } } - nsDependentCSubstring data(aFileData, aDataLen); - return nsContentUtils::ConvertStringFromEncoding(encoding, data, aResult); + return nsContentUtils::ConvertStringFromEncoding( + encoding, aFileData, aDataLen, aResult); } nsresult |