wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 972038 - Replace calls to GetMessageMoz with ToString to save callers from having to convert to UTF-8. r=jimm

Browse Source
This commit is contained in:
Justin Shrake 2014-02-18 09:47:54 -05:00
parent 46f5d5506d
commit 9c72784f86
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpcom/base/nsConsoleService.cpp
View File

@ -168,12 +168,11 @@ nsConsoleService::LogMessageWithMode(nsIConsoleMessage *message, nsConsoleServic
}
if (NS_IsMainThread() && mDeliveringMessage) {
nsString msg;
message->GetMessageMoz(getter_Copies(msg));
nsCString msg;
message->ToString(msg);
NS_WARNING(nsPrintfCString("Reentrancy error: some client attempted "
"to display a message to the console while in a console listener. "
"The following message was discarded: \"%s\"",
NS_ConvertUTF16toUTF8(msg).get()).get());
"The following message was discarded: \"%s\"", msg.get()).get());
return NS_ERROR_FAILURE;
}
@ -194,11 +193,10 @@ nsConsoleService::LogMessageWithMode(nsIConsoleMessage *message, nsConsoleServic
#if defined(ANDROID)
if (outputMode == OutputToLog)
{
nsXPIDLString msg;
message->GetMessageMoz(getter_Copies(msg));
nsCString msg;
message->ToString(msg);
__android_log_print(ANDROID_LOG_ERROR, "GeckoConsole",
"%s",
NS_LossyConvertUTF16toASCII(msg).get());
"%s", msg.get());
}
#endif
#ifdef XP_WIN