Bug 1557793 part 3. Change the signatures of various nsContentUtils localization methods to play nicer with the new stringbundle API. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D34201
This commit is contained in:
Boris Zbarsky
2019-06-08 21:26:12 +00:00
parent 95de682140
commit 8e16a497d9
63 changed files with 365 additions and 453 deletions

View File

@@ -419,16 +419,16 @@ size_t XMLHttpRequestMainThread::SizeOfEventTargetIncludingThis(
// - lots
}
static void LogMessage(const char* aWarning, nsPIDOMWindowInner* aWindow,
const char16_t** aParams = nullptr,
uint32_t aParamCount = 0) {
static void LogMessage(
const char* aWarning, nsPIDOMWindowInner* aWindow,
const nsTArray<nsString>& aParams = nsTArray<nsString>()) {
nsCOMPtr<Document> doc;
if (aWindow) {
doc = aWindow->GetExtantDoc();
}
nsContentUtils::ReportToConsole(
nsIScriptError::warningFlag, NS_LITERAL_CSTRING("DOM"), doc,
nsContentUtils::eDOM_PROPERTIES, aWarning, aParams, aParamCount);
nsContentUtils::eDOM_PROPERTIES, aWarning, aParams);
}
Document* XMLHttpRequestMainThread::GetResponseXML(ErrorResult& aRv) {
@@ -3015,10 +3015,9 @@ void XMLHttpRequestMainThread::SetRequestHeader(const nsACString& aName,
bool isPrivilegedCaller = IsSystemXHR();
bool isForbiddenHeader = nsContentUtils::IsForbiddenRequestHeader(aName);
if (!isPrivilegedCaller && isForbiddenHeader) {
NS_ConvertUTF8toUTF16 name(aName);
const char16_t* params[] = {name.get()};
LogMessage("ForbiddenHeaderWarning", GetOwner(), params,
ArrayLength(params));
AutoTArray<nsString, 1> params;
CopyUTF8toUTF16(aName, *params.AppendElement());
LogMessage("ForbiddenHeaderWarning", GetOwner(), params);
return;
}