Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1384834 (part 1) - Remove remaining uses of nsAdoptingString. r=erahm.

Browse Source 
--HG--
extra : rebase_source : c81ee11b9d08198a000979760a8e29a01e9498d0
This commit is contained in:
Nicholas Nethercote 2017-07-28 11:21:45 +10:00
parent 259c778e9b
commit d18fdecf67
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/base/nsGlobalWindow.cpp
View File

@ -7814,9 +7814,10 @@ nsGlobalWindow::PromptOuter(const nsAString& aMessage,
return;
}
nsAdoptingString outValue(inoutValue);
nsString outValue;
outValue.Adopt(inoutValue);
if (ok && outValue) {
if (ok && inoutValue) {
aReturn.Assign(outValue);
}
}

1
dom/security/test/gtest/TestCSPParser.cpp
View File

@ -19,7 +19,6 @@ class nsACString;
class nsAString;
class nsString;
class nsCString;
class nsAdoptingString;
class nsAdoptingCString;
class nsXPIDLString;
template<class T> class nsReadingIterator;

2
intl/uconv/nsTextToSubURI.cpp
View File

@ -152,7 +152,7 @@ NS_IMETHODIMP nsTextToSubURI::UnEscapeURIForUI(const nsACString & aCharset,
// If there are any characters that are unsafe for URIs, reescape those.
if (mUnsafeChars.IsEmpty()) {
nsAdoptingString blacklist;
nsAutoString blacklist;
nsresult rv = mozilla::Preferences::GetString("network.IDN.blacklist_chars",
blacklist);
if (NS_SUCCEEDED(rv)) {

6
netwerk/streamconv/converters/nsIndexedToHTML.cpp
View File

@ -858,9 +858,11 @@ nsIndexedToHTML::OnInformationAvailable(nsIRequest *aRequest,
nsISupports *aCtxt,
const nsAString& aInfo) {
nsAutoCString pushBuffer;
nsAdoptingString escaped(nsEscapeHTML2(PromiseFlatString(aInfo).get()));
if (!escaped)
char16_t* str = nsEscapeHTML2(PromiseFlatString(aInfo).get());
if (!str)
return NS_ERROR_OUT_OF_MEMORY;
nsString escaped;
escaped.Adopt(str);
pushBuffer.AppendLiteral("<tr>\n <td>");
// escaped is provided in Unicode, so write hex NCRs as necessary
// to prevent the HTML parser from applying a character set.

1
widget/tests/TestChromeMargin.cpp
View File

@ -26,7 +26,6 @@ class nsACString;
class nsAString;
class nsString;
class nsCString;
class nsAdoptingString;
class nsAdoptingCString;
class nsXPIDLString;
template<class T> class nsReadingIterator;