corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1384834 (part 2) - Remove remaining uses of nsAdoptingCString. r=erahm.

Browse Source
This commit is contained in:
Nicholas Nethercote
2017-07-28 11:21:47 +10:00
parent 12a9bd1a76
commit 01d077755d
7 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/extensions/WebExtensionPolicy.cpp
View File

@@ -52,15 +52,6 @@ static const char kBackgroundPageHTMLEnd[] = "\n\
<body>\n\
</html>";
class EscapeHTML final : public nsAdoptingCString
{
public:
explicit EscapeHTML(const nsACString& str)
: nsAdoptingCString(nsEscapeHTML(str.BeginReading()))
{}
};
static inline ExtensionPolicyService&
EPS()
{
@@ -258,7 +249,8 @@ WebExtensionPolicy::BackgroundPageHTML() const
result.AppendLiteral(kBackgroundPageHTMLStart);
for (auto& script : mBackgroundScripts.Value()) {
EscapeHTML escaped{NS_ConvertUTF16toUTF8(script)};
nsCString escaped;
escaped.Adopt(nsEscapeHTML(NS_ConvertUTF16toUTF8(script).get()));
result.AppendPrintf(kBackgroundPageHTMLScript, escaped.get());
}