Merge pull request #1163 from win7-7/nsHtml5HtmlAttributes-clear

Introduce a new non-heap-allocated type for holding nsStringBuffer* in the HTML parser

1 files changed, 9 insertions, 6 deletions

diff --git a/parser/html/nsHtml5PlainTextUtils.cpp b/parser/html/nsHtml5PlainTextUtils.cpp
index 4f0eab81b..0d2933150 100644
--- a/parser/html/nsHtml5PlainTextUtils.cpp
+++ b/parser/html/nsHtml5PlainTextUtils.cpp
@@ -5,21 +5,24 @@
 
 #include "nsHtml5PlainTextUtils.h"
 #include "nsHtml5AttributeName.h"
+#include "nsHtml5Portability.h"
 #include "nsIServiceManager.h"
 #include "nsIStringBundle.h"
 #include "mozilla/Preferences.h"
+#include "nsHtml5String.h"
 
 // static
 nsHtml5HtmlAttributes*
 nsHtml5PlainTextUtils::NewLinkAttributes()
 {
   nsHtml5HtmlAttributes* linkAttrs = new nsHtml5HtmlAttributes(0);
-  nsString* rel = new nsString(NS_LITERAL_STRING("alternate stylesheet"));
+  nsHtml5String rel =
+    nsHtml5Portability::newStringFromLiteral("alternate stylesheet");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_REL, rel, -1);
-  nsString* type = new nsString(NS_LITERAL_STRING("text/css"));
+  nsHtml5String type = nsHtml5Portability::newStringFromLiteral("text/css");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_TYPE, type, -1);
-  nsString* href = new nsString(
-      NS_LITERAL_STRING("resource://gre-resources/plaintext.css"));
+  nsHtml5String href = nsHtml5Portability::newStringFromLiteral(
+    "resource://gre-resources/plaintext.css");
   linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_HREF, href, -1);
 
   nsresult rv;
@@ -34,7 +37,7 @@ nsHtml5PlainTextUtils::NewLinkAttributes()
     bundle->GetStringFromName(u"plainText.wordWrap", getter_Copies(title));
   }
 
-  nsString* titleCopy = new nsString(title);
-  linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_TITLE, titleCopy, -1);
+  linkAttrs->addAttribute(
+    nsHtml5AttributeName::ATTR_TITLE, nsHtml5String::FromString(title), -1);
   return linkAttrs;
 }