mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

merge mozilla-central to autoland. r=merge a=merge

This commit is contained in:
Sebastian Hengst 2017-09-24 23:53:44 +02:00
Родитель 20d8477588 c0203b7b61
Коммит c8a131f124
128 изменённых файлов: 595 добавлений и 613 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
accessible/base/Logging.cpp
Просмотреть файл

@ -686,7 +686,7 @@ logging::Tree(const char* aTitle, const char* aMsgText,
printf("%s", NS_ConvertUTF16toUTF8(level).get());
logging::AccessibleInfo(prefix, root);
if (root->FirstChild() && !root->FirstChild()->IsDoc()) {
level.Append(NS_LITERAL_STRING(" "));
level.AppendLiteral(u" ");
root = root->FirstChild();
continue;
}
@ -724,7 +724,7 @@ logging::DOMTree(const char* aTitle, const char* aMsgText,
printf("%s", NS_ConvertUTF16toUTF8(level).get());
logging::Node("", root);
if (root->GetFirstChild()) {
level.Append(NS_LITERAL_STRING(" "));
level.AppendLiteral(u" ");
root = root->GetFirstChild();
continue;
}

6
caps/ExpandedPrincipal.cpp
Просмотреть файл

@ -75,7 +75,7 @@ ExpandedPrincipal::Create(nsTArray<nsCOMPtr<nsIPrincipal>>& aWhiteList,
MOZ_ASSERT(NS_SUCCEEDED(rv));
origin.Append(subOrigin);
}
origin.Append("]]");
origin.AppendLiteral("]]");
ep->FinishInit(origin, aAttrs);
return ep.forget();
@ -185,7 +185,7 @@ ExpandedPrincipal::AddonHasPermission(const nsIAtom* aPerm)
nsresult
ExpandedPrincipal::GetScriptLocation(nsACString& aStr)
{
aStr.Assign("[Expanded Principal [");
aStr.AssignLiteral("[Expanded Principal [");
for (size_t i = 0; i < mPrincipals.Length(); ++i) {
if (i != 0) {
aStr.AppendLiteral(", ");
@ -198,7 +198,7 @@ ExpandedPrincipal::GetScriptLocation(nsACString& aStr)
aStr.Append(spec);
}
aStr.Append("]]");
aStr.AppendLiteral("]]");
return NS_OK;
}

2
chrome/nsChromeRegistryChrome.cpp
Просмотреть файл

@ -219,7 +219,7 @@ nsChromeRegistryChrome::GetSelectedLocale(const nsACString& aPackage,
nsACString& aLocale)
{
nsAutoCString reqLocale;
if (aPackage.Equals("global")) {
if (aPackage.EqualsLiteral("global")) {
LocaleService::GetInstance()->GetAppLocaleAsLangTag(reqLocale);
} else {
AutoTArray<nsCString, 10> requestedLocales;

14
dom/base/XPathGenerator.cpp
Просмотреть файл

@ -47,9 +47,9 @@ bool ContainNonWordCharacter(const nsAString& aStr)
void GetPrefix(const nsINode* aNode, nsAString& aResult)
{
if (aNode->IsXULElement()) {
aResult.Assign(NS_LITERAL_STRING("xul"));
aResult.AssignLiteral(u"xul");
} else if (aNode->IsHTMLElement()) {
aResult.Assign(NS_LITERAL_STRING("xhtml"));
aResult.AssignLiteral(u"xhtml");
}
}
@ -83,7 +83,7 @@ void GenerateConcatExpression(const nsAString& aStr, nsAString& aResult)
nonQuoteBeginPtr = nullptr;
}
if (!quoteBeginPtr) {
result.Append(NS_LITERAL_STRING("\',\""));
result.AppendLiteral(u"\',\"");
quoteBeginPtr = cur;
}
} else {
@ -92,7 +92,7 @@ void GenerateConcatExpression(const nsAString& aStr, nsAString& aResult)
}
if (quoteBeginPtr) {
result.Append(quoteBeginPtr, cur - quoteBeginPtr);
result.Append(NS_LITERAL_STRING("\",\'"));
result.AppendLiteral(u"\",\'");
quoteBeginPtr = nullptr;
}
}
@ -100,7 +100,7 @@ void GenerateConcatExpression(const nsAString& aStr, nsAString& aResult)
if (quoteBeginPtr) {
result.Append(quoteBeginPtr, cur - quoteBeginPtr);
result.Append(NS_LITERAL_STRING("\",\'"));
result.AppendLiteral(u"\",\'");
} else if (nonQuoteBeginPtr) {
result.Append(nonQuoteBeginPtr, cur - nonQuoteBeginPtr);
}
@ -187,9 +187,9 @@ void XPathGenerator::Generate(const nsINode* aNode, nsAString& aResult)
namePart.Assign(NS_LITERAL_STRING("[@name=") + quotedArgument + NS_LITERAL_STRING("]"));
}
if (count != 1) {
countPart.Assign(NS_LITERAL_STRING("["));
countPart.AssignLiteral(u"[");
countPart.AppendInt(count);
countPart.Append(NS_LITERAL_STRING("]"));
countPart.AppendLiteral(u"]");
}
Generate(aNode->GetParentNode(), aResult);
aResult.Append(NS_LITERAL_STRING("/") + tag + namePart + countPart);

4
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -1635,7 +1635,7 @@ nsContentUtils::SandboxFlagsToString(uint32_t aFlags, nsAString& aString)
#define SANDBOX_KEYWORD(string, atom, flags) \
if (!(aFlags & (flags))) { \
if (!aString.IsEmpty()) { \
aString.Append(NS_LITERAL_STRING(" ")); \
aString.AppendLiteral(u" "); \
} \
aString.Append(nsDependentAtomString(nsGkAtoms::atom)); \
}
@ -7193,7 +7193,7 @@ nsContentUtils::IsPatternMatching(nsAString& aValue, nsAString& aPattern,
JSAutoCompartment ac(cx, xpc::UnprivilegedJunkScope());
// The pattern has to match the entire value.
aPattern.Insert(NS_LITERAL_STRING("^(?:"), 0);
aPattern.InsertLiteral(u"^(?:", 0);
aPattern.AppendLiteral(")$");
JS::Rooted<JSObject*> re(cx,

36
dom/base/test/gtest/TestXPathGenerator.cpp
Просмотреть файл

@ -11,10 +11,10 @@
TEST(TestXPathGenerator, TestQuoteArgumentWithoutQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("testing"));
arg.AssignLiteral(u"testing");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("\'testing\'"));
expectedResult.AssignLiteral(u"\'testing\'");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -25,10 +25,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithoutQuote)
TEST(TestXPathGenerator, TestQuoteArgumentWithSingleQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("\'testing\'"));
arg.AssignLiteral(u"\'testing\'");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("\"\'testing\'\""));
expectedResult.AssignLiteral(u"\"\'testing\'\"");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -39,10 +39,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithSingleQuote)
TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("\"testing\""));
arg.AssignLiteral(u"\"testing\"");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("\'\"testing\"\'"));
expectedResult.AssignLiteral(u"\'\"testing\"\'");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -53,10 +53,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuote)
TEST(TestXPathGenerator, TestQuoteArgumentWithSingleAndDoubleQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("\'testing\""));
arg.AssignLiteral(u"\'testing\"");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("concat(\'\',\"\'\",\'testing\"\')"));
expectedResult.AssignLiteral(u"concat(\'\',\"\'\",\'testing\"\')");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -68,10 +68,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithSingleAndDoubleQuote)
TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndASequenceOfSingleQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("\'\'\'\'testing\""));
arg.AssignLiteral(u"\'\'\'\'testing\"");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("concat(\'\',\"\'\'\'\'\",\'testing\"\')"));
expectedResult.AssignLiteral(u"concat(\'\',\"\'\'\'\'\",\'testing\"\')");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -83,10 +83,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndASequenceOfSingleQuo
TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndTwoSequencesOfSingleQuote)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("\'\'\'\'testing\'\'\'\'\'\'\""));
arg.AssignLiteral(u"\'\'\'\'testing\'\'\'\'\'\'\"");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("concat(\'\',\"\'\'\'\'\",\'testing\',\"\'\'\'\'\'\'\",\'\"\')"));
expectedResult.AssignLiteral(u"concat(\'\',\"\'\'\'\'\",\'testing\',\"\'\'\'\'\'\'\",\'\"\')");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -98,10 +98,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndTwoSequencesOfSingle
TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndTwoSequencesOfSingleQuoteInMiddle)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("t\'\'\'\'estin\'\'\'\'\'\'\"g"));
arg.AssignLiteral(u"t\'\'\'\'estin\'\'\'\'\'\'\"g");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("concat(\'t\',\"\'\'\'\'\",\'estin\',\"\'\'\'\'\'\'\",\'\"g\')"));
expectedResult.AssignLiteral(u"concat(\'t\',\"\'\'\'\'\",\'estin\',\"\'\'\'\'\'\'\",\'\"g\')");
nsAutoString result;
XPathGenerator::QuoteArgument(arg, result);
@ -113,10 +113,10 @@ TEST(TestXPathGenerator, TestQuoteArgumentWithDoubleQuoteAndTwoSequencesOfSingle
TEST(TestXPathGenerator, TestEscapeNameWithNormalCharacters)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("testing"));
arg.AssignLiteral(u"testing");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("testing"));
expectedResult.AssignLiteral(u"testing");
nsAutoString result;
XPathGenerator::EscapeName(arg, result);
@ -127,10 +127,10 @@ TEST(TestXPathGenerator, TestEscapeNameWithNormalCharacters)
TEST(TestXPathGenerator, TestEscapeNameWithSpecialCharacters)
{
nsAutoString arg;
arg.Assign(NS_LITERAL_STRING("^testing!"));
arg.AssignLiteral(u"^testing!");
nsAutoString expectedResult;
expectedResult.Assign(NS_LITERAL_STRING("*[local-name()=\'^testing!\']"));
expectedResult.AssignLiteral(u"*[local-name()=\'^testing!\']");
nsAutoString result;
XPathGenerator::EscapeName(arg, result);

2
dom/fetch/InternalRequest.h
Просмотреть файл

@ -141,7 +141,7 @@ public:
if (GetFragment().IsEmpty()) {
return;
}
aURL.Append(NS_LITERAL_CSTRING("#"));
aURL.AppendLiteral("#");
aURL.Append(GetFragment());
}

4
dom/flyweb/FlyWebService.cpp
Просмотреть файл

@ -802,11 +802,11 @@ FlyWebMDNSService::PairWithService(const nsAString& aServiceId,
url.Append(aInfo->mService.mHostname);
if (!discInfo->mService.mPath.IsEmpty()) {
if (discInfo->mService.mPath.Find("/") != 0) {
url.Append(NS_LITERAL_STRING("/"));
url.AppendLiteral(u"/");
}
url.Append(discInfo->mService.mPath);
} else {
url.Append(NS_LITERAL_STRING("/"));
url.AppendLiteral(u"/");
}
nsCOMPtr<nsIURI> uiURL;
NS_NewURI(getter_AddRefs(uiURL), url);

2
dom/flyweb/HttpServer.cpp
Просмотреть файл

@ -924,7 +924,7 @@ HttpServer::Connection::QueueResponse(InternalResponse* aResponse)
NS_LITERAL_CSTRING("\r\n"));
}
head.Append(NS_LITERAL_CSTRING("\r\n"));
head.AppendLiteral("\r\n");
mOutputBuffers.AppendElement()->mString = head;
if (body) {

6
dom/media/MediaManager.cpp
Просмотреть файл

@ -861,11 +861,11 @@ NS_IMETHODIMP
MediaDevice::GetMediaSource(nsAString& aMediaSource)
{
if (mMediaSource == MediaSourceEnum::Microphone) {
aMediaSource.Assign(NS_LITERAL_STRING("microphone"));
aMediaSource.AssignLiteral(u"microphone");
} else if (mMediaSource == MediaSourceEnum::AudioCapture) {
aMediaSource.Assign(NS_LITERAL_STRING("audioCapture"));
aMediaSource.AssignLiteral(u"audioCapture");
} else if (mMediaSource == MediaSourceEnum::Window) { // this will go away
aMediaSource.Assign(NS_LITERAL_STRING("window"));
aMediaSource.AssignLiteral(u"window");
} else { // all the rest are shared
aMediaSource.Assign(NS_ConvertUTF8toUTF16(
dom::MediaSourceEnumValues::strings[uint32_t(mMediaSource)].value));

2
dom/media/eme/MediaKeySession.cpp
Просмотреть файл

@ -154,7 +154,7 @@ MediaKeySession::UpdateKeyStatusMap()
message.Append(nsPrintfCString(" (%s,%s)", ToHexString(status.mId).get(),
MediaKeyStatusValues::strings[static_cast<IntegerType>(status.mStatus)].value));
}
message.Append(" }");
message.AppendLiteral(" }");
// Use %s so we aren't exposing random strings to printf interpolation.
EME_LOG("%s", message.get());
}

12
dom/media/gmp/GMPServiceChild.cpp
Просмотреть файл

@ -226,22 +226,22 @@ struct GMPCapabilityAndVersion
{
nsCString s;
s.Append(mName);
s.Append(" version=");
s.AppendLiteral(" version=");
s.Append(mVersion);
s.Append(" tags=[");
s.AppendLiteral(" tags=[");
nsCString tags;
for (const GMPCapability& cap : mCapabilities) {
if (!tags.IsEmpty()) {
tags.Append(" ");
tags.AppendLiteral(" ");
}
tags.Append(cap.mAPIName);
for (const nsCString& tag : cap.mAPITags) {
tags.Append(":");
tags.AppendLiteral(":");
tags.Append(tag);
}
}
s.Append(tags);
s.Append("]");
s.AppendLiteral("]");
return s;
}
@ -259,7 +259,7 @@ GMPCapabilitiesToString()
nsCString s;
for (const GMPCapabilityAndVersion& gmp : *sGMPCapabilities) {
if (!s.IsEmpty()) {
s.Append(", ");
s.AppendLiteral(", ");
}
s.Append(gmp.ToString());
}

4
dom/media/gtest/TestMP4Demuxer.cpp
Просмотреть файл

@ -184,7 +184,7 @@ ToCryptoString(const CryptoSample& aCrypto)
for (size_t i = 0; i < aCrypto.mKeyId.Length(); i++) {
res.AppendPrintf("%02x", aCrypto.mKeyId[i]);
}
res.Append(" ");
res.AppendLiteral(" ");
for (size_t i = 0; i < aCrypto.mIV.Length(); i++) {
res.AppendPrintf("%02x", aCrypto.mIV[i]);
}
@ -194,7 +194,7 @@ ToCryptoString(const CryptoSample& aCrypto)
aCrypto.mEncryptedSizes[i]);
}
} else {
res.Append("no crypto");
res.AppendLiteral("no crypto");
}
return res;
}

6
dom/media/platforms/wmf/WMFVideoMFTManager.cpp
Просмотреть файл

@ -498,7 +498,7 @@ public:
// Try again with d3d9, but record the failure reason
// into a new var to avoid overwriting the d3d11 failure.
failureReason = &secondFailureReason;
mFailureReason.Append(NS_LITERAL_CSTRING("; "));
mFailureReason.AppendLiteral("; ");
}
const nsCString& blacklistedDLL = FindD3D9BlacklistedDLL();
@ -636,9 +636,9 @@ WMFVideoMFTManager::Init()
// If we had some failures but eventually made it work,
// make sure we preserve the messages.
if (mDXVA2Manager->IsD3D11()) {
mDXVAFailureReason.Append(NS_LITERAL_CSTRING("Using D3D11 API"));
mDXVAFailureReason.AppendLiteral("Using D3D11 API");
} else {
mDXVAFailureReason.Append(NS_LITERAL_CSTRING("Using D3D9 API"));
mDXVAFailureReason.AppendLiteral("Using D3D9 API");
}
}

8
dom/media/systemservices/MediaParent.cpp
Просмотреть файл

