Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 716333 - get rid of WithConversion (xpconnect part). r=bholley

Browse Source
This commit is contained in:
Makoto Kato 2012-03-26 14:12:15 +09:00
parent 41e5eec243
commit d9d6d34cb4
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -159,8 +159,7 @@ mozJSLoaderErrorReporter(JSContext *cx, const char *message, JSErrorReport *rep)
* Got an error object; prepare appropriate-width versions of
* various arguments to it.
*/
nsAutoString fileUni;
fileUni.AssignWithConversion(rep->filename);
NS_ConvertASCIItoUTF16 fileUni(rep->filename);
PRUint32 column = rep->uctokenptr - rep->uclinebuf;

2
js/xpconnect/src/XPCConvert.cpp
View File

@ -1485,7 +1485,7 @@ XPCConvert::JSErrorToXPCException(XPCCallContext& ccx,
if (report && report->ucmessage) {
bestMessage = (const PRUnichar *)report->ucmessage;
} else if (message) {
bestMessage.AssignWithConversion(message);
CopyASCIItoUTF16(message, bestMessage);
} else {
bestMessage.AssignLiteral("JavaScript Error");
}

3
js/xpconnect/src/XPCWrappedJSClass.cpp
View File

@ -1109,8 +1109,7 @@ nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
rv = xpc_exception->ToString(&exn_string);
if (NS_SUCCEEDED(rv)) {
// use toString on the exception as the message
nsAutoString newMessage;
newMessage.AssignWithConversion(exn_string);
NS_ConvertASCIItoUTF16 newMessage(exn_string);
nsMemory::Free((void *) exn_string);
// try to get filename, lineno from the first