Bug 1488628 - Change nsIConsoleMessage.message to an AString. r=erahm

--HG--
extra : rebase_source : e43aec79e309936e17d475b8c50559767538c18d

dom/bindings/nsScriptError.cpp

@@ -87,22 +87,18 @@ nsScriptErrorBase::InitializeOnMainThread()
 
 // nsIConsoleMessage methods
 NS_IMETHODIMP
-nsScriptErrorBase::GetMessageMoz(char16_t** result) {
-    nsresult rv;
-
+nsScriptErrorBase::GetMessageMoz(nsAString& aMessage)
+{
     nsAutoCString message;
-    rv = ToString(message);
-    if (NS_FAILED(rv))
+    nsresult rv = ToString(message);
+    if (NS_FAILED(rv)) {
         return rv;
+    }
 
-    *result = UTF8ToNewUnicode(message);
-    if (!*result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
+    CopyUTF8toUTF16(message, aMessage);
     return NS_OK;
 }
 
-
 NS_IMETHODIMP
 nsScriptErrorBase::GetLogLevel(uint32_t* aLogLevel)
 {

dom/ipc/ContentChild.cpp

@@ -516,7 +516,7 @@ ConsoleListener::Observe(nsIConsoleMessage* aMessage)
   }
 
   nsString msg;
-  nsresult rv = aMessage->GetMessageMoz(getter_Copies(msg));
+  nsresult rv = aMessage->GetMessageMoz(msg);
   NS_ENSURE_SUCCESS(rv, rv);
   mChild->SendConsoleMessage(msg);
   return NS_OK;

js/xpconnect/src/XPCConvert.cpp

@@ -1197,7 +1197,7 @@ XPCConvert::ConstructException(nsresult rv, const char* message,
     nsCOMPtr<nsIScriptError> errorObject = do_QueryInterface(data);
     if (errorObject) {
         nsString xmsg;
-        if (NS_SUCCEEDED(errorObject->GetMessageMoz(getter_Copies(xmsg)))) {
+        if (NS_SUCCEEDED(errorObject->GetMessageMoz(xmsg))) {
             CopyUTF16toUTF8(xmsg, sxmsg);
             msg = sxmsg.get();
         }

toolkit/xre/nsConsoleWriter.cpp

@@ -82,7 +82,7 @@ WriteConsoleLog()
   nsAutoCString nativemsg;
 
   for (uint32_t i = 0; i < mcount; ++i) {
-    rv = messages[i]->GetMessageMoz(getter_Copies(msg));
+    rv = messages[i]->GetMessageMoz(msg);
     if (NS_SUCCEEDED(rv)) {
       NS_CopyUnicodeToNative(msg, nativemsg);
       PR_fprintf(file, "%s" NS_LINEBREAK, nativemsg.get());

xpcom/base/nsConsoleMessage.cpp

@@ -26,10 +26,9 @@ nsConsoleMessage::nsConsoleMessage(const char16_t* aMessage)
 }
 
 NS_IMETHODIMP
-nsConsoleMessage::GetMessageMoz(char16_t** aResult)
+nsConsoleMessage::GetMessageMoz(nsAString& aMessage)
 {
-  *aResult = ToNewUnicode(mMessage);
-
+  aMessage = mMessage;
   return NS_OK;
 }
 

xpcom/base/nsConsoleService.cpp

@@ -303,7 +303,7 @@ nsConsoleService::LogMessageWithMode(nsIConsoleMessage* aMessage,
 #ifdef XP_WIN
     if (gLoggingToDebugger && IsDebuggerPresent()) {
       nsString msg;
-      aMessage->GetMessageMoz(getter_Copies(msg));
+      aMessage->GetMessageMoz(msg);
       msg.Append('\n');
       OutputDebugStringW(msg.get());
     }

xpcom/base/nsIConsoleMessage.idl

@@ -32,7 +32,7 @@ interface nsIConsoleMessage : nsISupports
      */
     readonly attribute long long timeStamp;
 
-    [binaryname(MessageMoz)] readonly attribute wstring message;
+    [binaryname(MessageMoz)] readonly attribute AString message;
 
     AUTF8String toString();
 };