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

Bug 1251235 - changed from naked pointers to UniquePtr to prevent resource leak. r=froydnj

Browse Source 
MozReview-Commit-ID: FVZWMdASQKG
This commit is contained in:
Bogdan Postelnicu
2016-02-25 16:34:21 +02:00
parent 6ce1dc1daf
commit e1b5a2285c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parser/html/nsHtml5ViewSourceUtils.cpp
View File

@@ -6,16 +6,17 @@
#include "nsHtml5ViewSourceUtils.h"
#include "nsHtml5AttributeName.h"
#include "mozilla/Preferences.h"
#include "mozilla/UniquePtr.h"
// static
nsHtml5HtmlAttributes*
nsHtml5ViewSourceUtils::NewBodyAttributes()
{
nsHtml5HtmlAttributes* bodyAttrs = new nsHtml5HtmlAttributes(0);
nsString* id = new nsString(NS_LITERAL_STRING("viewsource"));
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_ID, id);
auto id = MakeUnique<nsString>(NS_LITERAL_STRING("viewsource"));
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_ID, id.release());
nsString* klass = new nsString();
auto klass = MakeUnique<nsString>();
if (mozilla::Preferences::GetBool("view_source.wrap_long_lines", true)) {
klass->Append(NS_LITERAL_STRING("wrap "));
}
@@ -23,14 +24,14 @@ nsHtml5ViewSourceUtils::NewBodyAttributes()
klass->Append(NS_LITERAL_STRING("highlight"));
}
if (!klass->IsEmpty()) {
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_CLASS, klass);
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_CLASS, klass.release());
}
int32_t tabSize = mozilla::Preferences::GetInt("view_source.tab_size", 4);
if (tabSize > 0) {
nsString* style = new nsString(NS_LITERAL_STRING("-moz-tab-size: "));
auto style = MakeUnique<nsString>(NS_LITERAL_STRING("-moz-tab-size: "));
style->AppendInt(tabSize);
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_STYLE, style);
bodyAttrs->addAttribute(nsHtml5AttributeName::ATTR_STYLE, style.release());
}
return bodyAttrs;