@ -112,7 +112,7 @@ class OriginKeyStore : public nsISupports
{
switch (aPrincipalInfo.type()) {
case ipc::PrincipalInfo::TSystemPrincipalInfo:
aString.Assign("[System Principal]");
aString.AssignLiteral("[System Principal]");
return;
case ipc::PrincipalInfo::TNullPrincipalInfo: {
@ -137,20 +137,20 @@ class OriginKeyStore : public nsISupports
const ipc::ExpandedPrincipalInfo& info =
aPrincipalInfo.get_ExpandedPrincipalInfo();
aString.Assign("[Expanded Principal [");
aString.AssignLiteral("[Expanded Principal [");
for (uint32_t i = 0; i < info.whitelist().Length(); i++) {
nsAutoCString str;
PrincipalInfoToString(info.whitelist()[i], str);
if (i != 0) {
aString.Append(", ");
aString.AppendLiteral(", ");
}
aString.Append(str);
}
aString.Append("]]");
aString.AppendLiteral("]]");
return;
}

2
dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp
Просмотреть файл

@ -408,7 +408,7 @@ SpeechDispatcherService::Setup()
ToUpperCase(variant);
// eSpeak uses UK which is not a valid region subtag in BCP47.
if (variant.Equals("UK")) {
if (variant.EqualsLiteral("UK")) {
variant.AssignLiteral("GB");
}

2
dom/notification/Notification.cpp
Просмотреть файл

@ -762,7 +762,7 @@ NotificationTelemetryService::GetNotificationPermission(nsISupports* aSupports,
}
nsAutoCString type;
permission->GetType(type);
if (!type.Equals("desktop-notification")) {
if (!type.EqualsLiteral("desktop-notification")) {
return false;
}
permission->GetCapability(aCapability);

2
dom/plugins/base/nsPluginStreamListenerPeer.cpp
Просмотреть файл

@ -398,7 +398,7 @@ nsPluginStreamListenerPeer::SetupPluginCacheFile(nsIChannel* channel)
return rv;
// Create a file to save our stream into. Should we scramble the name?
filename.Insert(NS_LITERAL_CSTRING("plugin-"), 0);
filename.InsertLiteral("plugin-", 0);
rv = pluginTmp->AppendNative(filename);
if (NS_FAILED(rv))
return rv;

2
dom/quota/ActorsParent.cpp
Просмотреть файл

@ -8237,7 +8237,7 @@ OriginParser::Parse(nsACString& aSpec, OriginAttributes* aAttrs) -> ResultType
}
if (!mHandledTokens.IsEmpty()) {
mHandledTokens.Append(NS_LITERAL_CSTRING(", "));
mHandledTokens.AppendLiteral(", ");
}
mHandledTokens.Append('\'');
mHandledTokens.Append(token);

4
dom/security/nsCSPContext.cpp
Просмотреть файл

@ -83,7 +83,7 @@ CreateCacheKey_Internal(nsIURI* aContentLocation,
outCacheKey.Truncate();
if (aContentType != nsIContentPolicy::TYPE_SCRIPT && isDataScheme) {
// For non-script data: URI, use ("data:", aContentType) as the cache key.
outCacheKey.Append(NS_LITERAL_CSTRING("data:"));
outCacheKey.AppendLiteral("data:");
outCacheKey.AppendInt(aContentType);
return NS_OK;
}
@ -95,7 +95,7 @@ CreateCacheKey_Internal(nsIURI* aContentLocation,
// Don't cache for a URI longer than the cutoff size.
if (spec.Length() <= CSP_CACHE_URI_CUTOFF_SIZE) {
outCacheKey.Append(spec);
outCacheKey.Append(NS_LITERAL_CSTRING("!"));
outCacheKey.AppendLiteral("!");
outCacheKey.AppendInt(aContentType);
}

6
dom/security/nsCSPUtils.cpp
Просмотреть файл

@ -142,7 +142,7 @@ CSP_LogMessage(const nsAString& aMessage,
// Prepending CSP to the outgoing console message
nsString cspMsg;
cspMsg.Append(NS_LITERAL_STRING("Content Security Policy: "));
cspMsg.AppendLiteral(u"Content Security Policy: ");
cspMsg.Append(aMessage);
// Currently 'aSourceLine' is not logged to the console, because similar
@ -152,9 +152,9 @@ CSP_LogMessage(const nsAString& aMessage,
// E.g. 'aSourceLine' might be: 'onclick attribute on DIV element'.
// In such cases we append 'aSourceLine' directly to the error message.
if (!aSourceLine.IsEmpty()) {
cspMsg.Append(NS_LITERAL_STRING(" Source: "));
cspMsg.AppendLiteral(" Source: ");
cspMsg.Append(aSourceLine);
cspMsg.Append(NS_LITERAL_STRING("."));
cspMsg.AppendLiteral(u".");
}
nsresult rv;

6
dom/security/nsContentSecurityManager.cpp
Просмотреть файл

@ -808,9 +808,9 @@ nsContentSecurityManager::IsOriginPotentiallyTrustworthy(nsIPrincipal* aPrincipa
return NS_OK;
}
if (host.Equals("127.0.0.1") ||
host.Equals("localhost") ||
host.Equals("::1")) {
if (host.EqualsLiteral("127.0.0.1") ||
host.EqualsLiteral("localhost") ||
host.EqualsLiteral("::1")) {
*aIsTrustWorthy = true;
return NS_OK;
}

2
dom/security/nsMixedContentBlocker.cpp
Просмотреть файл

@ -464,7 +464,7 @@ nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(nsIURI* aURL) {
// We could also allow 'localhost' (if we can guarantee that it resolves
// to a loopback address), but Chrome doesn't support it as of writing. For
// web compat, lets only allow what Chrome allows.
return host.Equals("127.0.0.1") || host.Equals("::1");
return host.EqualsLiteral("127.0.0.1") || host.EqualsLiteral("::1");
}
/* Static version of ShouldLoad() that contains all the Mixed Content Blocker

3
dom/storage/StorageDBThread.cpp
Просмотреть файл

@ -92,8 +92,9 @@ Scheme0Scope(LocalStorageCacheBridge* aCache)
if (result.IsEmpty()) {
// Must contain the old prefix, otherwise we won't search for the whole
// origin attributes suffix.
result.Append(NS_LITERAL_CSTRING("0:f:"));
result.AppendLiteral("0:f:");
}
// Append the whole origin attributes suffix despite we have already stored
// appid and inbrowser. We are only looking for it when the scope string
// starts with "$appid:$inbrowser:" (with whatever valid values).

6
dom/url/URLWorker.cpp
Просмотреть файл

@ -629,8 +629,7 @@ URLWorker::Init(const nsAString& aURL, const Optional<nsAString>& aBase,
}
}
if (scheme.Equals(NS_LITERAL_CSTRING("http")) ||
scheme.Equals(NS_LITERAL_CSTRING("https"))) {
if (scheme.EqualsLiteral("http") || scheme.EqualsLiteral("https")) {
RefPtr<nsStandardURL> baseURL;
if (aBase.WasPassed()) {
baseURL = new nsStandardURL();
@ -707,8 +706,7 @@ URLWorker::SetHref(const nsAString& aHref, ErrorResult& aRv)
return;
}
if (scheme.Equals(NS_LITERAL_CSTRING("http")) ||
scheme.Equals(NS_LITERAL_CSTRING("https"))) {
if (scheme.EqualsLiteral("http") || scheme.EqualsLiteral("https")) {
mStdURL = new nsStandardURL();
aRv = mStdURL->SetSpec(NS_ConvertUTF16toUTF8(aHref));
if (mURLProxy) {

2
dom/webauthn/WebAuthnManager.cpp
Просмотреть файл

@ -88,7 +88,7 @@ AssembleClientData(const nsAString& aOrigin, const CryptoBuffer& aChallenge,
CollectedClientData clientDataObject;
clientDataObject.mChallenge.Assign(challengeBase64);
clientDataObject.mOrigin.Assign(aOrigin);
clientDataObject.mHashAlg.Assign(NS_LITERAL_STRING("SHA-256"));
clientDataObject.mHashAlg.AssignLiteral(u"SHA-256");
nsAutoString temp;
if (NS_WARN_IF(!clientDataObject.ToJSON(temp))) {

2
dom/workers/ServiceWorkerClients.cpp
Просмотреть файл

@ -526,7 +526,7 @@ public:
AssertIsOnMainThread();
nsCString topic(aTopic);
if (!topic.Equals(NS_LITERAL_CSTRING("BrowserChrome:Ready"))) {
if (!topic.EqualsLiteral("BrowserChrome:Ready")) {
MOZ_ASSERT(false, "Unexpected topic.");
return NS_ERROR_FAILURE;
}

2
dom/workers/WorkerPrivate.cpp
Просмотреть файл

@ -2592,7 +2592,7 @@ WorkerPrivate::MemoryReporter::TryToMapAddon(nsACString &path)
}
static const size_t explicitLength = strlen("explicit/");
addonId.Insert(NS_LITERAL_CSTRING("add-ons/"), 0);
addonId.InsertLiteral("add-ons/", 0);
addonId += "/";
path.Insert(addonId, explicitLength);
}

174
dom/workers/test/gtest/TestReadWrite.cpp
Просмотреть файл

@ -154,33 +154,33 @@ TEST(ServiceWorkerRegistrar, TestReadData)
{
nsAutoCString buffer(SERVICEWORKERREGISTRAR_VERSION "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("scope 0\ncurrentWorkerURL 0\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("scope 0\ncurrentWorkerURL 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.Append("cacheName 0\n");
buffer.AppendLiteral("cacheName 0\n");
buffer.AppendInt(nsIServiceWorkerRegistrationInfo::UPDATE_VIA_CACHE_IMPORTS, 16);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("scope 1\ncurrentWorkerURL 1\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("scope 1\ncurrentWorkerURL 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.Append("cacheName 1\n");
buffer.AppendLiteral("cacheName 1\n");
buffer.AppendInt(nsIServiceWorkerRegistrationInfo::UPDATE_VIA_CACHE_ALL, 16);
buffer.Append("\n");
buffer.AppendLiteral("\n");
PRTime ts = PR_Now();
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -333,13 +333,13 @@ TEST(ServiceWorkerRegistrar, TestVersion2Migration)
{
nsAutoCString buffer("2" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("spec 0\nscope 0\nscriptSpec 0\ncurrentWorkerURL 0\nactiveCache 0\nwaitingCache 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("spec 0\nscope 0\nscriptSpec 0\ncurrentWorkerURL 0\nactiveCache 0\nwaitingCache 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("spec 1\nscope 1\nscriptSpec 1\ncurrentWorkerURL 1\nactiveCache 1\nwaitingCache 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("spec 1\nscope 1\nscriptSpec 1\ncurrentWorkerURL 1\nactiveCache 1\nwaitingCache 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -394,13 +394,13 @@ TEST(ServiceWorkerRegistrar, TestVersion3Migration)
{
nsAutoCString buffer("3" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("spec 0\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("spec 0\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("spec 1\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("spec 1\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -455,13 +455,13 @@ TEST(ServiceWorkerRegistrar, TestVersion4Migration)
{
nsAutoCString buffer("4" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("scope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("scope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("scope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("scope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -518,17 +518,17 @@ TEST(ServiceWorkerRegistrar, TestVersion5Migration)
{
nsAutoCString buffer("5" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("scope 0\ncurrentWorkerURL 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.Append("cacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("scope 0\ncurrentWorkerURL 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.AppendLiteral("cacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("scope 1\ncurrentWorkerURL 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.Append("cacheName 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("scope 1\ncurrentWorkerURL 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.AppendLiteral("cacheName 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -583,21 +583,21 @@ TEST(ServiceWorkerRegistrar, TestVersion6Migration)
{
nsAutoCString buffer("6" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("scope 0\ncurrentWorkerURL 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.Append("cacheName 0\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("scope 0\ncurrentWorkerURL 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.AppendLiteral("cacheName 0\n");
buffer.AppendInt(nsIRequest::LOAD_NORMAL, 16);
buffer.Append("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("scope 1\ncurrentWorkerURL 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.Append("cacheName 1\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("scope 1\ncurrentWorkerURL 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.AppendLiteral("cacheName 1\n");
buffer.AppendInt(nsIRequest::VALIDATE_ALWAYS, 16);
buffer.Append("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -652,34 +652,34 @@ TEST(ServiceWorkerRegistrar, TestVersion7Migration)
{
nsAutoCString buffer("7" "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("scope 0\ncurrentWorkerURL 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.Append("cacheName 0\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("scope 0\ncurrentWorkerURL 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TRUE "\n");
buffer.AppendLiteral("cacheName 0\n");
buffer.AppendInt(nsIRequest::LOAD_NORMAL, 16);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(0);
buffer.Append("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("scope 1\ncurrentWorkerURL 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.Append("cacheName 1\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("scope 1\ncurrentWorkerURL 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_FALSE "\n");
buffer.AppendLiteral("cacheName 1\n");
buffer.AppendInt(nsIRequest::VALIDATE_ALWAYS, 16);
buffer.Append("\n");
buffer.AppendLiteral("\n");
PRTime ts = PR_Now();
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.AppendLiteral("\n");
buffer.AppendInt(ts);
buffer.Append("\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";
@ -735,26 +735,26 @@ TEST(ServiceWorkerRegistrar, TestDedupeRead)
nsAutoCString buffer("3" "\n");
// unique entries
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("spec 0\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("spec 0\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("spec 1\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("spec 1\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
// dupe entries
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("spec 1\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("spec 1\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("^appId=123&inBrowser=1\n");
buffer.Append("spec 2\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("^appId=123&inBrowser=1\n");
buffer.AppendLiteral("spec 2\nscope 0\ncurrentWorkerURL 0\ncacheName 0\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.Append("\n");
buffer.Append("spec 3\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.Append(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
buffer.AppendLiteral("\n");
buffer.AppendLiteral("spec 3\nscope 1\ncurrentWorkerURL 1\ncacheName 1\n");
buffer.AppendLiteral(SERVICEWORKERREGISTRAR_TERMINATOR "\n");
ASSERT_TRUE(CreateFile(buffer)) << "CreateFile should not fail";

4
dom/xhr/XMLHttpRequestMainThread.cpp
Просмотреть файл

@ -1971,7 +1971,7 @@ XMLHttpRequestMainThread::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
// Fallback to 'application/octet-stream'
nsAutoCString type;
channel->GetContentType(type);
if (type.Equals(UNKNOWN_CONTENT_TYPE)) {
if (type.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) {
channel->SetContentType(NS_LITERAL_CSTRING(APPLICATION_OCTET_STREAM));
}
@ -2713,7 +2713,7 @@ XMLHttpRequestMainThread::InitiateFetch(nsIInputStream* aUploadStream,
nsAutoCString contentType;
if (NS_FAILED(mChannel->GetContentType(contentType)) ||
contentType.IsEmpty() ||
contentType.Equals(UNKNOWN_CONTENT_TYPE)) {
contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) {
mChannel->SetContentType(NS_LITERAL_CSTRING("text/xml"));
}

2
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
Просмотреть файл

@ -281,7 +281,7 @@ txStylesheetSink::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
channel->GetURI(getter_AddRefs(uri));
bool sniff;
if (NS_SUCCEEDED(uri->SchemeIs("file", &sniff)) && sniff &&
contentType.Equals(UNKNOWN_CONTENT_TYPE)) {
contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) {
nsresult rv;
nsCOMPtr<nsIStreamConverterService> serv =
do_GetService("@mozilla.org/streamConverters;1", &rv);

6
extensions/auth/nsHttpNegotiateAuth.cpp
Просмотреть файл

@ -195,7 +195,7 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel,
// with non-standard servers that use stuff like "khttp/f.q.d.n"
// instead.
//
service.Insert("HTTP@", 0);
service.InsertLiteral("HTTP@", 0);
const char *contractID;
if (TestBoolPref(kNegotiateAuthSSPI)) {
@ -383,8 +383,8 @@ class GetNextTokenRunnable final : public mozilla::Runnable
// Use negotiate service to call GenerateCredentials outside of main thread
nsAutoCString contractId;
contractId.Assign(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractId.Append("negotiate");
contractId.AssignLiteral(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractId.AppendLiteral("negotiate");
nsCOMPtr<nsIHttpAuthenticator> authenticator =
do_GetService(contractId.get(), &rv);
NS_ENSURE_SUCCESS(rv, rv);

6
extensions/cookie/nsPermissionManager.cpp
Просмотреть файл

@ -661,7 +661,7 @@ UpgradeHostToOriginAndInsert(const nsACString& aHost, const nsCString& aType,
// If we didn't find any origins for this host in the poermissions database,
// we can insert the default http:// and https:// permissions into the database.
// This has a relatively high liklihood of applying the permission to the correct
// This has a relatively high likelihood of applying the permission to the correct
// origin.
if (!foundHistory) {
nsAutoCString hostSegment;
@ -671,9 +671,9 @@ UpgradeHostToOriginAndInsert(const nsACString& aHost, const nsCString& aType,
// If this is an ipv6 URI, we need to surround it in '[', ']' before trying to
// parse it as a URI.
if (aHost.FindChar(':') != -1) {
hostSegment.Assign("[");
hostSegment.AssignLiteral("[");
hostSegment.Append(aHost);
hostSegment.Append("]");
hostSegment.AppendLiteral("]");
} else {
hostSegment.Assign(aHost);
}

4
gfx/src/DriverCrashGuard.cpp
Просмотреть файл

@ -39,7 +39,7 @@ BuildCrashGuardPrefName(CrashGuardType aType, nsCString& aOutPrefName)
MOZ_ASSERT(aType < CrashGuardType::NUM_TYPES);
MOZ_ASSERT(sCrashGuardNames[size_t(aType)]);
aOutPrefName.Assign("gfx.crash-guard.status.");
aOutPrefName.AssignLiteral("gfx.crash-guard.status.");
aOutPrefName.Append(sCrashGuardNames[size_t(aType)]);
}
@ -191,7 +191,7 @@ DriverCrashGuard::GetGuardFile()
nsCString filename;
filename.Assign(sCrashGuardNames[size_t(mType)]);
filename.Append(".guard");
filename.AppendLiteral(".guard");
nsCOMPtr<nsIFile> file;
NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR, getter_AddRefs(file));

2
gfx/thebes/gfxUserFontSet.cpp
Просмотреть файл

@ -1453,7 +1453,7 @@ gfxUserFontSet::UserFontCache::Entry::ReportMemory(
if (NS_SUCCEEDED(mURI->get()->SchemeIs("data", &isData)) && isData &&
spec.Length() > 255) {
spec.Truncate(252);
spec.Append("...");
spec.AppendLiteral("...");
}
path.AppendPrintf(", url=%s", spec.get());
}

2
gfx/thebes/gfxUtils.cpp
Просмотреть файл

@ -1060,7 +1060,7 @@ EncodeSourceSurfaceInternal(SourceSurface* aSurface,
nsCString string("data:");
string.Append(aMimeType);
string.Append(";base64,");
string.AppendLiteral(";base64,");
string.Append(encodedImg);
if (aFile) {

44
image/imgLoader.cpp
Просмотреть файл

@ -254,19 +254,19 @@ private:
? "/raster/"
: "/vector/");
pathPrefix.Append(aCounter.IsUsed() ? "used/" : "unused/");
pathPrefix.Append("image(");
pathPrefix.AppendLiteral("image(");
pathPrefix.AppendInt(aCounter.IntrinsicSize().width);
pathPrefix.Append("x");
pathPrefix.AppendLiteral("x");
pathPrefix.AppendInt(aCounter.IntrinsicSize().height);
pathPrefix.Append(", ");
pathPrefix.AppendLiteral(", ");
if (aCounter.URI().IsEmpty()) {
pathPrefix.Append("<unknown URI>");
pathPrefix.AppendLiteral("<unknown URI>");
} else {
pathPrefix.Append(aCounter.URI());
}
pathPrefix.Append(")/");
pathPrefix.AppendLiteral(")/");
ReportSurfaces(aHandleReport, aData, pathPrefix, aCounter);
@ -280,20 +280,24 @@ private:
{
for (const SurfaceMemoryCounter& counter : aCounter.Surfaces()) {
nsAutoCString surfacePathPrefix(aPathPrefix);
surfacePathPrefix.Append(counter.IsLocked() ? "locked/" : "unlocked/");
if (counter.IsLocked()) {
surfacePathPrefix.AppendLiteral("locked/");
} else {
surfacePathPrefix.AppendLiteral("unlocked/");
}
if (counter.IsFactor2()) {
surfacePathPrefix.Append("factor2/");
surfacePathPrefix.AppendLiteral("factor2/");
}
if (counter.CannotSubstitute()) {
surfacePathPrefix.Append("cannot_substitute/");
surfacePathPrefix.AppendLiteral("cannot_substitute/");
}
surfacePathPrefix.Append("surface(");
surfacePathPrefix.AppendLiteral("surface(");
surfacePathPrefix.AppendInt(counter.Key().Size().width);
surfacePathPrefix.Append("x");
surfacePathPrefix.AppendLiteral("x");
surfacePathPrefix.AppendInt(counter.Key().Size().height);
if (counter.Values().SharedHandles() > 0) {
surfacePathPrefix.Append(", shared:");
surfacePathPrefix.AppendLiteral(", shared:");
surfacePathPrefix.AppendInt(uint32_t(counter.Values().SharedHandles()));
}
@ -304,19 +308,19 @@ private:
: "");
if (counter.Key().Flags() != DefaultSurfaceFlags()) {
surfacePathPrefix.Append(", flags:");
surfacePathPrefix.AppendLiteral(", flags:");
surfacePathPrefix.AppendInt(uint32_t(counter.Key().Flags()),
/* aRadix = */ 16);
}
} else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING) {
surfacePathPrefix.Append(", compositing frame");
surfacePathPrefix.AppendLiteral(", compositing frame");
} else if (counter.Type() == SurfaceMemoryCounterType::COMPOSITING_PREV) {
surfacePathPrefix.Append(", compositing prev frame");
surfacePathPrefix.AppendLiteral(", compositing prev frame");
} else {
MOZ_ASSERT_UNREACHABLE("Unknown counter type");
}
surfacePathPrefix.Append(")/");
surfacePathPrefix.AppendLiteral(")/");
ReportValues(aHandleReport, aData, surfacePathPrefix, counter.Values());
}
@ -331,28 +335,28 @@ private:
{
nsAutoCString pathPrefix;
if (aExplicit) {
pathPrefix.Append("explicit/");
pathPrefix.AppendLiteral("explicit/");
}
pathPrefix.Append(aPathPrefix);
nsAutoCString rasterUsedPrefix(pathPrefix);
rasterUsedPrefix.Append("/raster/used/");
rasterUsedPrefix.AppendLiteral("/raster/used/");
rasterUsedPrefix.Append(aPathInfix);
ReportValues(aHandleReport, aData, rasterUsedPrefix, aTotal.UsedRaster());
nsAutoCString rasterUnusedPrefix(pathPrefix);
rasterUnusedPrefix.Append("/raster/unused/");
rasterUnusedPrefix.AppendLiteral("/raster/unused/");
rasterUnusedPrefix.Append(aPathInfix);
ReportValues(aHandleReport, aData, rasterUnusedPrefix,
aTotal.UnusedRaster());
nsAutoCString vectorUsedPrefix(pathPrefix);
vectorUsedPrefix.Append("/vector/used/");
vectorUsedPrefix.AppendLiteral("/vector/used/");
vectorUsedPrefix.Append(aPathInfix);
ReportValues(aHandleReport, aData, vectorUsedPrefix, aTotal.UsedVector());
nsAutoCString vectorUnusedPrefix(pathPrefix);
vectorUnusedPrefix.Append("/vector/unused/");
vectorUnusedPrefix.AppendLiteral("/vector/unused/");
vectorUnusedPrefix.Append(aPathInfix);
ReportValues(aHandleReport, aData, vectorUnusedPrefix,
aTotal.UnusedVector());

8
intl/locale/LocaleService.cpp
Просмотреть файл

@ -784,16 +784,16 @@ LocaleService::Locale::Locale(const nsCString& aLocale, bool aRange)
if (aRange) {
if (mLanguage.IsEmpty()) {
mLanguage.Assign(NS_LITERAL_CSTRING("*"));
mLanguage.AssignLiteral("*");
}
if (mScript.IsEmpty()) {
mScript.Assign(NS_LITERAL_CSTRING("*"));
mScript.AssignLiteral("*");
}
if (mRegion.IsEmpty()) {
mRegion.Assign(NS_LITERAL_CSTRING("*"));
mRegion.AssignLiteral("*");
}
if (mVariant.IsEmpty()) {
mVariant.Assign(NS_LITERAL_CSTRING("*"));
mVariant.AssignLiteral("*");
}
}
}

4
intl/locale/tests/gtest/TestLocaleServiceNegotiate.cpp
Просмотреть файл

@ -27,6 +27,6 @@ TEST(Intl_Locale_LocaleService, Negotiate) {
requestedLocales, availableLocales, defaultLocale, strategy, supportedLocales);
ASSERT_TRUE(supportedLocales.Length() == 2);
ASSERT_TRUE(supportedLocales[0].Equals("sr-Cyrl"));
ASSERT_TRUE(supportedLocales[1].Equals("en-US"));
ASSERT_TRUE(supportedLocales[0].EqualsLiteral("sr-Cyrl"));
ASSERT_TRUE(supportedLocales[1].EqualsLiteral("en-US"));
}

2
intl/locale/windows/OSPreferences_win.cpp
Просмотреть файл

@ -64,7 +64,7 @@ ReadUserLocale(nsCString& aRetVal)
WCHAR locale[LOCALE_NAME_MAX_LENGTH];
if (NS_WARN_IF(!LCIDToLocaleName(LOCALE_USER_DEFAULT, locale,
LOCALE_NAME_MAX_LENGTH, 0))) {
aRetVal.Assign("en-US");
aRetVal.AssignLiteral("en-US");
return;
}

2
intl/unicharutil/util/ICUUtils.cpp
Просмотреть файл

@ -3,7 +3,6 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef MOZILLA_INTERNAL_API
#ifdef ENABLE_INTL_API
#include "ICUUtils.h"
#include "mozilla/Preferences.h"
@ -274,6 +273,5 @@ ICUUtils::ToICUString(nsAString& aMozString, UnicodeString& aICUString)
}
#endif
#endif /* ENABLE_INTL_API */
#endif /* MOZILLA_INTERNAL_API */

4
intl/unicharutil/util/ICUUtils.h
Просмотреть файл

@ -6,9 +6,6 @@
#ifndef mozilla_ICUUtils_h__
#define mozilla_ICUUtils_h__
// We only build the ICU utils if we're building ICU:
#ifdef ENABLE_INTL_API
// The ICU utils implementation needs internal things like XPCOM strings and
// nsGkAtom, so we only build when included into internal libs:
#ifdef MOZILLA_INTERNAL_API
@ -105,7 +102,6 @@ public:
#endif
};
#endif /* ENABLE_INTL_API */
#endif /* MOZILLA_INTERNAL_API */
#endif /* mozilla_ICUUtils_h__ */

