Bug 1313858 - Port Bug 1310345: Change argument 1 for FindChildWithName to an NS_LITERAL_STRING. r=jorgk a=bustage-fix CLOSED TREE DONTBUILD
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 29 Oct 2016 08:13:00 +0200
changeset 20626 77813df1499535e040fee3b34f217f0d5ead705e
parent 20625 bd030cae9a11ed402c26c7129736da6fe565f811
child 20627 6b8c7cd17855f7de5eccb0ea9efcd5dbccc68573
push id12467
push usermozilla@jorgk.com
push dateSat, 29 Oct 2016 16:51:59 +0000
treeherdercomm-central@6b8c7cd17855 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, bustage-fix
bugs1313858, 1310345
Bug 1313858 - Port Bug 1310345: Change argument 1 for FindChildWithName to an NS_LITERAL_STRING. r=jorgk a=bustage-fix CLOSED TREE DONTBUILD
mailnews/base/src/nsMessenger.cpp
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/src/nsMsgWindow.cpp
mailnews/compose/src/nsMsgComposeService.cpp
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -247,17 +247,17 @@ NS_IMETHODIMP nsMessenger::SetWindow(moz
     nsIDocShell *docShell = win->GetDocShell();
     nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(docShell));
     NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsIDocShellTreeItem> rootDocShellAsItem;
     docShellAsItem->GetSameTypeRootTreeItem(getter_AddRefs(rootDocShellAsItem));
 
     nsCOMPtr<nsIDocShellTreeItem> childAsItem;
-    rv = rootDocShellAsItem->FindChildWithName(u"messagepane", true, false,
+    rv = rootDocShellAsItem->FindChildWithName(NS_LITERAL_STRING("messagepane"), true, false,
                                                nullptr, nullptr, getter_AddRefs(childAsItem));
 
     mDocShell = do_QueryInterface(childAsItem);
     if (NS_SUCCEEDED(rv) && mDocShell) {
       mCurrentDisplayCharset = ""; // Important! Clear out mCurrentDisplayCharset so we reset a default charset on mDocshell the next time we try to load something into it.
 
       if (aMsgWindow)
         aMsgWindow->GetTransactionManager(getter_AddRefs(mTxnMgr));
--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -232,17 +232,17 @@ nsMsgPrintEngine::SetWindow(mozIDOMWindo
   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem =
     do_QueryInterface(window->GetDocShell());
   NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIDocShellTreeItem> rootAsItem;
   docShellAsItem->GetSameTypeRootTreeItem(getter_AddRefs(rootAsItem));
 
   nsCOMPtr<nsIDocShellTreeItem> childItem;
-  rootAsItem->FindChildWithName(u"content", true,
+  rootAsItem->FindChildWithName(NS_LITERAL_STRING("content"), true,
 				false, nullptr, nullptr,
 				getter_AddRefs(childItem));
 
   mDocShell = do_QueryInterface(childItem);
 
   if(mDocShell)
     SetupObserver();
 
--- a/mailnews/base/src/nsMsgWindow.cpp
+++ b/mailnews/base/src/nsMsgWindow.cpp
@@ -82,17 +82,17 @@ NS_IMETHODIMP nsMsgWindow::GetMessageWin
   if (!docShell)
   {
     // if we don't have a docshell, then we need to look up the message pane docshell
     nsCOMPtr<nsIDocShell> rootShell(do_QueryReferent(mRootDocShellWeak));
     if (rootShell)
     {
       nsCOMPtr<nsIDocShellTreeItem> msgDocShellItem;
       if(rootShell)
-         rootShell->FindChildWithName(u"messagepane",
+         rootShell->FindChildWithName(NS_LITERAL_STRING("messagepane"),
                                       true, false, nullptr, nullptr,
                                       getter_AddRefs(msgDocShellItem));
       NS_ENSURE_TRUE(msgDocShellItem, NS_ERROR_FAILURE);
       docShell = do_QueryInterface(msgDocShellItem);
       // we don't own mMessageWindowDocShell so don't try to keep a reference to it!
       mMessageWindowDocShellWeak = do_GetWeakReference(docShell);
     }
   }
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -264,17 +264,17 @@ nsMsgComposeService::GetOrigWindowSelect
     return NS_ERROR_ABORT;
 
   // Now delve down in to the message to get the HTML representation of the selection
   nsCOMPtr<nsIDocShell> rootDocShell;
   rv = aMsgWindow->GetRootDocShell(getter_AddRefs(rootDocShell));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIDocShellTreeItem> childAsItem;
-  rv = rootDocShell->FindChildWithName(u"messagepane",
+  rv = rootDocShell->FindChildWithName(NS_LITERAL_STRING("messagepane"),
                                        true, false, nullptr, nullptr, getter_AddRefs(childAsItem));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(childAsItem, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<mozIDOMWindowProxy> domWindow(do_GetInterface(childAsItem));
   NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE);