8b5bdf0867
Most of the names passed to nsIStringBundle::{Get,Format}StringFromUTF8Name
have one of the two following forms:
- a 16-bit C string literal, which is then converted to an 8-bit string in
order for the lookup to occur;
- an 8-bit C string literal converted to a 16-bit string, which is then
converted back to an 8-bit string in order for the lookup to occur.
This patch introduces and uses alternative methods that can take an 8-bit C
string literal, which requires changing some signatures in other methods and
functions. It replaces all C++ uses of the old methods.
The patch also changes the existing {Get,Format}StringFromName() methods so
they take an AUTF8String argument for the name instead of a wstring, because
that's nicer for JS code.
Even though there is a method for C++ code and a different one for JS code,
|binaryname| is used so that the existing method names can be used for the
common case in both languages.
The change reduces the number of NS_ConvertUTF8toUTF16 and
NS_ConvertUTF16toUTF8 conversions while running Speedometer v2 from ~270,000 to
~160,000. (Most of these conversions involved the string
"deprecatedReferrerDirective" in nsCSPParser.cpp.)
65 lines
1.8 KiB
C++
65 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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 "nsIServiceManager.h"
|
|
#include "nsIStringBundle.h"
|
|
#include "nsXPIDLString.h"
|
|
#include "nsParserMsgUtils.h"
|
|
#include "nsNetCID.h"
|
|
#include "mozilla/Services.h"
|
|
|
|
static nsresult GetBundle(const char * aPropFileName, nsIStringBundle **aBundle)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aPropFileName);
|
|
NS_ENSURE_ARG_POINTER(aBundle);
|
|
|
|
// Create a bundle for the localization
|
|
|
|
nsCOMPtr<nsIStringBundleService> stringService =
|
|
mozilla::services::GetStringBundleService();
|
|
if (!stringService)
|
|
return NS_ERROR_FAILURE;
|
|
|
|
return stringService->CreateBundle(aPropFileName, aBundle);
|
|
}
|
|
|
|
nsresult
|
|
nsParserMsgUtils::GetLocalizedStringByName(const char * aPropFileName, const char* aKey, nsString& oVal)
|
|
{
|
|
oVal.Truncate();
|
|
|
|
NS_ENSURE_ARG_POINTER(aKey);
|
|
|
|
nsCOMPtr<nsIStringBundle> bundle;
|
|
nsresult rv = GetBundle(aPropFileName,getter_AddRefs(bundle));
|
|
if (NS_SUCCEEDED(rv) && bundle) {
|
|
nsXPIDLString valUni;
|
|
rv = bundle->GetStringFromName(aKey, getter_Copies(valUni));
|
|
if (NS_SUCCEEDED(rv) && valUni) {
|
|
oVal.Assign(valUni);
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsParserMsgUtils::GetLocalizedStringByID(const char * aPropFileName, uint32_t aID, nsString& oVal)
|
|
{
|
|
oVal.Truncate();
|
|
|
|
nsCOMPtr<nsIStringBundle> bundle;
|
|
nsresult rv = GetBundle(aPropFileName,getter_AddRefs(bundle));
|
|
if (NS_SUCCEEDED(rv) && bundle) {
|
|
nsXPIDLString valUni;
|
|
rv = bundle->GetStringFromID(aID, getter_Copies(valUni));
|
|
if (NS_SUCCEEDED(rv) && valUni) {
|
|
oVal.Assign(valUni);
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|