6
intl/unicharutil/util/moz.build
Просмотреть файл

@ -17,6 +17,7 @@ EXPORTS += [
UNIFIED_SOURCES += [
'GreekCasing.cpp',
'ICUUtils.cpp',
'IrishCasing.cpp',
'nsBidiUtils.cpp',
'nsSpecialCasingData.cpp',
@ -24,9 +25,4 @@ UNIFIED_SOURCES += [
'nsUnicodeProperties.cpp',
]
if CONFIG['ENABLE_INTL_API']:
UNIFIED_SOURCES += [
'ICUUtils.cpp',
]
FINAL_LIBRARY = 'xul'

2
ipc/glue/CrashReporterHost.cpp
Просмотреть файл

@ -259,7 +259,7 @@ CrashReporterHost::NotifyCrashService(GeckoProcessType aProcessType,
telemetryKey.AssignLiteral("plugin");
nsAutoCString val;
if (aNotes->Get(NS_LITERAL_CSTRING("PluginHang"), &val) &&
val.Equals(NS_LITERAL_CSTRING("1"))) {
val.EqualsLiteral("1")) {
crashType = nsICrashService::CRASH_TYPE_HANG;
telemetryKey.AssignLiteral("pluginhang");
}

2
ipc/glue/GeckoChildProcessHost.cpp
Просмотреть файл

@ -764,7 +764,7 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
# if (MOZ_WIDGET_GTK == 3)
if (mProcessType == GeckoProcessType_Plugin) {
new_ld_lib_path.Append("/gtk2:");
new_ld_lib_path.AppendLiteral("/gtk2:");
new_ld_lib_path.Append(path.get());
}
# endif // (MOZ_WIDGET_GTK == 3)

4
js/xpconnect/loader/mozJSSubScriptLoader.cpp
Просмотреть файл

@ -126,10 +126,10 @@ ReportError(JSContext* cx, const char* origMsg, nsIURI* uri)
nsAutoCString spec;
nsresult rv = uri->GetSpec(spec);
if (NS_FAILED(rv))
spec.Assign("(unknown)");
spec.AssignLiteral("(unknown)");
nsAutoCString msg(origMsg);
msg.Append(": ");
msg.AppendLiteral(": ");
msg.Append(spec);
ReportError(cx, msg);
}

2
js/xpconnect/src/XPCJSRuntime.cpp
Просмотреть файл

@ -1730,7 +1730,7 @@ ReportCompartmentStats(const JS::CompartmentStats& cStats,
// Insert the add-on id as "add-ons/@id@/" after "explicit/" to
// aggregate add-on compartments.
static const size_t explicitLength = strlen("explicit/");
addonId.Insert(NS_LITERAL_CSTRING("add-ons/"), 0);
addonId.InsertLiteral("add-ons/", 0);
addonId += "/";
cJSPathPrefix.Insert(addonId, explicitLength);
cDOMPathPrefix.Insert(addonId, explicitLength);

3
js/xpconnect/src/XPCShellImpl.cpp
Просмотреть файл

@ -1431,10 +1431,11 @@ XPCShellDirProvider::SetGREDirs(nsIFile* greDir)
{
mGREDir = greDir;
mGREDir->Clone(getter_AddRefs(mGREBinDir));
#ifdef XP_MACOSX
nsAutoCString leafName;
mGREDir->GetNativeLeafName(leafName);
if (leafName.Equals("Resources")) {
if (leafName.EqualsLiteral("Resources")) {
mGREBinDir->SetNativeLeafName(NS_LITERAL_CSTRING("MacOS"));
}
#endif

3
layout/forms/nsComboboxControlFrame.cpp
Просмотреть файл

@ -1701,7 +1701,7 @@ nsComboboxControlFrame::GenerateStateKey(nsIContent* aContent,
if (NS_FAILED(rv) || aKey.IsEmpty()) {
return rv;
}
aKey.Append("CCF");
aKey.AppendLiteral("CCF");
return NS_OK;
}
@ -1718,4 +1718,3 @@ nsComboboxControlFrame::ToolkitHasNativePopup()
return false;
#endif /* MOZ_USE_NATIVE_POPUP_WINDOWS */
}

4
layout/generic/nsFrameState.cpp
Просмотреть файл

@ -52,9 +52,9 @@ GetFrameState(nsIFrame* aFrame)
#define FRAME_STATE_BIT(group_, value_, name_) \
if ((state & NS_FRAME_STATE_BIT(value_)) && groups.Contains(#group_)) { \
if (!result.IsEmpty()) { \
result.Insert(" | ", 0); \
result.InsertLiteral(" | ", 0); \
} \
result.Insert(#name_, 0); \
result.InsertLiteral(#name_, 0); \
state = state & ~NS_FRAME_STATE_BIT(value_); \
}
#include "nsFrameStateBits.h"

2
layout/painting/DisplayItemClipChain.cpp
Просмотреть файл

@ -44,7 +44,7 @@ DisplayItemClipChain::ToString(const DisplayItemClipChain* aClipChain)
str.AppendPrintf("<%s> [root asr]", sc->mClip.ToString().get());
}
if (sc->mParent) {
str.Append(", ");
str.AppendLiteral(", ");
}
}
return str;

2
layout/painting/DisplayItemScrollClip.cpp
Просмотреть файл

@ -48,7 +48,7 @@ DisplayItemScrollClip::ToString(const DisplayItemScrollClip* aScrollClip)
str.AppendPrintf("<%s>%s", scrollClip->mClip ? scrollClip->mClip->ToString().get() : "null",
scrollClip->mIsAsyncScrollable ? " [async-scrollable]" : "");
if (scrollClip->mParent) {
str.Append(", ");
str.AppendLiteral(", ");
}
}
return str;

2
layout/painting/nsDisplayList.cpp
Просмотреть файл

@ -158,7 +158,7 @@ ActiveScrolledRoot::ToString(const ActiveScrolledRoot* aActiveScrolledRoot)
for (auto* asr = aActiveScrolledRoot; asr; asr = asr->mParent) {
str.AppendPrintf("<0x%p>", asr->mScrollableFrame);
if (asr->mParent) {
str.Append(", ");
str.AppendLiteral(", ");
}
}
return str;

2
layout/style/CounterStyleManager.cpp
Просмотреть файл

@ -492,7 +492,7 @@ EthiopicToText(CounterValue aOrdinal, nsAString& aResult)
// If we didn't add the leading "0", decrement asciiStringLength so
// it will be equivalent to a zero-based index in both cases.
if (asciiStringLength & 1) {
asciiNumberString.Insert(NS_LITERAL_STRING("0"), 0);
asciiNumberString.InsertLiteral(u"0", 0);
} else {
asciiStringLength--;
}

2
layout/style/FontFaceSet.cpp
Просмотреть файл

@ -663,7 +663,7 @@ FontFaceSet::StartLoad(gfxUserFontEntry* aUserFontEntry,
nsAutoCString accept("application/font-woff;q=0.9,*/*;q=0.8");
if (Preferences::GetBool(GFX_PREF_WOFF2_ENABLED)) {
accept.Insert(NS_LITERAL_CSTRING("application/font-woff2;q=1.0,"), 0);
accept.InsertLiteral("application/font-woff2;q=1.0,", 0);
}
rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
accept, false);

6
layout/style/StyleRule.cpp
Просмотреть файл

@ -873,7 +873,7 @@ nsCSSSelector::AppendToStringWithoutCombinatorsOrNegations
if (list->mValueCaseSensitivity ==
nsAttrSelector::ValueCaseSensitivity::CaseInsensitive) {
aString.Append(NS_LITERAL_STRING(" i"));
aString.AppendLiteral(u" i");
}
}
@ -1343,11 +1343,11 @@ StyleRule::List(FILE* out, int32_t aIndent) const
if (sheet) {
nsIURI* uri = sheet->GetSheetURI();
if (uri) {
str.Append(" /* ");
str.AppendLiteral(" /* ");
str.Append(uri->GetSpecOrDefault());
str.Append(':');
str.AppendInt(mLineNumber);
str.Append(" */");
str.AppendLiteral(" */");
}
}
}

14
modules/libjar/nsJAR.cpp
Просмотреть файл

@ -601,7 +601,7 @@ nsZipReaderCache::IsCached(nsIFile* zipFile, bool* aResult)
if (NS_FAILED(rv))
return rv;
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
uri.InsertLiteral("file:", 0);
*aResult = mZips.Contains(uri);
return NS_OK;
@ -623,7 +623,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result,
rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv)) return rv;
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
uri.InsertLiteral("file:", 0);
RefPtr<nsJAR> zip;
mZips.Get(uri, getter_AddRefs(zip));
@ -683,7 +683,7 @@ nsZipReaderCache::GetInnerZip(nsIFile* zipFile, const nsACString &entry,
rv = zipFile->GetNativePath(uri);
if (NS_FAILED(rv)) return rv;
uri.Insert(NS_LITERAL_CSTRING("jar:"), 0);
uri.InsertLiteral("jar:", 0);
uri.AppendLiteral("!/");
uri.Append(entry);
@ -727,7 +727,7 @@ nsZipReaderCache::GetFd(nsIFile* zipFile, PRFileDesc** aRetVal)
if (NS_FAILED(rv)) {
return rv;
}
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
uri.InsertLiteral("file:", 0);
MutexAutoLock lock(mLock);
RefPtr<nsJAR> zip;
@ -815,9 +815,9 @@ nsZipReaderCache::ReleaseZip(nsJAR* zip)
return rv;
if (oldest->mOuterZipEntry.IsEmpty()) {
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
uri.InsertLiteral("file:", 0);
} else {
uri.Insert(NS_LITERAL_CSTRING("jar:"), 0);
uri.InsertLiteral("jar:", 0);
uri.AppendLiteral("!/");
uri.Append(oldest->mOuterZipEntry);
}
@ -874,7 +874,7 @@ nsZipReaderCache::Observe(nsISupports *aSubject,
if (NS_FAILED(file->GetNativePath(uri)))
return NS_OK;
uri.Insert(NS_LITERAL_CSTRING("file:"), 0);
uri.InsertLiteral("file:", 0);
MutexAutoLock lock(mLock);

2
modules/libjar/nsJARChannel.cpp
Просмотреть файл

@ -600,7 +600,7 @@ nsJARChannel::GetContentType(nsACString &result)
// If the Jar file has not been open yet,
// We return application/x-unknown-content-type
if (!mOpened) {
result.Assign(UNKNOWN_CONTENT_TYPE);
result.AssignLiteral(UNKNOWN_CONTENT_TYPE);
return NS_OK;
}

2
modules/libpref/Preferences.cpp
Просмотреть файл

@ -1158,7 +1158,7 @@ Preferences::MakeBackupPrefFile(nsIFile *aFile)
nsAutoString newFilename;
nsresult rv = aFile->GetLeafName(newFilename);
NS_ENSURE_SUCCESS(rv, rv);
newFilename.Insert(NS_LITERAL_STRING("Invalid"), 0);
newFilename.InsertLiteral(u"Invalid", 0);
nsCOMPtr<nsIFile> newFile;
rv = aFile->GetParent(getter_AddRefs(newFile));
NS_ENSURE_SUCCESS(rv, rv);

4
netwerk/base/Dashboard.cpp
Просмотреть файл

@ -888,8 +888,8 @@ HttpConnInfo::SetHTTP1ProtocolVersion(uint8_t pv)
void
HttpConnInfo::SetHTTP2ProtocolVersion(uint8_t pv)
{
MOZ_ASSERT (pv == HTTP_VERSION_2);
protocolVersion.Assign(u"h2");
MOZ_ASSERT(pv == HTTP_VERSION_2);
protocolVersion.AssignLiteral(u"h2");
}
NS_IMETHODIMP

2
netwerk/base/nsIURI.idl
Просмотреть файл

@ -102,7 +102,7 @@ interface nsIURI : nsISupports
nsCString spec;
nsresult rv = GetSpec(spec);
if (NS_FAILED(rv)) {
spec.Assign("[nsIURI::GetSpec failed]");
spec.AssignLiteral("[nsIURI::GetSpec failed]");
}
return spec;
}

3
netwerk/base/nsSocketTransport2.cpp
Просмотреть файл

@ -1102,8 +1102,7 @@ nsSocketTransport::ResolveHost()
// When not resolving mHost locally, we still want to ensure that
// it only contains valid characters. See bug 304904 for details.
// Sometimes the end host is not yet known and mHost is *
if (!net_IsValidHostName(mHost) &&
!mHost.Equals(NS_LITERAL_CSTRING("*"))) {
if (!net_IsValidHostName(mHost) && !mHost.EqualsLiteral("*")) {
SOCKET_LOG((" invalid hostname %s\n", mHost.get()));
return NS_ERROR_UNKNOWN_HOST;
}

2
netwerk/base/nsURLHelperOSX.cpp
Просмотреть файл

@ -176,7 +176,7 @@ net_GetFileFromURLSpec(const nsACString &aURL, nsIFile **result)
// and there is a directory "Mac HD" at its root. If such a
// directory doesn't exist, we'll assume this is an HFS path.
FSRef testRef;
possibleVolName.Insert("/", 0);
possibleVolName.InsertLiteral("/", 0);
if (::FSPathMakeRef((UInt8*)possibleVolName.get(), &testRef, nullptr) != noErr)
bHFSPath = true;
}

5
netwerk/cookie/CookieServiceChild.cpp
Просмотреть файл

@ -305,11 +305,11 @@ CookieServiceChild::GetCookieStringFromCookieHashTable(nsIURI *a
if (!cookie->Name().IsEmpty() || !cookie->Value().IsEmpty()) {
if (!aCookieString.IsEmpty()) {
aCookieString.Append("; ");
aCookieString.AppendLiteral("; ");
}
if (!cookie->Name().IsEmpty()) {
aCookieString.Append(cookie->Name().get());
aCookieString.Append("=");
aCookieString.AppendLiteral("=");
aCookieString.Append(cookie->Value().get());
} else {
aCookieString.Append(cookie->Value().get());
@ -616,4 +616,3 @@ CookieServiceChild::RunInTransaction(nsICookieTransactionCallback* aCallback)
} // namespace net
} // namespace mozilla

6
netwerk/cookie/nsCookieService.cpp
Просмотреть файл

@ -1544,7 +1544,7 @@ nsCookieService::CreateTableWorker(const char* aName)
// set will still work once they upgrade back.
nsAutoCString command("CREATE TABLE ");
command.Append(aName);
command.Append(" ("
command.AppendLiteral(" ("
"id INTEGER PRIMARY KEY, "
"baseDomain TEXT, "
"originAttributes TEXT NOT NULL DEFAULT '', "
@ -2588,7 +2588,7 @@ nsCookieService::Remove(const nsACString& aHost, const OriginAttributes& aAttrs,
if (!host.IsEmpty() && host.First() == '.')
host.Cut(0, 1);
host.Insert(NS_LITERAL_CSTRING("http://"), 0);
host.InsertLiteral("http://", 0);
nsCOMPtr<nsIURI> uri;
NS_NewURI(getter_AddRefs(uri), host);
@ -4299,7 +4299,7 @@ nsCookieService::CheckDomain(nsCookieAttributes &aCookieAttributes,
if (IsSubdomainOf(aCookieAttributes.host, aBaseDomain) &&
IsSubdomainOf(hostFromURI, aCookieAttributes.host)) {
// prepend a dot to indicate a domain cookie
aCookieAttributes.host.Insert(NS_LITERAL_CSTRING("."), 0);
aCookieAttributes.host.InsertLiteral(".", 0);
return true;
}

10
netwerk/ipc/NeckoCommon.h
Просмотреть файл

@ -35,12 +35,12 @@ class TabChild;
if (e) \
abort = (*e == '0') ? false : true; \
if (abort) { \
msg.Append(" (set NECKO_ERRORS_ARE_FATAL=0 in your environment to " \
"convert this error into a warning.)"); \
msg.AppendLiteral(" (set NECKO_ERRORS_ARE_FATAL=0 in your environment " \
"to convert this error into a warning.)"); \
NS_RUNTIMEABORT(msg.get()); \
} else { \
msg.Append(" (set NECKO_ERRORS_ARE_FATAL=1 in your environment to " \
"convert this warning into a fatal error.)"); \
msg.AppendLiteral(" (set NECKO_ERRORS_ARE_FATAL=1 in your environment " \
"to convert this warning into a fatal error.)"); \
NS_WARNING(msg.get()); \
} \
} while (0)
@ -122,9 +122,7 @@ MissingRequiredTabChild(mozilla::dom::TabChild* tabChild,
return false;
}
} // namespace net
} // namespace mozilla
#endif // mozilla_net_NeckoCommon_h

8
netwerk/ipc/NeckoParent.cpp
Просмотреть файл

@ -193,15 +193,15 @@ NeckoParent::GetValidatedOriginAttributes(const SerializedLoadContext& aSerializ
if (!ChromeUtils::IsOriginAttributesEqual(aSerialized.mOriginAttributes,
tabContext.OriginAttributesRef())) {
debugString.Append("(");
debugString.AppendLiteral("(");
debugString.Append(serializedSuffix);
debugString.Append(",");
debugString.AppendLiteral(",");
nsAutoCString tabSuffix;
tabContext.OriginAttributesRef().CreateAnonymizedSuffix(tabSuffix);
debugString.Append(tabSuffix);
debugString.Append(")");
debugString.AppendLiteral(")");
continue;
}
@ -224,7 +224,7 @@ NeckoParent::GetValidatedOriginAttributes(const SerializedLoadContext& aSerializ
}
nsAutoCString errorString;
errorString.Append("GetValidatedOriginAttributes | App does not have permission -");
errorString.AppendLiteral("GetValidatedOriginAttributes | App does not have permission -");
errorString.Append(debugString);
// Leak the buffer on the heap to make sure that it lives long enough, as

4
netwerk/protocol/about/nsAboutCache.cpp
Просмотреть файл

@ -500,9 +500,9 @@ nsAboutCache::Channel::OnCacheEntryInfo(nsIURI *aURI, const nsACString & aIdEnha
// Pinning
mBuffer.AppendLiteral(" <td>");
if (aPinned) {
mBuffer.Append(NS_LITERAL_CSTRING("Pinned"));
mBuffer.AppendLiteral("Pinned");
} else {
mBuffer.Append(NS_LITERAL_CSTRING("&nbsp;"));
mBuffer.AppendLiteral("&nbsp;");
}
mBuffer.AppendLiteral("</td>\n");

2
netwerk/protocol/about/nsAboutProtocolHandler.cpp
Просмотреть файл

@ -142,7 +142,7 @@ nsAboutProtocolHandler::NewURI(const nsACString &aSpec,
rv = url->GetPathQueryRef(spec);
NS_ENSURE_SUCCESS(rv, rv);
spec.Insert("moz-safe-about:", 0);
spec.InsertLiteral("moz-safe-about:", 0);
nsCOMPtr<nsIURI> inner;
rv = NS_NewURI(getter_AddRefs(inner), spec);

3
netwerk/protocol/about/nsAboutProtocolUtils.h
Просмотреть файл

@ -47,7 +47,7 @@ NS_GetAboutModule(nsIURI *aAboutURI, nsIAboutModule** aModule)
if (NS_FAILED(rv)) return rv;
// look up a handler to deal with "what"
contractID.Insert(NS_LITERAL_CSTRING(NS_ABOUT_MODULE_CONTRACTID_PREFIX), 0);
contractID.InsertLiteral(NS_ABOUT_MODULE_CONTRACTID_PREFIX, 0);
return CallGetService(contractID.get(), aModule);
}
@ -67,5 +67,4 @@ inline void PrintTimeString(char *buf, uint32_t bufsize, uint32_t t_sec)
PR_FormatTime(buf, bufsize, "%Y-%m-%d %H:%M:%S", &et);
}
#endif

32
netwerk/protocol/ftp/nsFtpConnectionThread.cpp
Просмотреть файл

@ -746,7 +746,8 @@ nsFtpState::S_user() {
// XXX Is UTF-8 the best choice?
AppendUTF16toUTF8(mUsername, usernameStr);
}
usernameStr.Append(CRLF);
usernameStr.AppendLiteral(CRLF);
return SendFTPCommand(usernameStr);
}
@ -838,7 +839,8 @@ nsFtpState::S_pass() {
// XXX Is UTF-8 the best choice?
AppendUTF16toUTF8(mPassword, passwordStr);
}
passwordStr.Append(CRLF);
passwordStr.AppendLiteral(CRLF);
return SendFTPCommand(passwordStr);
}
@ -1015,8 +1017,8 @@ nsFtpState::S_cwd() {
cwdStr.Insert(mPwd,0);
if (mServerType == FTP_VMS_TYPE)
ConvertDirspecToVMS(cwdStr);
cwdStr.Insert("CWD ",0);
cwdStr.Append(CRLF);
cwdStr.InsertLiteral("CWD ", 0);
cwdStr.AppendLiteral(CRLF);
return SendFTPCommand(cwdStr);
}
@ -1040,8 +1042,8 @@ nsFtpState::S_size() {
sizeBuf.Insert(mPwd,0);
if (mServerType == FTP_VMS_TYPE)
ConvertFilespecToVMS(sizeBuf);
sizeBuf.Insert("SIZE ",0);
sizeBuf.Append(CRLF);
sizeBuf.InsertLiteral("SIZE ", 0);
sizeBuf.AppendLiteral(CRLF);
return SendFTPCommand(sizeBuf);
}
@ -1064,8 +1066,8 @@ nsFtpState::S_mdtm() {
mdtmBuf.Insert(mPwd,0);
if (mServerType == FTP_VMS_TYPE)
ConvertFilespecToVMS(mdtmBuf);
mdtmBuf.Insert("MDTM ",0);
mdtmBuf.Append(CRLF);
mdtmBuf.InsertLiteral("MDTM ", 0);
mdtmBuf.AppendLiteral(CRLF);
return SendFTPCommand(mdtmBuf);
}
@ -1207,8 +1209,9 @@ nsFtpState::S_retr() {
retrStr.Insert(mPwd,0);
if (mServerType == FTP_VMS_TYPE)
ConvertFilespecToVMS(retrStr);
retrStr.Insert("RETR ",0);
retrStr.Append(CRLF);
retrStr.InsertLiteral("RETR ", 0);
retrStr.AppendLiteral(CRLF);
return SendFTPCommand(retrStr);
}
@ -1239,14 +1242,12 @@ nsFtpState::R_retr() {
return FTP_S_CWD;
}
nsresult
nsFtpState::S_rest() {
nsAutoCString restString("REST ");
// The int64_t cast is needed to avoid ambiguity
restString.AppendInt(int64_t(mChannel->StartPos()), 10);
restString.Append(CRLF);
restString.AppendLiteral(CRLF);
return SendFTPCommand(restString);
}
@ -1287,8 +1288,8 @@ nsFtpState::S_stor() {
ConvertFilespecToVMS(storStr);
NS_UnescapeURL(storStr);
storStr.Insert("STOR ",0);
storStr.Append(CRLF);
storStr.InsertLiteral("STOR ", 0);
storStr.AppendLiteral(CRLF);
return SendFTPCommand(storStr);
}
@ -2193,4 +2194,3 @@ nsFtpState::OnCallbackPending()
mDataStream->AsyncWait(this, 0, 0, CallbackTarget());
}
}

