From 6b807f93967045602c46971e308cd6ad285d75ef Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 22 Oct 2014 11:40:48 -0400 Subject: [PATCH] Bug 1019191 part 8. Stop using xpc_qsACString in XPConnect. r=bholley --- js/xpconnect/src/nsXPConnect.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 0d09a8f94bf..c92aad635ec 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -1199,12 +1199,10 @@ Base64Encode(JSContext *cx, HandleValue val, MutableHandleValue out) { MOZ_ASSERT(cx); - JS::RootedValue root(cx, val); - xpc_qsACString encodedString(cx, root, &root, false, - xpc_qsACString::eStringify, - xpc_qsACString::eStringify); - if (!encodedString.IsValid()) + nsAutoCString encodedString; + if (!ConvertJSValueToByteString(cx, val, false, encodedString)) { return false; + } nsAutoCString result; if (NS_FAILED(mozilla::Base64Encode(encodedString, result))) { @@ -1225,12 +1223,10 @@ Base64Decode(JSContext *cx, HandleValue val, MutableHandleValue out) { MOZ_ASSERT(cx); - JS::RootedValue root(cx, val); - xpc_qsACString encodedString(cx, root, &root, false, - xpc_qsACString::eStringify, - xpc_qsACString::eStringify); - if (!encodedString.IsValid()) + nsAutoCString encodedString; + if (!ConvertJSValueToByteString(cx, val, false, encodedString)) { return false; + } nsAutoCString result; if (NS_FAILED(mozilla::Base64Decode(encodedString, result))) {