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/nsContentUtils.h | |
| 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/nsContentUtils.h')
| -rw-r--r-- | dom/base/nsContentUtils.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 278fbd008..f688eeecf 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -554,9 +554,17 @@ public: * string (meaning UTF-8) */ static nsresult ConvertStringFromEncoding(const nsACString& aEncoding, - const nsACString& aInput, + const char* aInput, + uint32_t aInputLen, nsAString& aOutput); + static nsresult ConvertStringFromEncoding(const nsACString& aEncoding, + const nsACString& aInput, + nsAString& aOutput) { + return ConvertStringFromEncoding( + aEncoding, aInput.BeginReading(), aInput.Length(), aOutput); + } + /** * Determine whether a buffer begins with a BOM for UTF-8, UTF-16LE, * UTF-16BE |