2
netwerk/protocol/gio/nsGIOProtocolHandler.cpp
Просмотреть файл

@ -961,7 +961,7 @@ nsGIOProtocolHandler::IsSupportedProtocol(const nsCString &aSpec)
NS_IMETHODIMP
nsGIOProtocolHandler::GetScheme(nsACString &aScheme)
{
aScheme.Assign(MOZ_GIO_SCHEME);
aScheme.AssignLiteral(MOZ_GIO_SCHEME);
return NS_OK;
}

22
netwerk/protocol/http/AlternateServices.cpp
Просмотреть файл

@ -37,9 +37,9 @@ namespace net {
static nsresult
SchemeIsHTTPS(const nsACString &originScheme, bool &outIsHTTPS)
{
outIsHTTPS = originScheme.Equals(NS_LITERAL_CSTRING("https"));
outIsHTTPS = originScheme.EqualsLiteral("https");
if (!outIsHTTPS && !originScheme.Equals(NS_LITERAL_CSTRING("http"))) {
if (!outIsHTTPS && !originScheme.EqualsLiteral("http")) {
MOZ_ASSERT(false, "unexpected scheme");
return NS_ERROR_UNEXPECTED;
}
@ -92,7 +92,7 @@ AltSvcMapping::ProcessHeader(const nsCString &buf, const nsCString &originScheme
parsedAltSvc.mValues[index].mValues[pairIndex].mValue;
if (!pairIndex) {
if (currentName.Equals(NS_LITERAL_CSTRING("clear"))) {
if (currentName.EqualsLiteral("clear")) {
clearEntry = true;
break;
}
@ -107,7 +107,7 @@ AltSvcMapping::ProcessHeader(const nsCString &buf, const nsCString &originScheme
colonIndex = 0;
}
hostname.Assign(currentValue.BeginReading(), colonIndex);
} else if (currentName.Equals(NS_LITERAL_CSTRING("ma"))) {
} else if (currentName.EqualsLiteral("ma")) {
maxage = atoi(PromiseFlatCString(currentValue).get());
break;
} else {
@ -228,7 +228,7 @@ AltSvcMapping::MakeHashKey(nsCString &outKey,
outKey.Truncate();
if (originPort == -1) {
bool isHttps = originScheme.Equals("https");
bool isHttps = originScheme.EqualsLiteral("https");
originPort = isHttps ? NS_HTTPS_DEFAULT_PORT : NS_HTTP_DEFAULT_PORT;
}
@ -388,7 +388,7 @@ COMPILER ERROR
int32_t start = 0;
int32_t idx;
idx = str.FindChar(':', start); if (idx < 0) break;
mHttps = Substring(str, start, idx - start).Equals(NS_LITERAL_CSTRING("https"));
mHttps = Substring(str, start, idx - start).EqualsLiteral("https");
_NS_NEXT_TOKEN;
mOriginHost = Substring(str, start, idx - start);
_NS_NEXT_TOKEN;
@ -400,17 +400,17 @@ COMPILER ERROR
_NS_NEXT_TOKEN;
mUsername = Substring(str, start, idx - start);
_NS_NEXT_TOKEN;
mPrivate = Substring(str, start, idx - start).Equals(NS_LITERAL_CSTRING("y"));
mPrivate = Substring(str, start, idx - start).EqualsLiteral("y");
_NS_NEXT_TOKEN;
mExpiresAt = nsCString(Substring(str, start, idx - start)).ToInteger(&code);
_NS_NEXT_TOKEN;
mNPNToken = Substring(str, start, idx - start);
_NS_NEXT_TOKEN;
mValidated = Substring(str, start, idx - start).Equals(NS_LITERAL_CSTRING("y"));
mValidated = Substring(str, start, idx - start).EqualsLiteral("y");
_NS_NEXT_TOKEN;
mStorageEpoch = nsCString(Substring(str, start, idx - start)).ToInteger(&code);
_NS_NEXT_TOKEN;
mMixedScheme = Substring(str, start, idx - start).Equals(NS_LITERAL_CSTRING("y"));
mMixedScheme = Substring(str, start, idx - start).EqualsLiteral("y");
_NS_NEXT_TOKEN;
Unused << mOriginAttributes.PopulateFromSuffix(Substring(str, start, idx - start));
#undef _NS_NEXT_TOKEN
@ -606,7 +606,7 @@ public:
mTransactionAlternate->mWKResponse.get()));
} else if (!mAlternateCT.Equals(mOriginCT)) {
LOG(("WellKnownChecker::Done %p alternate and origin content types dont match\n", this));
} else if (!mAlternateCT.Equals(NS_LITERAL_CSTRING("application/json"))) {
} else if (!mAlternateCT.EqualsLiteral("application/json")) {
LOG(("WellKnownChecker::Done %p .wk content type is %s\n", this, mAlternateCT.get()));
} else if (!uu) {
LOG(("WellKnownChecker::Done %p json parser service unavailable\n", this));
@ -920,7 +920,7 @@ AltSvcCache::UpdateAltServiceMapping(AltSvcMapping *map, nsProxyInfo *pi,
nsCOMPtr<nsIURI> wellKnown;
nsAutoCString uri(origin);
uri.Append(NS_LITERAL_CSTRING("/.well-known/http-opportunistic"));
uri.AppendLiteral("/.well-known/http-opportunistic");
NS_NewURI(getter_AddRefs(wellKnown), uri);
auto *checker = new WellKnownChecker(wellKnown, origin, caps, ci, map);

4
netwerk/protocol/http/Http2Stream.cpp
Просмотреть файл

@ -1075,8 +1075,8 @@ Http2Stream::ConvertResponseHeaders(Http2Decompressor *decompressor,
// The decoding went ok. Now we can customize and clean up.
aHeadersIn.Truncate();
aHeadersOut.Append("X-Firefox-Spdy: h2");
aHeadersOut.Append("\r\n\r\n");
aHeadersOut.AppendLiteral("X-Firefox-Spdy: h2");
aHeadersOut.AppendLiteral("\r\n\r\n");
LOG (("decoded response headers are:\n%s", aHeadersOut.BeginReading()));
if (mIsTunnel && !mPlainTextTunnel) {
aHeadersOut.Truncate();

6
netwerk/protocol/http/HttpBaseChannel.cpp
Просмотреть файл

@ -1234,11 +1234,11 @@ HttpBaseChannel::DoApplyContentConversions(nsIStreamListener* aNextListener,
LOG(("converter removed '%s' content-encoding\n", val));
if (gHttpHandler->IsTelemetryEnabled()) {
int mode = 0;
if (from.Equals("gzip") || from.Equals("x-gzip")) {
if (from.EqualsLiteral("gzip") || from.EqualsLiteral("x-gzip")) {
mode = 1;
} else if (from.Equals("deflate") || from.Equals("x-deflate")) {
} else if (from.EqualsLiteral("deflate") || from.EqualsLiteral("x-deflate")) {
mode = 2;
} else if (from.Equals("br")) {
} else if (from.EqualsLiteral("br")) {
mode = 3;
}
Telemetry::Accumulate(Telemetry::HTTP_CONTENT_ENCODING, mode);

18
netwerk/protocol/http/nsHttpChannel.cpp
Просмотреть файл

@ -2242,8 +2242,8 @@ nsHttpChannel::ProcessAltService()
nsAutoCString scheme;
mURI->GetScheme(scheme);
bool isHttp = scheme.Equals(NS_LITERAL_CSTRING("http"));
if (!isHttp && !scheme.Equals(NS_LITERAL_CSTRING("https"))) {
bool isHttp = scheme.EqualsLiteral("http");
if (!isHttp && !scheme.EqualsLiteral("https")) {
return;
}
@ -6401,8 +6401,8 @@ nsHttpChannel::BeginConnect()
RefPtr<AltSvcMapping> mapping;
if (!mConnectionInfo && mAllowAltSvc && // per channel
!(mLoadFlags & LOAD_FRESH_CONNECTION) &&
(scheme.Equals(NS_LITERAL_CSTRING("http")) ||
scheme.Equals(NS_LITERAL_CSTRING("https"))) &&
(scheme.EqualsLiteral("http") ||
scheme.EqualsLiteral("https")) &&
(!proxyInfo || proxyInfo->IsDirect()) &&
(mapping = gHttpHandler->GetAltServiceMapping(scheme,
host, port,
@ -6429,15 +6429,15 @@ nsHttpChannel::BeginConnect()
if (consoleService) {
nsAutoString message(NS_LITERAL_STRING("Alternate Service Mapping found: "));
AppendASCIItoUTF16(scheme.get(), message);
message.Append(NS_LITERAL_STRING("://"));
message.AppendLiteral(u"://");
AppendASCIItoUTF16(host.get(), message);
message.Append(NS_LITERAL_STRING(":"));
message.AppendLiteral(u":");
message.AppendInt(port);
message.Append(NS_LITERAL_STRING(" to "));
message.AppendLiteral(u" to ");
AppendASCIItoUTF16(scheme.get(), message);
message.Append(NS_LITERAL_STRING("://"));
message.AppendLiteral(u"://");
AppendASCIItoUTF16(mapping->AlternateHost().get(), message);
message.Append(NS_LITERAL_STRING(":"));
message.AppendLiteral(u":");
message.AppendInt(mapping->AlternatePort());
consoleService->LogStringMessage(message.get());
}

4
netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
Просмотреть файл

@ -531,7 +531,7 @@ nsHttpChannelAuthProvider::PrepareForAuthentication(bool proxyAuth)
// non-request based authentication handshake (e.g., for NTLM auth).
nsAutoCString contractId;
contractId.Assign(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractId.AssignLiteral(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractId.Append(mProxyAuthType);
nsresult rv;
@ -1084,7 +1084,7 @@ nsHttpChannelAuthProvider::GetAuthenticator(const char *challenge,
ToLowerCase(authType);
nsAutoCString contractid;
contractid.Assign(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractid.AssignLiteral(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractid.Append(authType);
return CallGetService(contractid.get(), auth);

4
netwerk/protocol/http/nsHttpRequestHead.cpp
Просмотреть файл

@ -329,10 +329,10 @@ nsHttpRequestHead::SetOrigin(const nsACString &scheme, const nsACString &host,
{
RecursiveMutexAutoLock mon(mRecursiveMutex);
mOrigin.Assign(scheme);
mOrigin.Append(NS_LITERAL_CSTRING("://"));
mOrigin.AppendLiteral("://");
mOrigin.Append(host);
if (port >= 0) {
mOrigin.Append(NS_LITERAL_CSTRING(":"));
mOrigin.AppendLiteral(":");
mOrigin.AppendInt(port);
}
}

2
netwerk/protocol/http/nsHttpTransaction.cpp
Просмотреть файл

@ -1949,7 +1949,7 @@ nsHttpTransaction::CheckForStickyAuthSchemeAt(nsHttpAtom const& header)
ToLowerCase(schema);
nsAutoCString contractid;
contractid.Assign(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractid.AssignLiteral(NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX);
contractid.Append(schema);
// using a new instance because of thread safety of auth modules refcnt

3
netwerk/protocol/res/SubstitutingProtocolHandler.cpp
Просмотреть файл

@ -425,8 +425,7 @@ SubstitutingProtocolHandler::ResolveURI(nsIURI *uri, nsACString &result)
rv = baseURI->GetSpec(result);
} else {
// Make sure we always resolve the path as file-relative to our target URI.
path.InsertLiteral(".", 0);
path.Insert('.', 0);
rv = baseURI->Resolve(path, result);
}

14
netwerk/protocol/res/nsResProtocolHandler.cpp
Просмотреть файл

@ -99,7 +99,7 @@ nsResProtocolHandler::ResolveSpecialCases(const nsACString& aHost,
const nsACString& aPathname,
nsACString& aResult)
{
if (aHost.Equals("") || aHost.Equals(kAPP)) {
if (aHost.EqualsLiteral("") || aHost.EqualsLiteral(kAPP)) {
aResult.Assign(mAppURI);
} else if (aHost.Equals(kGRE)) {
aResult.Assign(mGREURI);
@ -113,9 +113,9 @@ nsResProtocolHandler::ResolveSpecialCases(const nsACString& aHost,
nsresult
nsResProtocolHandler::SetSubstitution(const nsACString& aRoot, nsIURI* aBaseURI)
{
MOZ_ASSERT(!aRoot.Equals(""));
MOZ_ASSERT(!aRoot.Equals(kAPP));
MOZ_ASSERT(!aRoot.Equals(kGRE));
MOZ_ASSERT(!aRoot.EqualsLiteral(""));
MOZ_ASSERT(!aRoot.EqualsLiteral(kAPP));
MOZ_ASSERT(!aRoot.EqualsLiteral(kGRE));
return SubstitutingProtocolHandler::SetSubstitution(aRoot, aBaseURI);
}
@ -124,8 +124,8 @@ nsResProtocolHandler::SetSubstitutionWithFlags(const nsACString& aRoot,
nsIURI* aBaseURI,
uint32_t aFlags)
{
MOZ_ASSERT(!aRoot.Equals(""));
MOZ_ASSERT(!aRoot.Equals(kAPP));
MOZ_ASSERT(!aRoot.Equals(kGRE));
MOZ_ASSERT(!aRoot.EqualsLiteral(""));
MOZ_ASSERT(!aRoot.EqualsLiteral(kAPP));
MOZ_ASSERT(!aRoot.EqualsLiteral(kGRE));
return SubstitutingProtocolHandler::SetSubstitutionWithFlags(aRoot, aBaseURI, aFlags);
}

2
netwerk/protocol/viewsource/nsViewSourceChannel.cpp
Просмотреть файл

@ -420,7 +420,7 @@ nsViewSourceChannel::GetContentType(nsACString &aContentType)
// content decoder will then kick in automatically, and it
// will call our SetOriginalContentType method instead of our
// SetContentType method to set the type it determines.
if (!contentType.Equals(UNKNOWN_CONTENT_TYPE)) {
if (!contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) {
contentType = VIEWSOURCE_CONTENT_TYPE;
}

2
netwerk/protocol/websocket/WebSocketChannel.cpp
Просмотреть файл

@ -2563,7 +2563,7 @@ ParseWebSocketExtension(const nsACString& aExtension,
nsCCharSeparatedTokenizer tokens(aExtension, ';');
if (!tokens.hasMoreTokens() ||
!tokens.nextToken().Equals(NS_LITERAL_CSTRING("permessage-deflate"))) {
!tokens.nextToken().EqualsLiteral("permessage-deflate")) {
LOG(("WebSocketChannel::ParseWebSocketExtension: "
"HTTP Sec-WebSocket-Extensions negotiated unknown value %s\n",
PromiseFlatCString(aExtension).get()));

8
netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
Просмотреть файл

@ -77,24 +77,24 @@ mozTXTToHTMLConv::EscapeStr(nsString& aInString, bool inAttribute)
{
case '<':
aInString.Cut(i, 1);
aInString.Insert(NS_LITERAL_STRING("&lt;"), i);
aInString.InsertLiteral(u"&lt;", i);
i += 4; // skip past the integers we just added
break;
case '>':
aInString.Cut(i, 1);
aInString.Insert(NS_LITERAL_STRING("&gt;"), i);
aInString.InsertLiteral(u"&gt;", i);
i += 4; // skip past the integers we just added
break;
case '&':
aInString.Cut(i, 1);
aInString.Insert(NS_LITERAL_STRING("&amp;"), i);
aInString.InsertLiteral(u"&amp;", i);
i += 5; // skip past the integers we just added
break;
case '"':
if (inAttribute)
{
aInString.Cut(i, 1);
aInString.Insert(NS_LITERAL_STRING("&quot;"), i);
aInString.InsertLiteral(u"&quot;", i);
i += 6;
break;
}

4
netwerk/streamconv/converters/nsBinHexDecoder.cpp
Просмотреть файл

@ -493,7 +493,8 @@ nsresult nsBinHexDecoder::DetectContentType(nsIRequest* aRequest,
mimeService->GetTypeFromExtension(nsDependentCString(fileExt), contentType);
// Only set the type if it's not empty and, to prevent recursive loops, not the binhex type
if (!contentType.IsEmpty() && !contentType.Equals(APPLICATION_BINHEX)) {
if (!contentType.IsEmpty() &&
!contentType.EqualsLiteral(APPLICATION_BINHEX)) {
channel->SetContentType(contentType);
} else {
channel->SetContentType(NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE));
@ -502,7 +503,6 @@ nsresult nsBinHexDecoder::DetectContentType(nsIRequest* aRequest,
return NS_OK;
}
NS_IMETHODIMP
nsBinHexDecoder::OnStopRequest(nsIRequest* request, nsISupports *aCtxt,
nsresult aStatus)

6
netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
Просмотреть файл

@ -285,7 +285,7 @@ nsTXTToHTMLConv::CatHTML(int32_t front, int32_t back)
// href is implied
mBuffer.Mid(linkText, front, back-front);
mBuffer.Insert(NS_LITERAL_STRING("<a href=\""), front);
mBuffer.InsertLiteral(u"<a href=\"", front);
cursor += front+9;
if (modLen) {
mBuffer.Insert(mToken->modText, cursor);
@ -302,11 +302,11 @@ nsTXTToHTMLConv::CatHTML(int32_t front, int32_t back)
}
cursor += back-front;
mBuffer.Insert(NS_LITERAL_STRING("\">"), cursor);
mBuffer.InsertLiteral(u"\">", cursor);
cursor += 2;
mBuffer.Insert(linkText, cursor);
cursor += linkText.Length();
mBuffer.Insert(NS_LITERAL_STRING("</a>"), cursor);
mBuffer.InsertLiteral(u"</a>", cursor);
cursor += 4;
}
mToken = nullptr; // indicates completeness

2
netwerk/streamconv/converters/nsUnknownDecoder.cpp
Просмотреть файл

@ -934,7 +934,7 @@ nsBinaryDetector::DetermineContentType(nsIRequest* aRequest)
LastDitchSniff(aRequest);
MutexAutoLock lock(mMutex);
if (mContentType.Equals(APPLICATION_OCTET_STREAM)) {
if (mContentType.EqualsLiteral(APPLICATION_OCTET_STREAM)) {
// We want to guess at it instead
mContentType = APPLICATION_GUESS_FROM_EXT;
} else {

2
netwerk/test/gtest/TestStandardURL.cpp
Просмотреть файл

@ -162,7 +162,7 @@ TEST(TestStandardURL, From_test_standardurldotjs)
for (uint32_t i = 0; i < sizeof(localIPv4s)/sizeof(localIPv4s[0]); i ++) {
nsCString encHost(localIPv4s[i]);
ASSERT_EQ(NS_OK, Test_NormalizeIPv4(encHost, result));
ASSERT_TRUE(result.Equals("127.0.0.1"));
ASSERT_TRUE(result.EqualsLiteral("127.0.0.1"));
}
const char* nonIPv4s[] = {"0xfffffffff", "0x100000000", "4294967296", "1.2.0x10000",

4
parser/html/nsHtml5ViewSourceUtils.cpp
Просмотреть файл

@ -18,10 +18,10 @@ nsHtml5ViewSourceUtils::NewBodyAttributes()
nsString klass;
if (mozilla::Preferences::GetBool("view_source.wrap_long_lines", true)) {
klass.Append(NS_LITERAL_STRING("wrap "));
klass.AppendLiteral(u"wrap ");
}
if (mozilla::Preferences::GetBool("view_source.syntax_highlight", true)) {
klass.Append(NS_LITERAL_STRING("highlight"));
klass.AppendLiteral(u"highlight");
}
if (!klass.IsEmpty()) {
bodyAttrs->addAttribute(

2
rdf/datasource/nsFileSystemDataSource.cpp
Просмотреть файл

@ -1019,7 +1019,7 @@ FileSystemDataSource::GetFolderList(nsIRDFResource *source, bool allowHidden,
while ((aOffset = leaf.FindChar('/')) >= 0)
{
leaf.Cut((uint32_t)aOffset, 1);
leaf.Insert("%2F", (uint32_t)aOffset);
leaf.InsertLiteral("%2F", (uint32_t)aOffset);
}
// append the encoded name

2
security/apps/AppSignatureVerification.cpp
Просмотреть файл

@ -1221,7 +1221,7 @@ CheckDirForUnsignedFiles(nsIFile* aDir,
// if it's a directory we need to recurse
if (isDir) {
curName.Append(NS_LITERAL_STRING("/"));
curName.AppendLiteral(u"/");
rv = CheckDirForUnsignedFiles(file, curName, aItems,
sigFilename, sfFilename, mfFilename);
} else {

4
security/certverifier/OCSPRequestor.cpp
Просмотреть файл

@ -155,14 +155,14 @@ DoOCSPRequest(const UniquePLArenaPool& arena, const char* url,
if (pathLen > 0) {
path.Assign(url + pathPos, static_cast<nsAutoCString::size_type>(pathLen));
} else {
path.Assign("/");
path.AssignLiteral("/");
}
MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
("Setting up OCSP request: pre all path =%s pathlen=%d\n", path.get(),
pathLen));
nsAutoCString method("POST");
if (useGET) {
method.Assign("GET");
method.AssignLiteral("GET");
if (!StringEndsWith(path, NS_LITERAL_CSTRING("/"))) {
path.Append("/");
}

2
security/manager/ssl/StaticHPKPins.h
Просмотреть файл

@ -1140,4 +1140,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1514655026300000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1514742050390000);

2
security/manager/ssl/nsCertOverrideService.cpp
Просмотреть файл

@ -106,7 +106,7 @@ nsCertOverrideService::Init()
// point another hash algorithm was used and is still supported for backwards
// compatibility. This is not the case. It has always been SHA256.
mOidTagForStoringNewHashes = SEC_OID_SHA256;
mDottedOidForStoringNewHashes.Assign("OID.2.16.840.1.101.3.4.2.1");
mDottedOidForStoringNewHashes.AssignLiteral("OID.2.16.840.1.101.3.4.2.1");
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();

2
security/manager/ssl/nsNSSComponent.cpp
Просмотреть файл

@ -2336,7 +2336,7 @@ nsNSSComponent::Observe(nsISupports* aSubject, const char* aTopic,
SSL_OptionSetDefault(SSL_ENABLE_0RTT_DATA,
Preferences::GetBool("security.tls.enable_0rtt_data",
ENABLED_0RTT_DATA_DEFAULT));
} else if (prefName.Equals("security.ssl.disable_session_identifiers")) {
} else if (prefName.EqualsLiteral("security.ssl.disable_session_identifiers")) {
ConfigureTLSSessionIdentifiers();
} else if (prefName.EqualsLiteral("security.OCSP.enabled") ||
prefName.EqualsLiteral("security.OCSP.require") ||

198
security/manager/ssl/nsSTSPreloadList.errors
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

156
security/manager/ssl/nsSTSPreloadList.inc
Просмотреть файл

@ -8,7 +8,7 @@
/*****************************************************************************/
#include <stdint.h>
const PRTime gPreloadListExpirationTime = INT64_C(1517074215988000);
const PRTime gPreloadListExpirationTime = INT64_C(1517161240575000);
%%
0-1.party, 1
0.me.uk, 1
@ -116,7 +116,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1517074215988000);
132kv.ch, 1
13318522.com, 1
1359826938.rsc.cdn77.org, 1
13826145000.com, 1
1391kj.com, 1
1395kj.com, 1
1396.cc, 1
@ -220,7 +219,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1517074215988000);
2gen.com, 1
2hypeenterprises.com, 1
2kgwf.fi, 1
2krueger.de, 1
2mb.solutions, 1
2nains.ch, 1
2nerds1bit.com, 1
@ -332,6 +330,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1517074215988000);
500p.xyz, 1
50plusnet.nl, 1
513vpn.net, 1
517vpn.cn, 1
518maicai.com, 1
525.info, 1
52neptune.com, 1
@ -886,6 +885,7 @@ ahxxm.com, 1
ai-english.jp, 1
aia.de, 1
aibenzi.com, 1
aicial.com, 1
aidanmontare.net, 1
aide-valais.ch, 1
aiden.link, 1
@ -893,6 +893,7 @@ aidhan.net, 1
aidikofflaw.com, 1
aie.de, 1
aiesecarad.ro, 1
aiforsocialmedia.com, 1
aigcev.org, 1
aiicy.org, 1
aiida.se, 1
@ -1033,6 +1034,7 @@ alexgaynor.net, 1
alexhaydock.co.uk, 1
alexhd.de, 1
alexisabarca.com, 1
alexischaussy.xyz, 1
alexkott.com, 1
alexmak.net, 1
alexmerkel.com, 1
@ -1461,7 +1463,6 @@ anseo.ninja, 1
ansermet.net, 1
ansgar-sonntag.de, 1
ansgarsonntag.de, 1
anshuman-chatterjee.com, 0
anshumanbiswas.com, 1
ansogning-sg.dk, 1
anstaskforce.gov, 1
@ -2027,7 +2028,6 @@ auntie-eileens.com.au, 1
auplidespages.fr, 1
aur.rocks, 1
aureus.pw, 1
auri.ga, 1
auricblue.com, 1
auriko-games.de, 1
aurora-multimedia.co.uk, 1
@ -2086,7 +2086,6 @@ autoterminus-used.be, 1
autoverzekeringafsluiten.com, 1
autoxy.it, 1
autozane.com, 1
auvernet.org, 1
auxquatrevents.ch, 1
ava-creative.de, 0
avaaz.org, 1
@ -2268,7 +2267,6 @@ bajic.ch, 1
baka.network, 1
bakabt.info, 1
bakaproxy.moe, 1
bakaweb.fr, 1
bakersafari.co, 1
bakim.li, 1
bakkerinjebuurt.be, 1
@ -2563,7 +2561,6 @@ belfasttechservices.co.uk, 1
belge.rs, 1
belgers.com, 1
belgien.guide, 1
belhopro.be, 1
belics.com, 1
belien-tweedehandswagens.be, 1
believablebook.com, 0
@ -2694,7 +2691,6 @@ betamint.org, 1
betaworx.de, 1
betaworx.eu, 1
betformular.com, 1
bethanyduke.com, 1
betkoo.com, 1
betlander.com, 1
betonmoney.com, 1
@ -2748,6 +2744,7 @@ beyours.be, 1
bezoomnyville.com, 1
bezpecnostsiti.cf, 1
bfam.tv, 1
bfd.vodka, 1
bfi.wien, 0
bfrailwayclub.cf, 1
bftbradio.com, 1
@ -2858,7 +2855,6 @@ binaryapparatus.com, 1
binaryappdev.com, 1
binaryevolved.com, 1
binaryfigments.com, 1
binarystud.io, 1
binding-problem.com, 1
binfind.com, 1
bingcheung.com, 1
@ -3143,7 +3139,6 @@ bltc.org.uk, 1
blubberladen.de, 1
blue-leaf81.net, 1
blue42.net, 1
bluebill.net, 1
bluecards.eu, 1
bluechilli.com, 1
bluecon.ninja, 1
@ -3326,7 +3321,6 @@ boueki.org, 1
bougeret.fr, 1
boukoubengo.com, 1
bounceboxspc.com, 1
bouncourseplanner.net, 1
bouncyball.eu, 0
bouncyballs.org, 1
bountyfactory.io, 1
@ -3361,6 +3355,7 @@ boxvergelijker.nl, 1
boxview.com, 1
boyan.in, 1
boyfriendhusband.men, 1
boyhost.cn, 1
boypoint.de, 1
boz.nl, 1
bpadvisors.eu, 1
@ -3458,7 +3453,6 @@ brege.org, 1
breitbild-beamer.de, 1
brejoc.com, 1
brendanscherer.com, 1
brenden.net.au, 1
brentacampbell.com, 1
bress.cloud, 1
bressier.fr, 1
@ -3585,7 +3579,6 @@ btxiaobai.com, 1
bubba.cc, 1
bubblegumblog.com, 1
bubblespetspa.com, 1
buben.tech, 1
bubhub.io, 1
buch-angucken.de, 1
buck.com, 1
@ -3732,7 +3725,6 @@ by777.com, 1
byatte.com, 1
bygningsregistrering.dk, 1
byji.com, 1
byken.cn, 1
bymark.co, 1
bymike.co, 1
bynder.com, 1
@ -3773,7 +3765,6 @@ c.cc, 1
c16t.uk, 1
c2o-library.net, 1
c2o2.xyz, 1
c3-compose.com, 1
c3vo.de, 1
c3w.at, 1
c4.hk, 1
@ -4138,7 +4129,6 @@ cdmon.tech, 1
cdn6.de, 1
cdnjs.com, 1
cdns.cloud, 1
cdt.org, 1
cdu-wilgersdorf.de, 1
ce-agentur.de, 1
ce-pimkie.fr, 1
@ -4293,7 +4283,6 @@ chaosdorf.de, 1
chaosfield.at, 1
chaoslab.org, 1
chaospott.de, 1
chaoticlaw.com, 1
chaouby.com, 1
chaplain.co, 1
charbonnel.eu, 1
@ -4521,7 +4510,6 @@ christoph-conrads.name, 1
christophebarbezat.ch, 1
christopherburg.com, 1
christopherl.com, 1
christopherpritchard.co.uk, 1
christophertruncer.com, 1
christophkreileder.com, 1
christophsackl.de, 1
@ -4744,6 +4732,7 @@ cloud2go.de, 1
cloudapps.digital, 1
cloudbased.info, 1
cloudbasedsite.com, 1
cloudbleed.info, 1
cloudbolin.es, 1
cloudcaprice.net, 1
cloudflareonazure.com, 1
@ -4759,7 +4748,6 @@ cloudpagesforwork.com, 1
cloudpebble.net, 1
cloudpengu.in, 1
cloudpipes.com, 1
clouds.webcam, 1
cloudsecurityalliance.org, 1
cloudservice.io, 1
cloudspace-analytics.com, 1
@ -5096,7 +5084,6 @@ condosforcash.com, 1
condroz-motors.be, 1
conectalmeria.com, 1
confiancefoundation.org, 1
confidential.network, 1
config.schokokeks.org, 0
confiwall.de, 1
conflux.tw, 1
@ -5280,6 +5267,7 @@ countingto.one, 1
countryattire.com, 1
countrybrewer.com.au, 1
countryhouseresort.com, 1
countryoutlaws.ca, 1
countybankdel.com, 1
countyjailinmatesearch.com, 1
coup-dun-soir.ch, 1
@ -5851,7 +5839,6 @@ dark-vision.cz, 1
darkag.ovh, 1
darkcores.net, 1
darkdestiny.ch, 1
darkengine.net, 1
darkeststar.org, 1
darkfire.ch, 1
darkishgreen.com, 1
@ -6127,7 +6114,6 @@ defme.eu, 1
defrax.com, 1
defrax.de, 1
deftek.com, 1
deftnerd.com, 1
defuse.ca, 1
defxing.net, 1
degata.com, 1
@ -6177,6 +6163,7 @@ democraziaineuropa.eu, 1
demoniak.ch, 1
demonwav.com, 1
demonwolfdev.com, 1
demotivatorbi.ru, 1
dempsters.ca, 1
demuzere.be, 1
demuzere.com, 1
@ -6271,7 +6258,6 @@ desterman.ru, 1
destileria.net.br, 1
destinationsofnewyorkstate.com, 1
destinattorneyjohngreene.com, 1
desu.ne.jp, 1
det-te.ch, 1
detecte-fuite.ch, 1
detecte.ch, 1
@ -6304,6 +6290,7 @@ developer.mydigipass.com, 0
developerfair.com, 1
developermail.io, 1
developers.facebook.com, 0
developersclub.website, 1
developfx.com, 1
developmentaid.org, 1
developmentsites.melbourne, 1
@ -6319,7 +6306,6 @@ devisnow.fr, 1
devistravaux.org, 1
devjack.de, 1
devkid.net, 1
devkit.cc, 1
devlamvzw.org, 1
devlatron.net, 1
devlogr.com, 1
@ -6329,7 +6315,6 @@ devonsawatzky.ca, 1
devops-survey.com, 1
devops.moe, 1
devpgsv.com, 1
devpsy.info, 1
devstaff.gr, 1
devyn.ca, 1
devzero.io, 1
@ -6553,7 +6538,7 @@ discofitta.com, 1
disconformity.net, 1
discord-chan.net, 1
discordapp.com, 1
discotek.club, 1
discotek.club, 0
discountmetaux.fr, 1
discover-mercure.com, 1
discoverhealthage.com, 0
@ -6632,7 +6617,6 @@ dlouwrink.nl, 1
dlrsp.org, 1
dlzz.net, 1
dm.lookout.com, 0
dm4productions.com, 1
dm7ds.de, 1
dmarc.dk, 1
dmarketer.com, 1
@ -7135,6 +7119,7 @@ e-teacher.pl, 1
e-tech-solution.com, 1
e-tmf.org, 1
e-tresor.at, 1
e-tune-mt.net, 1
e-typ.eu, 1
e-vau.de, 1
e-wishlist.net, 1
@ -7434,7 +7419,6 @@ ekzarta.ru, 1
el-cell.com, 1
el-soul.com, 1
eladgames.com, 1
elaon.de, 1
elars.de, 1
elaxy-online.de, 1
eldertons.co.uk, 1
@ -7478,7 +7462,6 @@ elementalict.com, 1
elementalrobotics.com, 1
elementalsoftware.net, 1
elementalsoftware.org, 1
elementarywave.com, 1
elements.guide, 1
elena-baykova.ru, 1
elenorsmadness.org, 1
@ -8038,8 +8021,6 @@ evalesc.com, 1
evanfiddes.com, 1
evangelosm.com, 1
evankurniawan.com, 1
evantage.org, 1
evantageglobal.com, 1
evapp.org, 1
evasion-energie.com, 1
evasioncreole.com, 1
@ -8147,6 +8128,7 @@ expandeco.com, 1
expecting.com.br, 1
experienceoz.com.au, 1
expert-korovin.ru, 1
expert.cz, 1
experteasy.com.au, 1
experticon.com, 1
experts-en-gestion.fr, 1
@ -8422,6 +8404,7 @@ fcsic.gov, 1
fdlibre.eu, 1
fdsys.gov, 0
feac.us, 1
feaden.me, 1
fearghus.org, 1
fearsomegaming.com, 1
feastr.io, 1
@ -8748,6 +8731,7 @@ flexstart.me, 1
flextrack.dk, 1
flightdeckfriend.com, 1
flightschoolbooking.com, 1
flightschoolcandidates.gov, 1
fliino.com, 1
flikmsg.co, 1
flinch.io, 1
@ -9129,7 +9113,6 @@ freiwurst.net, 1
frenchcreekcog.org, 1
frenzel.dk, 1
frequencebanane.ch, 1
fresh-hotel.org, 1
fresh-networks.net, 1
fresh.co.il, 1
freshcode.nl, 1
@ -9146,7 +9129,6 @@ frickelboxx.de, 1
frickelmeister.de, 1
frickenate.com, 1
fridaperfumaria.com.br, 1
fridolinka.cz, 1
friedhelm-wolf.de, 1
friedrich-foto-art.de, 1
friedsamphotography.com, 1
@ -9177,7 +9159,6 @@ froh.co.jp, 0
frokenblomma.se, 1
frolov.net, 1
frolova.org, 1
fromix.de, 1
fromlemaytoz.com, 1
fromscratch.rocks, 1
fromthesoutherncross.com, 1
@ -9344,7 +9325,6 @@ g2soft.net, 1
g3dev.ch, 1
g3rv4.com, 1
g4w.co, 1
g77.ca, 1
gaasuper6.com, 1
gabemack.com, 1
gabriel.to, 1
@ -9406,6 +9386,7 @@ gameisbest.jp, 1
gamekeysuche.de, 1
gamenerd.net, 1
gameofbay.org, 1
gameofpwnz.com, 1
gamepad.com.br, 1
gameparagon.info, 1
gamercredo.com, 1
@ -9692,7 +9673,6 @@ getwpd.com, 0
getyeflask.com, 1
getyou.onl, 1
getyourphix.tk, 1
gevaulug.fr, 1
geyduschek.be, 1
gfast.ru, 1
gfhgiro.nl, 0
@ -9717,7 +9697,6 @@ gha.st, 1
ghaglund.se, 1
ghcif.de, 1
ghislainphu.fr, 1
ghkim.net, 1
ghostblog.info, 1
ghostwritershigh.com, 1
ghrelinblocker.info, 1
@ -10130,6 +10109,7 @@ grettogeek.com, 1
greuel.online, 1
greve.xyz, 1
grey.house, 1
greybit.net, 1
greyhash.se, 1
greyskymedia.com, 1
greysolutions.it, 1
@ -10268,6 +10248,7 @@ gunwatch.co.uk, 1
guphi.net, 0
gurkan.in, 1
gurmel.ru, 1
gurochan.ch, 1
guru-naradi.cz, 1
gurueffect.com, 1
gus.host, 1
@ -10674,8 +10655,6 @@ helles-koepfchen.de, 1
helloacm.com, 1
helloanselm.com, 1
hellofilters.com, 1
hellomouse.cf, 1
hellomouse.tk, 1
hellotandem.com, 1
hellothought.net, 1
hellscanyonraft.com, 1
@ -10830,7 +10809,6 @@ highlevelwoodlands.com, 1
highlnk.com, 1
highspeed-arnsberg.de, 1
hightechbasementsystems.com, 1
hightower.eu, 1
highwaytohoell.de, 1
higilopocht.li, 1
higp.de, 1
@ -11219,6 +11197,7 @@ hump.dk, 1
humpen.se, 1
hund.io, 1
hundeformel.de, 1
hundter.com, 1
hunter.io, 1
huntingdonlifesciences.com, 1
huntshomeinspections.com, 1
@ -11408,7 +11387,6 @@ idexxpublicationportal.com, 1
idgard.de, 1
idhosts.co.id, 1
idid.tk, 1
idinby.dk, 1
idiopolis.org, 1
idiotentruppe.de, 1
idmanagement.gov, 1
@ -11734,7 +11712,6 @@ inishbofin.ie, 1
initq.net, 1
initramfs.io, 1
initrd.net, 1
injust.eu.org, 1
ink.horse, 1
inkbunny.net, 0
inkhor.se, 1
@ -11874,6 +11851,7 @@ interseller.io, 1
intertime.services, 1
interview-suite.com, 1
interviewpipeline.co.uk, 1
interways.de, 1
intexplore.org, 1
intheater.de, 1
inthepicture.com, 1
@ -11892,6 +11870,7 @@ intramanager.dk, 1
intranetsec-regionra.fr, 1
intraobes.com, 1
intrasoft.com.au, 1
intune.life, 1
intux.be, 0
intvonline.com, 1
intxt.net, 1
@ -12522,7 +12501,6 @@ jialinwu.com, 0
jianjia.io, 0
jiaqiang.vip, 1
jichi.io, 1
jichi.me, 1
jie.dance, 1
jief.me, 1
jigsawdevelopments.com, 1
@ -12533,7 +12511,6 @@ jimmyroura.ch, 1
jimshaver.net, 1
jinancy.fr, 1
jinbo123.com, 0
jinbowiki.org, 1
jing.su, 1
jingjo.com.au, 1
jinja.ai, 1
@ -13196,7 +13173,7 @@ keyihao.cn, 1
keyinfo.io, 1
keypersonins.com, 1
keys.fedoraproject.org, 1
keyserver.sexy, 1
keyserver.sexy, 0
keystoneok.com, 1
keysupport.org, 1
kf7joz.com, 1
@ -13232,6 +13209,7 @@ kiddyboom.ua, 1
kids-at-home.ch, 1
kidsforsavingearth.org, 1
kidsinwoods-interfacesouth.org, 1
kidsmark.net, 1
kidsneversleep.com, 1
kidtoyshop.ru, 1
kiebel.de, 1
@ -13457,6 +13435,7 @@ kodakit.com, 1
kodden.com.br, 1
kode.ch, 1
koebbes.de, 1
koelbli.ch, 1
koelnmafia.de, 1
koenigsbrunner-tafel.de, 1
koerper-wie-seele.de, 0
@ -13963,7 +13942,6 @@ lavoieducoeur.be, 1
lavolte.net, 1
lavval.com, 1
law-peters.de, 1
lawformt.com, 1
lawn-seeds.com, 1
lawnuk.com, 1
lawrence-institute.com, 1
@ -13986,7 +13964,6 @@ lbgconsultores.com, 1
lbihrhelpdesk.com, 1
lbs-logics.com, 1
lca-pv.de, 1
lcht.ch, 1
lcti.biz, 1
ld-begunjscica.si, 1
ldc.com.br, 0
@ -14036,7 +14013,6 @@ leavesofchangeweekly.org, 1
lebal.se, 1
lebanesearmy.gov.lb, 1
lebarmy.gov.lb, 1
lebens-fluss.at, 1
lebihan.pl, 1
leblanc.io, 1
lebosse.me, 1
@ -14194,7 +14170,6 @@ letsgowhilewereyoung.com, 1
letstalkcounseling.com, 1
letterbox-online.de, 1
letterdance.de, 1
letteringinstitute.com, 1
lettersblogatory.com, 1
lettland-firma.com, 1
lettori.club, 1
@ -14242,12 +14217,6 @@ lheinrich.de, 1
lheinrich.org, 1
li-ke.co.jp, 1
liangji.com.tw, 0
lianye1.cc, 1
lianye2.cc, 1
lianye3.cc, 1
lianye4.cc, 1
lianye5.cc, 1
lianye6.cc, 1
liaozheqi.cn, 1
liaronce.win, 1
liautard.fr, 1
@ -14294,7 +14263,6 @@ lidong.me, 1
lidow.eu, 1
liduan.com, 1
liduan.net, 1
liebach.me, 1
liebel.org, 1
liebestarot.at, 1
lied8.eu, 1
@ -14429,7 +14397,6 @@ lirlandais.ch, 1
lirnberger.com, 1
lisamccorrie.com, 1
lisamortimore.com, 1
lisgade.dk, 1
lisieuxarquitetura.com.br, 1
liskgdt.net, 1
lislan.org.uk, 1
@ -14591,7 +14558,6 @@ login.sapo.pt, 1
login.ubuntu.com, 1
login.xero.com, 0
login.yahoo.com, 0
logistify.com.mx, 1
logitel.de, 1
logopaediereinhard.de, 1
logopedistalanni.it, 1
@ -15299,7 +15265,6 @@ masa-hou.com, 1
mascosolutions.com, 1
maservant.net, 1
mashek.net, 1
mashnew.com, 1
masiniunelte.store.ro, 1
masiul.is, 1
maskinkultur.com, 1
@ -15465,7 +15430,6 @@ mbinformatik.de, 0
mblankhorst.nl, 1
mbp.banking.co.at, 0
mbr-net.de, 1
mbrooks.info, 1
mbs-journey.com, 1
mbsec.net, 1
mbweir.com, 1
@ -15501,7 +15465,6 @@ mckinley.school, 1
mckinley1.com, 1
mckinleytk.com, 1
mcl.gg, 1
mclyr.com, 1
mcmillansedationdentistry.com, 1
mcmillanskiclub.com.au, 1
mcneill.io, 1
@ -16313,7 +16276,6 @@ morphy2k.io, 1
morteruelo.net, 1
mortis.eu, 1
mosaic-design.ru, 1
mosaique-lachenaie.fr, 1
moscow.dating, 1
mosfet.cz, 1
mosin.org, 1
@ -16377,7 +16339,6 @@ mpc-hc.org, 1
mpcompliance.com, 1
mpe.org, 1
mpetroff.net, 1
mpg-universal.com, 1
mpg.ovh, 1
mpi-sa.fr, 1
mpintaamalabanna.it, 1
@ -16591,7 +16552,6 @@ my-floor.com, 1
my-host.ovh, 1
my-hps.de, 1
my-ip.work, 1
my-pawnshop.com.ua, 0
my-plancha.ch, 1
my-static-demo-808795.c.cdn77.org, 1
my-static-live-808795.c.cdn77.org, 1
@ -16810,7 +16770,6 @@ naganithin.me, 1
nagaragem.com.br, 1
nagaya.biz, 1
nagb.gov, 1
nagb.org, 1
nagel-dentaltechnik.de, 1
nagelfam.com, 1
naggie.net, 1
@ -16835,7 +16794,6 @@ nalukfitness.com.br, 1
namegrep.com, 1
nameid.org, 1
namepros.com, 1
namereel.com, 1
nametiles.co, 1
namikawatetsuji.jp, 1
naminam.de, 1
@ -17391,6 +17349,7 @@ ninaundandre.de, 1
ninchat.com, 1
nine-hells.net, 0
ninebennink.com, 1
ninespec.com, 1
ninetaillabs.com, 1
ninetaillabs.xyz, 1
ning.so, 1
@ -17477,7 +17436,6 @@ nohttps.org, 1
nohup.se, 1
nohup.xyz, 1
noincludesubdomains.preloaded.test, 0
noisebridge.social, 1
noisetrap.cz, 1
noisky.cn, 1
noisyfox.cn, 1
@ -18193,7 +18151,6 @@ oszri.hu, 1
otako.pl, 1
otakubox.de, 1
otakurepublic.com, 1
otchecker.com, 1
otellio.com, 1
otellio.de, 1
otellio.it, 1
@ -18234,6 +18191,7 @@ outpostinfo.com, 1
outsideconnections.com, 1
over25tips.com, 1
overalglas.nl, 1
overclockers.ge, 1
overkillshop.com, 1
overseamusic.de, 1
oversight.garden, 1
@ -18259,7 +18217,6 @@ ownmay.com, 1
ownspec.com, 1
oxanababy.com, 1
oxelie.com, 1
oxro.co, 1
oxygaming.com, 1
oxymc.com, 1
oxynux.xyz, 1
@ -18387,7 +18344,6 @@ panthur.com.au, 0
pantou.org, 0
panzer72.ru, 1
pap.la, 0
papa-webzeit.de, 1
papadopoulos.me, 1
papakatsu-life.com, 1
papatest24.de, 1
@ -18545,7 +18501,6 @@ pauladamsmith.com, 1
paulbakaus.com, 1
paulbdelaat.nl, 1
paulbramhall.uk, 1
paulchen.at, 1
pauldcox.com, 1
paulerhof.com, 1
paulewen.ca, 1
@ -18612,7 +18567,6 @@ pbxapi.com, 1
pbytes.com, 1
pc-rescue.me, 1
pc-tweak.de, 1
pcat.io, 1
pccentral.nl, 1
pcel.com, 1
pcf92.fr, 1
@ -18648,6 +18602,7 @@ pedrosluiter.nl, 1
pedroventura.com, 0
peeekaaabooo.com, 1
peekier.com, 1
peekops.com, 1
peep.gq, 1
peercraft.at, 1
peercraft.be, 1
@ -18670,6 +18625,7 @@ peercraft.pl, 1
peercraft.pt, 1
peercraft.se, 1
peercraft.us, 1
peerless.ae, 1
peername.com, 1
peervpn.net, 1
peeters.io, 1
@ -19155,7 +19111,6 @@ ploofer.com, 1
plot.ly, 1
ploxel.com, 1
plr4wp.com, 1
plsboop.me, 1
pluga.co, 1
plugboard.xyz, 1
plugcubed.net, 0
@ -19554,7 +19509,6 @@ productgap.com, 1
productived.net, 1
proefteksten.nl, 0
prof.ch, 1
profection.biz, 1
professionalboundaries.com, 1
professors.ee, 1
profidea.cz, 1
@ -19962,6 +19916,7 @@ r0uzic.net, 1
r2d2pc.com, 1
r3nt3r.com, 1
r3s1stanc3.me, 1
r40.us, 1
r6-team.ru, 1
r7h.at, 1
r811.de, 1
@ -20174,6 +20129,9 @@ reality0ne.com, 1
reallifeforums.com, 1
realloc.me, 1
really-simple-ssl.com, 1
really.ai, 1
really.io, 1
reallyreally.io, 1
realmofespionage.xyz, 1
realwaycome.com, 1
realwildart.com, 1
@ -20352,6 +20310,7 @@ remaimodern.org, 1
remambo.jp, 1
remedioparaherpes.com, 1
remedioscaserosparalacistitis.com, 1
remedioskaseros.com, 0
remedyrehab.com, 1
rememberthemilk.com, 0
remonti.info, 1
@ -20443,7 +20402,6 @@ restaurantesimonetti.com.br, 1
restaurantmangal.ch, 1
rester-a-domicile.ch, 1
rester-autonome-chez-soi.ch, 1
restioson.me, 1
restoran-radovce.me, 1
restoreresearchstudy.com, 1
restoruns.com, 1
@ -20627,8 +20585,8 @@ rmmanfredi.com, 1
rmpsolution.de, 1
rms.sexy, 1
rmsides.com, 1
rmstudio.tw, 1
rnag.ie, 1
rnb-storenbau.ch, 1
rnt.cl, 1
ro.search.yahoo.com, 0
roadguard.nl, 1
@ -20728,12 +20686,10 @@ rokki.ch, 1
rokort.dk, 1
rokudenashi.de, 1
roland.io, 1
rolandkolodziej.com, 1
rolandslate.com, 1
rolandszabo.com, 1
rolliwelt.de, 1
rolodato.com, 1
romaimperator.com, 1
romainmuller.xyz, 1
roman-pavlik.cz, 1
romanpavlodar.kz, 1
@ -21112,7 +21068,6 @@ saltercane.com, 0
saltro.nl, 1
saltstack.cz, 1
salud.top, 0
saludsexualmasculina.org, 1
saludsis.mil.co, 1
salutethepig.com, 1
salverainha.org, 1
@ -21398,14 +21353,12 @@ schrodingersscat.com, 1
schrodingersscat.org, 1
schroeder-immobilien-sundern.de, 1
schroepfglas-versand.de, 1
schrolm.de, 1
schsrch.org, 1
schsrch.xyz, 1
schtiehve.duckdns.org, 1
schubergphilis.com, 1
schubertgmbh-ingelheim.de, 1
schuhbeck.tk, 1
schuhwerkstatt.at, 1
schul-bar.de, 1
schulderinsky.de, 1
schuler.st, 1
@ -21449,7 +21402,6 @@ scopea.fr, 1
score-savers.com, 1
scorobudem.ru, 1
scorocode.ru, 1
scottainslie.me.uk, 1
scottgruber.me, 1
scottgthomas.com, 1
scotthel.me, 1
@ -21529,7 +21481,6 @@ seatshare.co.uk, 1
seattle-life.net, 1
seattlefabrication.com, 1
seattlemesh.net, 1
seattleprivacy.org, 1
seattlewalkinbathtubs.com, 1
seb-mgl.de, 1
sebastian-janich.de, 1
@ -21537,6 +21488,7 @@ sebastian-kraus.me, 1
sebastian-lutsch.de, 1
sebastian-schmidt.me, 1
sebastian.expert, 1
sebastianblade.com, 1
sebastianboegl.de, 1
sebastiensenechal.com, 1
sebi.org, 1
@ -21734,6 +21686,7 @@ sep23.ru, 1
sephr.com, 1
sepie.gob.es, 1
seppelec.com, 1
seproco.com, 1
septakkordeon.de, 1
septillion.cn, 1
septs.pw, 1
@ -21944,7 +21897,6 @@ shichibukai.net, 1
shieldofachilles.in, 1
shift-to.co.jp, 1
shiftdevices.com, 1
shiftj.is, 1
shiftleft.org, 1
shiftnrg.org, 1
shijing.me, 1
@ -22012,6 +21964,7 @@ shopsouthafrican.com, 1
shoptec.sk, 1
shorebreaksecurity.com, 1
shortdiary.me, 1
shorten.ninja, 1
shortpath.com, 1
shortr.li, 1
shoshin-aikido.de, 1
@ -22222,6 +22175,7 @@ simpte.com, 1
simpul.nl, 1
sims4hub.ga, 1
simsnieuws.nl, 1
simtin-net.de, 1
simukti.net, 1
simumiehet.com, 1
simus.fr, 1
@ -22497,7 +22451,6 @@ smipty.com, 1
smit.com.ua, 1
smith.is, 0
smithandcanova.co.uk, 1
smittix.co.uk, 1
smkw.com, 0
sml.lc, 1
smm.im, 1
@ -22674,6 +22627,7 @@ solvemethod.com, 1
solvops.com, 1
solymar.co, 1
somaini.li, 1
somali-derp.com, 1
somaliagenda.com, 1
somanao.com, 1
somcase.com.br, 1
@ -22774,6 +22728,7 @@ souvik.me, 1
soved.eu, 1
sowingseasons.com, 1
sowncloud.de, 1
soz6.com, 1
sozialy.com, 1
sozon.ca, 1
sp.com.pl, 1
@ -22870,7 +22825,6 @@ splitdna.com, 1
splitreflection.com, 1
spodelime.com, 1
spoketwist.com, 1
spolwind.de, 1
spom.net, 1
sponc.de, 1
spongepowered.org, 1
@ -23311,10 +23265,8 @@ stuco.co, 1
studenckiemetody.pl, 1
student-eshop.cz, 1
student-eshop.sk, 1
student.andover.edu, 1
studentforums.biz, 1
studentite.bg, 0
studentloans.gov, 1
studentrightsadvocate.org, 1
studentshare.net, 1
studenttenant.com, 1
@ -24341,6 +24293,7 @@ thesignalco.com.au, 1
thesishelp.net, 1
thesled.net, 1
thesocialmediacentral.com, 1
thesteins.org, 1
thestory.ie, 1
thestoryshack.com, 1
thestrategyagency.com.au, 1
@ -24420,6 +24373,7 @@ thomsonscleaning.co.uk, 1
thomspooren.nl, 1
thomwiggers.nl, 1
thor.edu, 1
thorbis.com, 1
thorbiswebsitedesign.com, 1
thorsten-schaefer.com, 1
thorstenschaefer.name, 1
@ -24582,7 +24536,6 @@ tjl.rocks, 1
tjp.ch, 1
tjs.me, 1
tkacz.pro, 1
tkarstens.de, 0
tkat.ch, 1
tkgpm.com, 1
tkjg.fi, 1
@ -25021,7 +24974,6 @@ travisfranck.com, 1
travler.net, 1
travotion.com, 1
trbanka.com, 1
treasuredinheritanceministry.com, 1
treasurydirect.gov, 1
treasuryhunt.gov, 1
treasuryscams.gov, 1
@ -25146,7 +25098,6 @@ tsedryk.ca, 1
tsgbit.net, 1
tsicons.com, 1
tsigaradiko.com, 1
tsironis-olivenoel.de, 1
tsng-stg.tk, 1
tsng.co.jp, 1
tstrubberstamp.com, 1
@ -25295,8 +25246,10 @@ tyil.nl, 1
tyil.work, 1
tykoon.com, 1
tyl.io, 1
tyler.rs, 1
tylerdavies.net, 1
tylerfreedman.com, 1
tyleromeara.com, 1
tylerschmidtke.com, 1
type1joe.com, 1
type1joe.net, 1
@ -25355,7 +25308,6 @@ uchargeapp.com, 1
uclanmasterplan.co.uk, 1
ucrdatatool.gov, 1
uctarna.online, 1
udbhav.me, 1
udo-luetkemeier.de, 1
udomain.net, 1
udp.sh, 0
@ -25435,6 +25387,7 @@ undercovercondoms.co.uk, 1
undercovercondoms.com, 1
underlined.fr, 1
undernet.uy, 0
underskatten.tk, 1
undo.co.il, 1
undone.me, 1
unearaigneeauplafond.fr, 0
@ -25584,7 +25537,6 @@ urbanietz-immobilien.de, 1
urbanmelbourne.info, 1
urbannewsservice.com, 1
urbansparrow.in, 1
urbanstylestaging.com, 1
urbanwildlifealliance.org, 1
urbexdk.nl, 1
urcentral.com, 1
@ -26088,6 +26040,7 @@ vk4wip.org.au, 1
vkirichenko.name, 1
vkox.com, 1
vksportphoto.com, 1
vladimiroff.org, 1
vladislavstoyanov.com, 1
vldkn.net, 1
vleij.com, 1
@ -26125,7 +26078,6 @@ voidpay.com, 1
voidpay.net, 1
voidpay.org, 1
voidptr.eu, 1
voidserv.net, 1
voidshift.com, 1
voipsun.com, 1
vokativy.cz, 0
@ -26155,10 +26107,9 @@ vorkbaard.nl, 1
vorlicek.de, 1
vorlif.org, 1
vorm2.com, 1
vorodevops.com, 1
vos-fleurs.ch, 1
vos-fleurs.com, 1
voshod.org, 0
voshod.org, 1
vosky.fr, 1
vostronet.com, 1
voter-info.uk, 1
@ -26311,6 +26262,8 @@ warlions.info, 0
warmestwishes.ca, 1
warmlyyours.com, 0
warmservers.com, 1
warp-radio.com, 1
warp-radio.tv, 1
warr.ath.cx, 1
warschild.org, 1
wartorngalaxy.com, 1
@ -26547,7 +26500,6 @@ wellensteyn.ru, 1
weller.pm, 1
wellies.com.au, 1
wellness-gutschein.de, 1
wellness.so, 1
wellopp.com, 1
wellproducedwines.com, 1
wellsolveit.com, 1
@ -26832,7 +26784,6 @@ wintermeyer-consulting.de, 1
wintermeyer.de, 1
winterschoen.nl, 1
wintodoor.com, 1
wipc.net, 1
wipply.com, 0
wir-bewegen.sh, 1
wirbatz.org, 1
@ -26973,7 +26924,6 @@ worldofterra.net, 1
worldofvnc.net, 1
worldpovertysolutions.org, 1
worldsgreatestazuredemo.com, 1
worldsoccerclips.com, 1
worldstone777.com, 1
wormdisk.net, 1
wormholevpn.net, 1
@ -27795,7 +27745,6 @@ zeitzer-turngala.de, 1
zekinteractive.com, 1
zelezny.uk, 0
zelfrijdendeautos.com, 1
zellari.ru, 1
zeloz.xyz, 1
zemlova.cz, 1
zen-diez.de, 1
@ -27808,9 +27757,6 @@ zenmate.com.tr, 1
zeno-system.com, 1
zenofa.co.id, 1
zentask.io, 1
zentience.dk, 1
zentience.net, 1
zentience.org, 1
zenvideocloud.com, 1
zenycosta.com, 1
zepect.com, 1
@ -27858,6 +27804,7 @@ zhaoxixiangban.cc, 1
zhen-chen.com, 1
zhengjie.com, 1
zhikin.com, 1
zhiku8.com, 1
zhovner.com, 1
zhuji.com, 1
zhujicaihong.com, 1
@ -27913,7 +27860,6 @@ zokster.net, 1
zolokar.xyz, 1
zombiesecured.com, 1
zomerschoen.nl, 1
zone-produkte.de, 1
zone39.com, 1
zonecb.com, 1
zonemaster.fr, 1

4
security/manager/ssl/tests/gtest/DataStorageTest.cpp
Просмотреть файл

@ -130,7 +130,7 @@ TEST_F(psm_DataStorageTest, InputValidation)
EXPECT_EQ(NS_OK, storage->Put(longKey, testValue, DataStorage_Persistent));
result = storage->Get(longKey, DataStorage_Persistent);
EXPECT_STREQ("value", result.get());
longKey.Append("a");
longKey.AppendLiteral("a");
// A key longer than that will not work
EXPECT_EQ(NS_ERROR_INVALID_ARG,
storage->Put(longKey, testValue, DataStorage_Persistent));
@ -145,7 +145,7 @@ TEST_F(psm_DataStorageTest, InputValidation)
EXPECT_EQ(NS_OK, storage->Put(testKey, longValue, DataStorage_Persistent));
result = storage->Get(testKey, DataStorage_Persistent);
EXPECT_STREQ(longValue.get(), result.get());
longValue.Append("a");
longValue.AppendLiteral("a");
// A value longer than that will not work
storage->Remove(testKey, DataStorage_Persistent);
EXPECT_EQ(NS_ERROR_INVALID_ARG,

4
storage/mozStorageConnection.cpp
Просмотреть файл

@ -1485,8 +1485,8 @@ Connection::initializeClone(Connection* aClone, bool aReadOnly)
while (stmt && NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult) {
nsAutoCString name;
rv = stmt->GetUTF8String(1, name);
if (NS_SUCCEEDED(rv) && !name.Equals(NS_LITERAL_CSTRING("main")) &&
!name.Equals(NS_LITERAL_CSTRING("temp"))) {
if (NS_SUCCEEDED(rv) && !name.EqualsLiteral("main") &&
!name.EqualsLiteral("temp")) {
nsCString path;
rv = stmt->GetUTF8String(2, path);
if (NS_SUCCEEDED(rv) && !path.IsEmpty()) {

2
toolkit/components/downloads/ApplicationReputation.cpp
Просмотреть файл

@ -1073,7 +1073,7 @@ PendingLookup::GetStrippedSpec(nsIURI* aUri, nsACString& escaped)
rv = url->GetHostPort(temp);
NS_ENSURE_SUCCESS(rv, rv);
escaped.Append("://");
escaped.AppendLiteral("://");
escaped.Append(temp);
rv = url->GetFilePath(temp);

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше