Bug 1446097. Switch to "set" as the canonical nsGkAtoms name of the string "set", so it matches the actual tag name "set" in SVG. r=hsivonen,njn
Most of the noise is from the fact that clang-format on parser/html/*.{h,cpp}
reformatted all sorts of stuff. Not running it caused lots of format changes
from the generator... I guess we changed the format rules since the last time
this got run?
MozReview-Commit-ID: IA2G87zUIKN
This commit is contained in:
@@ -2,14 +2,13 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
|
||||
#include "nsHtml5PlainTextUtils.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "nsHtml5AttributeName.h"
|
||||
#include "nsHtml5Portability.h"
|
||||
#include "nsHtml5String.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "nsHtml5String.h"
|
||||
|
||||
// static
|
||||
nsHtml5HtmlAttributes*
|
||||
@@ -26,12 +25,15 @@ nsHtml5PlainTextUtils::NewLinkAttributes()
|
||||
linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_HREF, href, -1);
|
||||
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv) && bundleService, "The bundle service could not be loaded");
|
||||
nsCOMPtr<nsIStringBundleService> bundleService =
|
||||
do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv) && bundleService,
|
||||
"The bundle service could not be loaded");
|
||||
nsCOMPtr<nsIStringBundle> bundle;
|
||||
rv = bundleService->CreateBundle("chrome://global/locale/browser.properties",
|
||||
getter_AddRefs(bundle));
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv) && bundle, "chrome://global/locale/browser.properties could not be loaded");
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv) && bundle,
|
||||
"chrome://global/locale/browser.properties could not be loaded");
|
||||
nsAutoString title;
|
||||
if (bundle) {
|
||||
bundle->GetStringFromName("plainText.wordWrap", title);
|
||||
|
||||
Reference in New Issue
Block a user