author | Chris Peterson <cpeterson@mozilla.com> |
Wed, 20 Jul 2016 22:03:25 -0700 | |
changeset 306041 | 282f7afd67657dda8e2e8568e5ac6f609311a03b |
parent 306040 | 6e99af8e9fa468fb6d99e315a6dabc7c72822ad9 |
child 306042 | 4e02a5ff49f20286544b1a721b6b37b9e678acb0 |
push id | 30474 |
push user | cbook@mozilla.com |
push date | Thu, 21 Jul 2016 14:25:10 +0000 |
treeherder | mozilla-central@6b180266ac16 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | Waldo |
bugs | 1277106 |
milestone | 50.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -2756,46 +2756,46 @@ KeyBinding::ToPlatformFormat(nsAString& stringBundleService->CreateBundle( "chrome://global-platform/locale/platformKeys.properties", getter_AddRefs(keyStringBundle)); if (!keyStringBundle) return; nsAutoString separator; - keyStringBundle->GetStringFromName(MOZ_UTF16("MODIFIER_SEPARATOR"), + keyStringBundle->GetStringFromName(u"MODIFIER_SEPARATOR", getter_Copies(separator)); nsAutoString modifierName; if (mModifierMask & kControl) { - keyStringBundle->GetStringFromName(MOZ_UTF16("VK_CONTROL"), + keyStringBundle->GetStringFromName(u"VK_CONTROL", getter_Copies(modifierName)); aValue.Append(modifierName); aValue.Append(separator); } if (mModifierMask & kAlt) { - keyStringBundle->GetStringFromName(MOZ_UTF16("VK_ALT"), + keyStringBundle->GetStringFromName(u"VK_ALT", getter_Copies(modifierName)); aValue.Append(modifierName); aValue.Append(separator); } if (mModifierMask & kShift) { - keyStringBundle->GetStringFromName(MOZ_UTF16("VK_SHIFT"), + keyStringBundle->GetStringFromName(u"VK_SHIFT", getter_Copies(modifierName)); aValue.Append(modifierName); aValue.Append(separator); } if (mModifierMask & kMeta) { - keyStringBundle->GetStringFromName(MOZ_UTF16("VK_META"), + keyStringBundle->GetStringFromName(u"VK_META", getter_Copies(modifierName)); aValue.Append(modifierName); aValue.Append(separator); } aValue.Append(mKey); }
--- a/accessible/generic/ApplicationAccessible.cpp +++ b/accessible/generic/ApplicationAccessible.cpp @@ -49,17 +49,17 @@ ApplicationAccessible::Name(nsString& aN nsCOMPtr<nsIStringBundle> bundle; nsresult rv = bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(bundle)); if (NS_FAILED(rv)) return eNameOK; nsXPIDLString appName; - rv = bundle->GetStringFromName(MOZ_UTF16("brandShortName"), + rv = bundle->GetStringFromName(u"brandShortName", getter_Copies(appName)); if (NS_FAILED(rv) || appName.IsEmpty()) { NS_WARNING("brandShortName not found, using default app name"); appName.AssignLiteral("Gecko based application"); } aName.Assign(appName); return eNameOK;
--- a/browser/components/shell/nsGNOMEShellService.cpp +++ b/browser/components/shell/nsGNOMEShellService.cpp @@ -279,17 +279,17 @@ nsGNOMEShellService::SetDefaultBrowser(b do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIStringBundle> brandBundle; rv = bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle)); NS_ENSURE_SUCCESS(rv, rv); nsString brandShortName; - brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"), + brandBundle->GetStringFromName(u"brandShortName", getter_Copies(brandShortName)); // use brandShortName as the application id. NS_ConvertUTF16toUTF8 id(brandShortName); nsCOMPtr<nsIGIOMimeApp> appInfo; rv = giovfs->CreateAppFromCommand(mAppPath, id, getter_AddRefs(appInfo)); @@ -397,17 +397,17 @@ nsGNOMEShellService::SetDesktopBackgroun nsString brandName; nsCID bundleCID = NS_STRINGBUNDLESERVICE_CID; nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(bundleCID)); if (bundleService) { nsCOMPtr<nsIStringBundle> brandBundle; rv = bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle)); if (NS_SUCCEEDED(rv) && brandBundle) { - rv = brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"), + rv = brandBundle->GetStringFromName(u"brandShortName", getter_Copies(brandName)); NS_ENSURE_SUCCESS(rv, rv); } } // build the file name filePath.Append('/'); filePath.Append(NS_ConvertUTF16toUTF8(brandName));
--- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -989,17 +989,17 @@ nsWindowsShellService::SetDesktopBackgro nsCOMPtr<nsIStringBundle> shellBundle; rv = bundleService->CreateBundle(SHELLSERVICE_PROPERTIES, getter_AddRefs(shellBundle)); NS_ENSURE_SUCCESS(rv, rv); // e.g. "Desktop Background.bmp" nsString fileLeafName; rv = shellBundle->GetStringFromName - (MOZ_UTF16("desktopBackgroundLeafNameWin"), + (u"desktopBackgroundLeafNameWin", getter_Copies(fileLeafName)); NS_ENSURE_SUCCESS(rv, rv); // get the profile root directory nsCOMPtr<nsIFile> file; rv = NS_GetSpecialDirectory(NS_APP_APPLICATION_REGISTRY_DIR, getter_AddRefs(file)); NS_ENSURE_SUCCESS(rv, rv);
--- a/caps/nsScriptSecurityManager.cpp +++ b/caps/nsScriptSecurityManager.cpp @@ -1009,17 +1009,17 @@ nsScriptSecurityManager::CheckLoadURIFla nsIProtocolHandler::URI_LOADABLE_BY_SUBSUMERS, &hasSubsumersFlag); NS_ENSURE_SUCCESS(rv, rv); if (!hasFlags && !hasSubsumersFlag) { nsXPIDLString message; NS_ConvertASCIItoUTF16 ucsTargetScheme(targetScheme); const char16_t* formatStrings[] = { ucsTargetScheme.get() }; rv = sStrBundle-> - FormatStringFromName(MOZ_UTF16("ProtocolFlagError"), + FormatStringFromName(u"ProtocolFlagError", formatStrings, ArrayLength(formatStrings), getter_Copies(message)); if (NS_SUCCEEDED(rv)) { nsCOMPtr<nsIConsoleService> console( do_GetService("@mozilla.org/consoleservice;1")); NS_ENSURE_TRUE(console, NS_ERROR_FAILURE);
--- a/devtools/shared/heapsnapshot/DeserializedNode.cpp +++ b/devtools/shared/heapsnapshot/DeserializedNode.cpp @@ -54,17 +54,17 @@ DeserializedStackFrame::getParentStackFr } // namespace mozilla namespace JS { namespace ubi { using mozilla::devtools::DeserializedEdge; const char16_t Concrete<DeserializedNode>::concreteTypeName[] = - MOZ_UTF16("mozilla::devtools::DeserializedNode"); + u"mozilla::devtools::DeserializedNode"; const char16_t* Concrete<DeserializedNode>::typeName() const { return get().typeName; } Node::Size
--- a/devtools/shared/heapsnapshot/HeapSnapshot.cpp +++ b/devtools/shared/heapsnapshot/HeapSnapshot.cpp @@ -730,17 +730,17 @@ PopulateCompartmentsWithGlobals(Compartm // Add the given set of globals as explicit roots in the given roots // list. Returns false on OOM failure. static bool AddGlobalsAsRoots(AutoObjectVector& globals, ubi::RootList& roots) { unsigned length = globals.length(); for (unsigned i = 0; i < length; i++) { if (!roots.addRoot(ubi::Node(globals[i].get()), - MOZ_UTF16("heap snapshot global"))) + u"heap snapshot global")) { return false; } } return true; } // Choose roots and limits for a traversal, given `boundaries`. Set `roots` to
--- a/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp +++ b/devtools/shared/heapsnapshot/tests/gtest/DeserializedNodeUbiNodes.cpp @@ -32,17 +32,17 @@ struct MockDeserializedNode : public Des size_t fakeMallocSizeOf(const void*) { EXPECT_TRUE(false); MOZ_ASSERT_UNREACHABLE("fakeMallocSizeOf should never be called because " "DeserializedNodes report the deserialized size."); return 0; } DEF_TEST(DeserializedNodeUbiNodes, { - const char16_t* typeName = MOZ_UTF16("TestTypeName"); + const char16_t* typeName = u"TestTypeName"; const char* className = "MyObjectClassName"; const char* filename = "my-cool-filename.js"; NodeId id = uint64_t(1) << 33; uint64_t size = uint64_t(1) << 60; MockDeserializedNode mocked(id, typeName, size); mocked.coarseType = JS::ubi::CoarseType::Script; mocked.jsObjectClassName = className;
--- a/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp +++ b/devtools/shared/heapsnapshot/tests/gtest/DeserializedStackFrameUbiStackFrames.cpp @@ -19,18 +19,18 @@ struct MockDeserializedStackFrame : publ { MockDeserializedStackFrame() : DeserializedStackFrame() { } }; DEF_TEST(DeserializedStackFrameUbiStackFrames, { StackFrameId id = uint64_t(1) << 42; uint32_t line = 1337; uint32_t column = 9; // 3 space tabs!? - const char16_t* source = MOZ_UTF16("my-javascript-file.js"); - const char16_t* functionDisplayName = MOZ_UTF16("myFunctionName"); + const char16_t* source = u"my-javascript-file.js"; + const char16_t* functionDisplayName = u"myFunctionName"; MockDeserializedStackFrame mocked; mocked.id = id; mocked.line = line; mocked.column = column; mocked.source = source; mocked.functionDisplayName = functionDisplayName;
--- a/devtools/shared/heapsnapshot/tests/gtest/DevTools.h +++ b/devtools/shared/heapsnapshot/tests/gtest/DevTools.h @@ -180,17 +180,17 @@ protected: public: static const char16_t concreteTypeName[]; static void construct(void* storage, FakeNode* ptr) { new (storage) Concrete(ptr); } }; -const char16_t Concrete<FakeNode>::concreteTypeName[] = MOZ_UTF16("FakeNode"); +const char16_t Concrete<FakeNode>::concreteTypeName[] = u"FakeNode"; } // namespace ubi } // namespace JS void AddEdge(FakeNode& node, FakeNode& referent, const char16_t* edgeName = nullptr) { char16_t* ownedEdgeName = nullptr; if (edgeName) { ownedEdgeName = NS_strdup(edgeName);
--- a/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp +++ b/devtools/shared/heapsnapshot/tests/gtest/SerializesEdgeNames.cpp @@ -11,18 +11,18 @@ using testing::Field; using testing::IsNull; using testing::Property; using testing::Return; DEF_TEST(SerializesEdgeNames, { FakeNode node; FakeNode referent; - const char16_t edgeName[] = MOZ_UTF16("edge name"); - const char16_t emptyStr[] = MOZ_UTF16(""); + const char16_t edgeName[] = u"edge name"; + const char16_t emptyStr[] = u""; AddEdge(node, referent, edgeName); AddEdge(node, referent, emptyStr); AddEdge(node, referent, nullptr); ::testing::NiceMock<MockWriter> writer; // Should get the node with edges once.
--- a/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp +++ b/devtools/shared/heapsnapshot/tests/gtest/SerializesTypeNames.cpp @@ -10,17 +10,17 @@ using testing::Property; using testing::Return; DEF_TEST(SerializesTypeNames, { FakeNode node; ::testing::NiceMock<MockWriter> writer; EXPECT_CALL(writer, writeNode(Property(&JS::ubi::Node::typeName, - UTF16StrEq(MOZ_UTF16("FakeNode"))), + UTF16StrEq(u"FakeNode")), _)) .Times(1) .WillOnce(Return(true)); JS::AutoCheckCannotGC noGC(rt); ASSERT_TRUE(WriteHeapGraph(cx, JS::ubi::Node(&node), writer,
--- a/docshell/base/nsDSURIContentListener.cpp +++ b/docshell/base/nsDSURIContentListener.cpp @@ -443,17 +443,17 @@ nsDSURIContentListener::CheckFrameOption while (tokenizer.hasMoreTokens()) { const nsSubstring& tok = tokenizer.nextToken(); if (!CheckOneFrameOptionsPolicy(httpChannel, tok)) { // cancel the load and display about:blank httpChannel->Cancel(NS_BINDING_ABORTED); if (mDocShell) { nsCOMPtr<nsIWebNavigation> webNav(do_QueryObject(mDocShell)); if (webNav) { - webNav->LoadURI(MOZ_UTF16("about:blank"), + webNav->LoadURI(u"about:blank", 0, nullptr, nullptr, nullptr); } } return false; } } return true;
--- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5068,17 +5068,17 @@ nsDocShell::DisplayLoadError(nsresult aE nsCOMPtr<Element> element = do_QueryInterface(handler); element->GetAttribute(NS_LITERAL_STRING("crashedPageTitle"), messageStr); } // DisplayLoadError requires a non-empty messageStr to proceed and call // LoadErrorPage. If the page doesn't have a title, we will use a blank // space which will be trimmed and thus treated as empty by the front-end. if (messageStr.IsEmpty()) { - messageStr.AssignLiteral(MOZ_UTF16(" ")); + messageStr.AssignLiteral(u" "); } } else { // Errors requiring simple formatting switch (aError) { case NS_ERROR_MALFORMED_URI: // URI is malformed error.AssignLiteral("malformedURI"); break; @@ -7683,17 +7683,17 @@ nsDocShell::EndPageLoad(nsIWebProgress* DisplayLoadError(aStatus, url, nullptr, aChannel); return NS_OK; } else if (aStatus == NS_ERROR_INVALID_SIGNATURE) { // NS_ERROR_INVALID_SIGNATURE indicates a content-signature error. // This currently only happens in case a remote about page fails. // We have to load a fallback in this case. // XXX: We always load about blank here, firefox has to overwrite this if // it wants to display something else. - return LoadURI(MOZ_UTF16("about:blank"), // URI string + return LoadURI(u"about:blank", // URI string nsIChannel::LOAD_NORMAL, // Load flags nullptr, // Referring URI nullptr, // Post data stream nullptr); // Headers stream } // Handle iframe document not loading error because source was // a tracking URL. We make a note of this iframe node by including @@ -13006,38 +13006,38 @@ nsDocShell::ConfirmRepost(bool* aRepost) rv = stringBundleService->CreateBundle(kBrandBundleURL, getter_AddRefs(brandBundle)); NS_ENSURE_SUCCESS(rv, rv); NS_ASSERTION(prompter && brandBundle && appBundle, "Unable to set up repost prompter."); nsXPIDLString brandName; - rv = brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"), + rv = brandBundle->GetStringFromName(u"brandShortName", getter_Copies(brandName)); nsXPIDLString msgString, button0Title; if (NS_FAILED(rv)) { // No brand, use the generic version. - rv = appBundle->GetStringFromName(MOZ_UTF16("confirmRepostPrompt"), + rv = appBundle->GetStringFromName(u"confirmRepostPrompt", getter_Copies(msgString)); } else { // Brand available - if the app has an override file with formatting, the // app name will be included. Without an override, the prompt will look // like the generic version. const char16_t* formatStrings[] = { brandName.get() }; - rv = appBundle->FormatStringFromName(MOZ_UTF16("confirmRepostPrompt"), + rv = appBundle->FormatStringFromName(u"confirmRepostPrompt", formatStrings, ArrayLength(formatStrings), getter_Copies(msgString)); } if (NS_FAILED(rv)) { return rv; } - rv = appBundle->GetStringFromName(MOZ_UTF16("resendButton.label"), + rv = appBundle->GetStringFromName(u"resendButton.label", getter_Copies(button0Title)); if (NS_FAILED(rv)) { return rv; } int32_t buttonPressed; // The actual value here is irrelevant, but we can't pass an invalid // bool through XPConnect.
--- a/dom/audiochannel/AudioChannelService.cpp +++ b/dom/audiochannel/AudioChannelService.cpp @@ -75,18 +75,18 @@ public: AudioChannelService::GetAudioChannelString(mAudioChannel, name); nsAutoCString topic; topic.Assign("audiochannel-activity-"); topic.Append(NS_ConvertUTF16toUTF8(name)); observerService->NotifyObservers(wrapper, topic.get(), mActive - ? MOZ_UTF16("active") - : MOZ_UTF16("inactive")); + ? u"active" + : u"inactive"); MOZ_LOG(AudioChannelService::GetAudioChannelLog(), LogLevel::Debug, ("NotifyChannelActiveRunnable, type = %d, active = %d\n", mAudioChannel, mActive)); return NS_OK; }
--- a/dom/base/EventSource.cpp +++ b/dom/base/EventSource.cpp @@ -873,21 +873,21 @@ EventSource::ConsoleError() nsresult rv = mSrc->GetSpec(targetSpec); NS_ENSURE_SUCCESS(rv, rv); NS_ConvertUTF8toUTF16 specUTF16(targetSpec); const char16_t *formatStrings[] = { specUTF16.get() }; if (mReadyState == CONNECTING) { rv = PrintErrorOnConsole("chrome://global/locale/appstrings.properties", - MOZ_UTF16("connectionFailure"), + u"connectionFailure", formatStrings, ArrayLength(formatStrings)); } else { rv = PrintErrorOnConsole("chrome://global/locale/appstrings.properties", - MOZ_UTF16("netInterrupt"), + u"netInterrupt", formatStrings, ArrayLength(formatStrings)); } NS_ENSURE_SUCCESS(rv, rv); return NS_OK; } nsresult
--- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -545,21 +545,21 @@ WebSocketImpl::ConsoleError() } } NS_ConvertUTF8toUTF16 specUTF16(mURI); const char16_t* formatStrings[] = { specUTF16.get() }; if (mWebSocket->ReadyState() < WebSocket::OPEN) { PrintErrorOnConsole("chrome://global/locale/appstrings.properties", - MOZ_UTF16("connectionFailure"), + u"connectionFailure", formatStrings, ArrayLength(formatStrings)); } else { PrintErrorOnConsole("chrome://global/locale/appstrings.properties", - MOZ_UTF16("netInterrupt"), + u"netInterrupt", formatStrings, ArrayLength(formatStrings)); } /// todo some specific errors - like for message too large return NS_OK; } void WebSocketImpl::FailConnection(uint16_t aReasonCode, @@ -1594,18 +1594,18 @@ WebSocketImpl::Init(JSContext* aCx, // upgrade the request from ws:// to wss:// and mark as secure mURI.ReplaceSubstring("ws://", "wss://"); if (NS_WARN_IF(mURI.Find("wss://") != 0)) { return; } mSecure = true; - const char16_t* params[] = { reportSpec.get(), MOZ_UTF16("wss") }; - CSP_LogLocalizedStr(MOZ_UTF16("upgradeInsecureRequest"), + const char16_t* params[] = { reportSpec.get(), u"wss" }; + CSP_LogLocalizedStr(u"upgradeInsecureRequest", params, ArrayLength(params), EmptyString(), // aSourceFile EmptyString(), // aScriptSample 0, // aLineNumber 0, // aColumnNumber nsIScriptError::warningFlag, "CSP", mInnerWindowID); }
--- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -681,22 +681,22 @@ nsContentUtils::InitializeModifierString nsXPIDLString shiftModifier; nsXPIDLString metaModifier; nsXPIDLString osModifier; nsXPIDLString altModifier; nsXPIDLString controlModifier; nsXPIDLString modifierSeparator; if (bundle) { //macs use symbols for each modifier key, so fetch each from the bundle, which also covers i18n - bundle->GetStringFromName(MOZ_UTF16("VK_SHIFT"), getter_Copies(shiftModifier)); - bundle->GetStringFromName(MOZ_UTF16("VK_META"), getter_Copies(metaModifier)); - bundle->GetStringFromName(MOZ_UTF16("VK_WIN"), getter_Copies(osModifier)); - bundle->GetStringFromName(MOZ_UTF16("VK_ALT"), getter_Copies(altModifier)); - bundle->GetStringFromName(MOZ_UTF16("VK_CONTROL"), getter_Copies(controlModifier)); - bundle->GetStringFromName(MOZ_UTF16("MODIFIER_SEPARATOR"), getter_Copies(modifierSeparator)); + bundle->GetStringFromName(u"VK_SHIFT", getter_Copies(shiftModifier)); + bundle->GetStringFromName(u"VK_META", getter_Copies(metaModifier)); + bundle->GetStringFromName(u"VK_WIN", getter_Copies(osModifier)); + bundle->GetStringFromName(u"VK_ALT", getter_Copies(altModifier)); + bundle->GetStringFromName(u"VK_CONTROL", getter_Copies(controlModifier)); + bundle->GetStringFromName(u"MODIFIER_SEPARATOR", getter_Copies(modifierSeparator)); } //if any of these don't exist, we get an empty string sShiftText = new nsString(shiftModifier); sMetaText = new nsString(metaModifier); sOSText = new nsString(osModifier); sAltText = new nsString(altModifier); sControlText = new nsString(controlModifier); sModifierSeparator = new nsString(modifierSeparator); @@ -5117,17 +5117,17 @@ nsContentUtils::GetWindowProviderForCont already_AddRefed<nsPIDOMWindowOuter> nsContentUtils::GetMostRecentNonPBWindow() { nsCOMPtr<nsIWindowMediator> windowMediator = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID); nsCOMPtr<nsIWindowMediator_44> wm = do_QueryInterface(windowMediator); nsCOMPtr<mozIDOMWindowProxy> window; - wm->GetMostRecentNonPBWindow(MOZ_UTF16("navigator:browser"), + wm->GetMostRecentNonPBWindow(u"navigator:browser", getter_AddRefs(window)); nsCOMPtr<nsPIDOMWindowOuter> pwindow; pwindow = do_QueryInterface(window); return pwindow.forget(); } /* static */ @@ -6386,26 +6386,22 @@ nsContentUtils::PlatformToDOMLineBreaks( } } bool nsContentUtils::PlatformToDOMLineBreaks(nsString& aString, const fallible_t& aFallible) { if (aString.FindChar(char16_t('\r')) != -1) { // Windows linebreaks: Map CRLF to LF: - if (!aString.ReplaceSubstring(MOZ_UTF16("\r\n"), - MOZ_UTF16("\n"), - aFallible)) { + if (!aString.ReplaceSubstring(u"\r\n", u"\n", aFallible)) { return false; } // Mac linebreaks: Map any remaining CR to LF: - if (!aString.ReplaceSubstring(MOZ_UTF16("\r"), - MOZ_UTF16("\n"), - aFallible)) { + if (!aString.ReplaceSubstring(u"\r", u"\n", aFallible)) { return false; } } return true; } void
--- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -3021,17 +3021,17 @@ GetFormattedTimeString(PRTime aTime, nsA char formatedTime[24]; if (snprintf_literal(formatedTime, "%02d/%02d/%04d %02d:%02d:%02d", prtime.tm_month + 1, prtime.tm_mday, int(prtime.tm_year), prtime.tm_hour , prtime.tm_min, prtime.tm_sec)) { CopyASCIItoUTF16(nsDependentCString(formatedTime), aFormattedTimeString); } else { // If we for whatever reason failed to find the last modified time // (or even the current time), fall back to what NS4.x returned. - aFormattedTimeString.AssignLiteral(MOZ_UTF16("01/01/1970 00:00:00")); + aFormattedTimeString.AssignLiteral(u"01/01/1970 00:00:00"); } } void nsIDocument::GetLastModified(nsAString& aLastModified) const { if (!mLastModified.IsEmpty()) { aLastModified.Assign(mLastModified); @@ -9747,26 +9747,26 @@ nsDocument::GetReadyState(nsAString& aRe return NS_OK; } void nsIDocument::GetReadyState(nsAString& aReadyState) const { switch(mReadyState) { case READYSTATE_LOADING : - aReadyState.AssignLiteral(MOZ_UTF16("loading")); + aReadyState.AssignLiteral(u"loading"); break; case READYSTATE_INTERACTIVE : - aReadyState.AssignLiteral(MOZ_UTF16("interactive")); + aReadyState.AssignLiteral(u"interactive"); break; case READYSTATE_COMPLETE : - aReadyState.AssignLiteral(MOZ_UTF16("complete")); + aReadyState.AssignLiteral(u"complete"); break; default: - aReadyState.AssignLiteral(MOZ_UTF16("uninitialized")); + aReadyState.AssignLiteral(u"uninitialized"); } } namespace { struct SuppressArgs { nsIDocument::SuppressionType mWhat;
--- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -9480,17 +9480,17 @@ nsGlobalWindow::FindOuter(const nsAStrin if (aString.IsEmpty() || aShowDialog) { // See if the find dialog is already up using nsIWindowMediator nsCOMPtr<nsIWindowMediator> windowMediator = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID); nsCOMPtr<mozIDOMWindowProxy> findDialog; if (windowMediator) { - windowMediator->GetMostRecentWindow(MOZ_UTF16("findInPage"), + windowMediator->GetMostRecentWindow(u"findInPage", getter_AddRefs(findDialog)); } if (findDialog) { // The Find dialog is already open, bring it to the top. auto* piFindDialog = nsPIDOMWindowOuter::From(findDialog); aError = piFindDialog->Focus(); } else if (finder) { @@ -11532,17 +11532,17 @@ nsGlobalWindow::Observe(nsISupports* aSu event->SetTrusted(true); bool dummy; return DispatchEvent(event, &dummy); } #endif // MOZ_B2G if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { - MOZ_ASSERT(!NS_strcmp(aData, MOZ_UTF16("intl.accept_languages"))); + MOZ_ASSERT(!NS_strcmp(aData, u"intl.accept_languages")); MOZ_ASSERT(IsInnerWindow()); // The user preferred languages have changed, we need to fire an event on // Window object and invalidate the cache for navigator.languages. It is // done for every change which can be a waste of cycles but those should be // fairly rare. // We MUST invalidate navigator.languages before sending the event in the // very likely situation where an event handler will try to read its value.
--- a/dom/base/nsHTMLContentSerializer.cpp +++ b/dom/base/nsHTMLContentSerializer.cpp @@ -149,19 +149,19 @@ nsHTMLContentSerializer::SerializeHTMLAt valueStr = NS_LITERAL_STRING("text/html; charset=") + NS_ConvertASCIItoUTF16(mCharset); } } nsDependentAtomString nameStr(attrName); nsAutoString prefix; if (namespaceID == kNameSpaceID_XML) { - prefix.AssignLiteral(MOZ_UTF16("xml")); + prefix.AssignLiteral(u"xml"); } else if (namespaceID == kNameSpaceID_XLink) { - prefix.AssignLiteral(MOZ_UTF16("xlink")); + prefix.AssignLiteral(u"xlink"); } // Expand shorthand attribute. if (aNamespace == kNameSpaceID_XHTML && namespaceID == kNameSpaceID_None && IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) { valueStr = nameStr;
--- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -1616,18 +1616,18 @@ nsJSContext::EndCycleCollectionCallback( } nsCString gcMsg; if (aResults.mForcedGC) { gcMsg.AssignLiteral(", forced a GC"); } NS_NAMED_MULTILINE_LITERAL_STRING(kFmt, - MOZ_UTF16("CC(T+%.1f)[%s] max pause: %lums, total time: %lums, slices: %lu, suspected: %lu, visited: %lu RCed and %lu%s GCed, collected: %lu RCed and %lu GCed (%lu|%lu|%lu waiting for GC)%s\n") - MOZ_UTF16("ForgetSkippable %lu times before CC, min: %lu ms, max: %lu ms, avg: %lu ms, total: %lu ms, max sync: %lu ms, removed: %lu")); + u"CC(T+%.1f)[%s] max pause: %lums, total time: %lums, slices: %lu, suspected: %lu, visited: %lu RCed and %lu%s GCed, collected: %lu RCed and %lu GCed (%lu|%lu|%lu waiting for GC)%s\n" + u"ForgetSkippable %lu times before CC, min: %lu ms, max: %lu ms, avg: %lu ms, total: %lu ms, max sync: %lu ms, removed: %lu"); nsString msg; msg.Adopt(nsTextFormatter::smprintf(kFmt.get(), double(delta) / PR_USEC_PER_SEC, ProcessNameForCollectorLog(), gCCStats.mMaxSliceTime, gCCStats.mTotalSliceTime, aResults.mNumSlices, gCCStats.mSuspected, aResults.mVisitedRefCounted, aResults.mVisitedGCed, mergeMsg.get(), aResults.mFreedRefCounted, aResults.mFreedGCed, sCCollectedWaitingForGC, sCCollectedZonesWaitingForGC, sLikelyShortLivingObjectsNeedingGC, @@ -1643,41 +1643,41 @@ nsJSContext::EndCycleCollectionCallback( do_GetService(NS_CONSOLESERVICE_CONTRACTID); if (cs) { cs->LogStringMessage(msg.get()); } } if (sPostGCEventsToObserver) { NS_NAMED_MULTILINE_LITERAL_STRING(kJSONFmt, - MOZ_UTF16("{ \"timestamp\": %llu, ") - MOZ_UTF16("\"duration\": %lu, ") - MOZ_UTF16("\"max_slice_pause\": %lu, ") - MOZ_UTF16("\"total_slice_pause\": %lu, ") - MOZ_UTF16("\"max_finish_gc_duration\": %lu, ") - MOZ_UTF16("\"max_sync_skippable_duration\": %lu, ") - MOZ_UTF16("\"suspected\": %lu, ") - MOZ_UTF16("\"visited\": { ") - MOZ_UTF16("\"RCed\": %lu, ") - MOZ_UTF16("\"GCed\": %lu }, ") - MOZ_UTF16("\"collected\": { ") - MOZ_UTF16("\"RCed\": %lu, ") - MOZ_UTF16("\"GCed\": %lu }, ") - MOZ_UTF16("\"waiting_for_gc\": %lu, ") - MOZ_UTF16("\"zones_waiting_for_gc\": %lu, ") - MOZ_UTF16("\"short_living_objects_waiting_for_gc\": %lu, ") - MOZ_UTF16("\"forced_gc\": %d, ") - MOZ_UTF16("\"forget_skippable\": { ") - MOZ_UTF16("\"times_before_cc\": %lu, ") - MOZ_UTF16("\"min\": %lu, ") - MOZ_UTF16("\"max\": %lu, ") - MOZ_UTF16("\"avg\": %lu, ") - MOZ_UTF16("\"total\": %lu, ") - MOZ_UTF16("\"removed\": %lu } ") - MOZ_UTF16("}")); + u"{ \"timestamp\": %llu, " + u"\"duration\": %lu, " + u"\"max_slice_pause\": %lu, " + u"\"total_slice_pause\": %lu, " + u"\"max_finish_gc_duration\": %lu, " + u"\"max_sync_skippable_duration\": %lu, " + u"\"suspected\": %lu, " + u"\"visited\": { " + u"\"RCed\": %lu, " + u"\"GCed\": %lu }, " + u"\"collected\": { " + u"\"RCed\": %lu, " + u"\"GCed\": %lu }, " + u"\"waiting_for_gc\": %lu, " + u"\"zones_waiting_for_gc\": %lu, " + u"\"short_living_objects_waiting_for_gc\": %lu, " + u"\"forced_gc\": %d, " + u"\"forget_skippable\": { " + u"\"times_before_cc\": %lu, " + u"\"min\": %lu, " + u"\"max\": %lu, " + u"\"avg\": %lu, " + u"\"total\": %lu, " + u"\"removed\": %lu } " + u"}"); nsString json; json.Adopt(nsTextFormatter::smprintf(kJSONFmt.get(), endCCTime, ccNowDuration, gCCStats.mMaxSliceTime, gCCStats.mTotalSliceTime, gCCStats.mMaxGCDuration, gCCStats.mMaxSkippableDuration, gCCStats.mSuspected, aResults.mVisitedRefCounted, aResults.mVisitedGCed,
--- a/dom/base/nsPlainTextSerializer.cpp +++ b/dom/base/nsPlainTextSerializer.cpp @@ -596,17 +596,17 @@ nsPlainTextSerializer::DoOpenContainer(n else if (aTag == nsGkAtoms::td || aTag == nsGkAtoms::th) { // We must make sure that the content of two table cells get a // space between them. // To make the separation between cells most obvious and // importable, we use a TAB. if (GetLastBool(mHasWrittenCellsForRow)) { // Bypass |Write| so that the TAB isn't compressed away. - AddToLine(MOZ_UTF16("\t"), 1); + AddToLine(u"\t", 1); mInWhitespace = true; } else if (mHasWrittenCellsForRow.IsEmpty()) { // We don't always see a <tr> (nor a <table>) before the <td> if we're // copying part of a table PushBool(mHasWrittenCellsForRow, true); // will never be popped } else { @@ -1212,17 +1212,17 @@ nsPlainTextSerializer::Output(nsString& } mOutputString->Append(aString); } static bool IsSpaceStuffable(const char16_t *s) { if (s[0] == '>' || s[0] == ' ' || s[0] == kNBSP || - nsCRT::strncmp(s, MOZ_UTF16("From "), 5) == 0) + nsCRT::strncmp(s, u"From ", 5) == 0) return true; else return false; } /** * This function adds a piece of text to the current stored line. If we are * wrapping text and the stored line will become too long, a suitable
--- a/dom/camera/GonkCameraControl.cpp +++ b/dom/camera/GonkCameraControl.cpp @@ -1297,17 +1297,17 @@ nsGonkCameraControl::StopRecordingImpl() ~RecordingComplete() { } NS_IMETHODIMP Run() { MOZ_ASSERT(NS_IsMainThread()); nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - obs->NotifyObservers(mFile, "file-watcher-notify", MOZ_UTF16("modified")); + obs->NotifyObservers(mFile, "file-watcher-notify", u"modified"); return NS_OK; } private: RefPtr<DeviceStorageFile> mFile; }; ReentrantMonitorAutoEnter mon(mRecorderMonitor);
--- a/dom/canvas/CanvasRenderingContext2D.h +++ b/dom/canvas/CanvasRenderingContext2D.h @@ -931,17 +931,17 @@ protected: miterLimit(10.0f), globalAlpha(1.0f), shadowBlur(0.0), dashOffset(0.0f), op(mozilla::gfx::CompositionOp::OP_OVER), fillRule(mozilla::gfx::FillRule::FILL_WINDING), lineCap(mozilla::gfx::CapStyle::BUTT), lineJoin(mozilla::gfx::JoinStyle::MITER_OR_BEVEL), - filterString(MOZ_UTF16("none")), + filterString(u"none"), updateFilterOnWriteOnly(false), imageSmoothingEnabled(true), fontExplicitLanguage(false) { } ContextState(const ContextState& aOther) : fontGroup(aOther.fontGroup), fontLanguage(aOther.fontLanguage),
--- a/dom/devicestorage/DeviceStorageStatics.cpp +++ b/dom/devicestorage/DeviceStorageStatics.cpp @@ -698,19 +698,19 @@ DeviceStorageStatics::Observe(nsISupport if (NS_WARN_IF(!sInstance)) { return NS_OK; } // 'disk-space-watcher' notifications are sent when there is a modification // of a file in a specific location while a low device storage situation // exists or after recovery of a low storage situation. For Firefox OS, // these notifications are specific for apps storage. - if (!NS_strcmp(aData, MOZ_UTF16("full"))) { + if (!NS_strcmp(aData, u"full")) { sInstance->mLowDiskSpace = true; - } else if (!NS_strcmp(aData, MOZ_UTF16("free"))) { + } else if (!NS_strcmp(aData, u"free")) { sInstance->mLowDiskSpace = false; } else { return NS_OK; } uint32_t i = mListeners.Length(); DS_LOG_INFO("disk space %d (%u)", sInstance->mLowDiskSpace, i);
--- a/dom/geolocation/nsGeolocation.cpp +++ b/dom/geolocation/nsGeolocation.cpp @@ -955,17 +955,17 @@ nsGeolocationService::StartDevice(nsIPri NS_FAILED(rv = mProvider->Watch(this))) { NotifyError(nsIDOMGeoPositionError::POSITION_UNAVAILABLE); return rv; } obs->NotifyObservers(mProvider, "geolocation-device-events", - MOZ_UTF16("starting")); + u"starting"); return NS_OK; } void nsGeolocationService::StopDisconnectTimer() { if (mDisconnectTimer) { @@ -1044,17 +1044,17 @@ nsGeolocationService::StopDevice() return; } mHigherAccuracy = false; mProvider->Shutdown(); obs->NotifyObservers(mProvider, "geolocation-device-events", - MOZ_UTF16("shutdown")); + u"shutdown"); } StaticRefPtr<nsGeolocationService> nsGeolocationService::sService; already_AddRefed<nsGeolocationService> nsGeolocationService::GetGeolocationService() { RefPtr<nsGeolocationService> result;
--- a/dom/html/HTMLFormElement.cpp +++ b/dom/html/HTMLFormElement.cpp @@ -927,22 +927,22 @@ HTMLFormElement::DoSecureToInsecureSubmi getter_AddRefs(stringBundle)); if (NS_FAILED(rv)) { return rv; } nsAutoString title; nsAutoString message; nsAutoString cont; stringBundle->GetStringFromName( - MOZ_UTF16("formPostSecureToInsecureWarning.title"), getter_Copies(title)); + u"formPostSecureToInsecureWarning.title", getter_Copies(title)); stringBundle->GetStringFromName( - MOZ_UTF16("formPostSecureToInsecureWarning.message"), + u"formPostSecureToInsecureWarning.message", getter_Copies(message)); stringBundle->GetStringFromName( - MOZ_UTF16("formPostSecureToInsecureWarning.continue"), + u"formPostSecureToInsecureWarning.continue", getter_Copies(cont)); int32_t buttonPressed; bool checkState = false; // this is unused (ConfirmEx requires this parameter) rv = prompt->ConfirmEx(title.get(), message.get(), (nsIPrompt::BUTTON_TITLE_IS_STRING * nsIPrompt::BUTTON_POS_0) + (nsIPrompt::BUTTON_TITLE_CANCEL * nsIPrompt::BUTTON_POS_1), @@ -1752,17 +1752,17 @@ HTMLFormElement::GetActionURL(nsIURI** a // let's log a message to the console that we are upgrading a request nsAutoCString scheme; rv = actionURL->GetScheme(scheme); NS_ENSURE_SUCCESS(rv, rv); NS_ConvertUTF8toUTF16 reportScheme(scheme); const char16_t* params[] = { reportSpec.get(), reportScheme.get() }; - CSP_LogLocalizedStr(MOZ_UTF16("upgradeInsecureRequest"), + CSP_LogLocalizedStr(u"upgradeInsecureRequest", params, ArrayLength(params), EmptyString(), // aSourceFile EmptyString(), // aScriptSample 0, // aLineNumber 0, // aColumnNumber nsIScriptError::warningFlag, "CSP", document->InnerWindowID()); }
--- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -7828,25 +7828,25 @@ HTMLInputElement::SetFilePickerFiltersFr int32_t filterMask = 0; nsString filterName; nsString extensionListStr; // First, check for image/audio/video filters... if (token.EqualsLiteral("image/*")) { filterMask = nsIFilePicker::filterImages; - filterBundle->GetStringFromName(MOZ_UTF16("imageFilter"), + filterBundle->GetStringFromName(u"imageFilter", getter_Copies(extensionListStr)); } else if (token.EqualsLiteral("audio/*")) { filterMask = nsIFilePicker::filterAudio; - filterBundle->GetStringFromName(MOZ_UTF16("audioFilter"), + filterBundle->GetStringFromName(u"audioFilter", getter_Copies(extensionListStr)); } else if (token.EqualsLiteral("video/*")) { filterMask = nsIFilePicker::filterVideo; - filterBundle->GetStringFromName(MOZ_UTF16("videoFilter"), + filterBundle->GetStringFromName(u"videoFilter", getter_Copies(extensionListStr)); } else if (token.First() == '.') { if (token.Contains(';') || token.Contains('*')) { // Ignore this filter as it contains reserved characters continue; } extensionListStr = NS_LITERAL_STRING("*") + token; filterName = extensionListStr;
--- a/dom/html/ImageDocument.cpp +++ b/dom/html/ImageDocument.cpp @@ -780,17 +780,17 @@ ImageDocument::UpdateTitleAndCharset() } nsXPIDLString status; if (mImageIsResized) { nsAutoString ratioStr; ratioStr.AppendInt(NSToCoordFloor(GetRatio() * 100)); const char16_t* formatString[1] = { ratioStr.get() }; - mStringBundle->FormatStringFromName(MOZ_UTF16("ScaledImage"), + mStringBundle->FormatStringFromName(u"ScaledImage", formatString, 1, getter_Copies(status)); } static const char* const formatNames[4] = { "ImageTitleWithNeitherDimensionsNorFile", "ImageTitleWithoutDimensions",
--- a/dom/html/PluginDocument.cpp +++ b/dom/html/PluginDocument.cpp @@ -163,17 +163,17 @@ PluginDocument::StartDocumentLoad(const bool aReset, nsIContentSink* aSink) { // do not allow message panes to host full-page plugins // returning an error causes helper apps to take over nsCOMPtr<nsIDocShellTreeItem> dsti (do_QueryInterface(aContainer)); if (dsti) { bool isMsgPane = false; - dsti->NameEquals(MOZ_UTF16("messagepane"), &isMsgPane); + dsti->NameEquals(u"messagepane", &isMsgPane); if (isMsgPane) { return NS_ERROR_FAILURE; } } nsresult rv = MediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer, aDocListener, aReset, aSink);
--- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -1299,21 +1299,21 @@ MapLangAttributeInto(const nsMappedAttri if (lang->GetUnit() == eCSSUnit_Null) { lang->SetStringValue(langValue->GetStringValue(), eCSSUnit_Ident); } } if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Text)) { nsCSSValue* emphasisPos = aData->ValueForTextEmphasisPosition(); if (emphasisPos->GetUnit() == eCSSUnit_Null) { const nsAString& lang = langValue->GetStringValue(); - if (nsStyleUtil::MatchesLanguagePrefix(lang, MOZ_UTF16("zh"))) { + if (nsStyleUtil::MatchesLanguagePrefix(lang, u"zh")) { emphasisPos->SetIntValue(NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH, eCSSUnit_Enumerated); - } else if (nsStyleUtil::MatchesLanguagePrefix(lang, MOZ_UTF16("ja")) || - nsStyleUtil::MatchesLanguagePrefix(lang, MOZ_UTF16("mn"))) { + } else if (nsStyleUtil::MatchesLanguagePrefix(lang, u"ja") || + nsStyleUtil::MatchesLanguagePrefix(lang, u"mn")) { // This branch is currently no part of the spec. // See bug 1040668 comment 69 and comment 75. emphasisPos->SetIntValue(NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT, eCSSUnit_Enumerated); } } } }
--- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -787,17 +787,17 @@ nsHTMLDocument::StartDocumentLoad(const nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv) && bundleService, "The bundle service could not be loaded"); nsCOMPtr<nsIStringBundle> bundle; rv = bundleService->CreateBundle("chrome://global/locale/browser.properties", getter_AddRefs(bundle)); NS_ASSERTION(NS_SUCCEEDED(rv) && bundle, "chrome://global/locale/browser.properties could not be loaded"); nsXPIDLString title; if (bundle) { - bundle->GetStringFromName(MOZ_UTF16("plainText.wordWrap"), getter_Copies(title)); + bundle->GetStringFromName(u"plainText.wordWrap", getter_Copies(title)); } SetSelectedStyleSheetSet(title); } // parser the content of the URI mParser->Parse(uri, nullptr, (void *)this); return rv;
--- a/dom/indexedDB/IDBEvents.cpp +++ b/dom/indexedDB/IDBEvents.cpp @@ -14,24 +14,24 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::dom::indexedDB; namespace mozilla { namespace dom { namespace indexedDB { -const char16_t* kAbortEventType = MOZ_UTF16("abort"); -const char16_t* kBlockedEventType = MOZ_UTF16("blocked"); -const char16_t* kCompleteEventType = MOZ_UTF16("complete"); -const char16_t* kErrorEventType = MOZ_UTF16("error"); -const char16_t* kSuccessEventType = MOZ_UTF16("success"); -const char16_t* kUpgradeNeededEventType = MOZ_UTF16("upgradeneeded"); -const char16_t* kVersionChangeEventType = MOZ_UTF16("versionchange"); -const char16_t* kCloseEventType = MOZ_UTF16("close"); +const char16_t* kAbortEventType = u"abort"; +const char16_t* kBlockedEventType = u"blocked"; +const char16_t* kCompleteEventType = u"complete"; +const char16_t* kErrorEventType = u"error"; +const char16_t* kSuccessEventType = u"success"; +const char16_t* kUpgradeNeededEventType = u"upgradeneeded"; +const char16_t* kVersionChangeEventType = u"versionchange"; +const char16_t* kCloseEventType = u"close"; already_AddRefed<nsIDOMEvent> CreateGenericEvent(EventTarget* aOwner, const nsDependentString& aType, Bubbles aBubbles, Cancelable aCancelable) { RefPtr<Event> event = new Event(aOwner, nullptr, nullptr);
--- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -2666,17 +2666,17 @@ TabParent::RecvAudioChannelActivityNotif nsCOMPtr<nsIObserverService> os = services::GetObserverService(); if (os) { nsAutoCString topic; topic.Assign("audiochannel-activity-"); topic.Append(AudioChannelService::GetAudioChannelTable()[aAudioChannel].tag); os->NotifyObservers(NS_ISUPPORTS_CAST(nsITabParent*, this), topic.get(), - aActive ? MOZ_UTF16("active") : MOZ_UTF16("inactive")); + aActive ? u"active" : u"inactive"); } return true; } already_AddRefed<nsFrameLoader> TabParent::GetFrameLoader(bool aUseCachedFrameLoaderAfterDestroy) const {
--- a/dom/mathml/nsMathMLElement.cpp +++ b/dom/mathml/nsMathMLElement.cpp @@ -1082,18 +1082,17 @@ nsMathMLElement::SetAttr(int32_t aNameSp // is important here! The attribute is not set until SetAttr returns, and // we will need the updated attribute value because notifying the document // that content states have changed will call IntrinsicState, which will try // to get updated information about the visitedness from Link. if (aName == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_None || aNameSpaceID == kNameSpaceID_XLink)) { if (aNameSpaceID == kNameSpaceID_XLink) { - WarnDeprecated(MOZ_UTF16("xlink:href"), - MOZ_UTF16("href"), OwnerDoc()); + WarnDeprecated(u"xlink:href", u"href", OwnerDoc()); } Link::ResetLinkState(!!aNotify, true); } return rv; } nsresult
--- a/dom/media/CubebUtils.cpp +++ b/dom/media/CubebUtils.cpp @@ -142,17 +142,17 @@ void InitBrandName() nsXPIDLString brandName; nsCOMPtr<nsIStringBundleService> stringBundleService = mozilla::services::GetStringBundleService(); if (stringBundleService) { nsCOMPtr<nsIStringBundle> brandBundle; nsresult rv = stringBundleService->CreateBundle(kBrandBundleURL, getter_AddRefs(brandBundle)); if (NS_SUCCEEDED(rv)) { - rv = brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"), + rv = brandBundle->GetStringFromName(u"brandShortName", getter_Copies(brandName)); NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Could not get the program name for a cubeb stream."); } } /* cubeb expects a c-string. */ const char* ascii = NS_LossyConvertUTF16toASCII(brandName).get(); sBrandName = new char[brandName.Length() + 1];
--- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -835,24 +835,24 @@ NS_IMETHODIMP MediaDevice::GetType(nsAString& aType) { return NS_OK; } NS_IMETHODIMP VideoDevice::GetType(nsAString& aType) { - aType.AssignLiteral(MOZ_UTF16("video")); + aType.AssignLiteral(u"video"); return NS_OK; } NS_IMETHODIMP AudioDevice::GetType(nsAString& aType) { - aType.AssignLiteral(MOZ_UTF16("audio")); + aType.AssignLiteral(u"audio"); return NS_OK; } NS_IMETHODIMP MediaDevice::GetId(nsAString& aID) { aID.Assign(mID); return NS_OK; @@ -3047,17 +3047,17 @@ MediaManager::Observe(nsISupports* aSubj } else if (!strcmp(aTopic, "getUserMedia:response:deny")) { nsString errorMessage(NS_LITERAL_STRING("NotAllowedError")); if (aSubject) { nsCOMPtr<nsISupportsString> msg(do_QueryInterface(aSubject)); MOZ_ASSERT(msg); msg->GetData(errorMessage); if (errorMessage.IsEmpty()) - errorMessage.AssignLiteral(MOZ_UTF16("InternalError")); + errorMessage.AssignLiteral(u"InternalError"); } nsString key(aData); RefPtr<GetUserMediaTask> task; mActiveCallbacks.Remove(key, getter_AddRefs(task)); if (task) { task->Denied(errorMessage); }
--- a/dom/media/eme/EMEUtils.cpp +++ b/dom/media/eme/EMEUtils.cpp @@ -75,20 +75,20 @@ ParseKeySystem(const nsAString& aExpecte NS_WARNING("Invalid version in EME keySystem string"); return false; } aOutCDMVersion = version; return true; } -static const char16_t* sKeySystems[] = { - MOZ_UTF16("org.w3.clearkey"), - MOZ_UTF16("com.adobe.primetime"), - MOZ_UTF16("com.widevine.alpha"), +static const char16_t *const sKeySystems[] = { + u"org.w3.clearkey", + u"com.adobe.primetime", + u"com.widevine.alpha", }; bool ParseKeySystem(const nsAString& aInputKeySystem, nsAString& aOutKeySystem, int32_t& aOutCDMVersion) { for (const char16_t* keySystem : sKeySystems) {
--- a/dom/media/gtest/TestEME.cpp +++ b/dom/media/gtest/TestEME.cpp @@ -13,48 +13,48 @@ using namespace mozilla; struct ParseKeySystemTestCase { const char16_t* mInputKeySystemString; int32_t mOutCDMVersion; bool mShouldPass; }; const ParseKeySystemTestCase ParseKeySystemTests[] = { { - MOZ_UTF16("org.w3.clearkey"), + u"org.w3.clearkey", NO_CDM_VERSION, true, }, { - MOZ_UTF16("org.w3.clearkey.123"), + u"org.w3.clearkey.123", 123, true, }, { - MOZ_UTF16("org.w3.clearkey.-1"), + u"org.w3.clearkey.-1", NO_CDM_VERSION, false, }, { - MOZ_UTF16("org.w3.clearkey.NaN"), + u"org.w3.clearkey.NaN", NO_CDM_VERSION, false, }, { - MOZ_UTF16("org.w3.clearkey.0"), + u"org.w3.clearkey.0", 0, true, }, { - MOZ_UTF16("org.w3.clearkey.123567890123567890123567890123567890123567890"), + u"org.w3.clearkey.123567890123567890123567890123567890123567890", NO_CDM_VERSION, false, }, { - MOZ_UTF16("org.w3.clearkey.0.1"), + u"org.w3.clearkey.0.1", NO_CDM_VERSION, false, } }; TEST(EME, EMEParseKeySystem) { - const nsAutoString clearkey(MOZ_UTF16("org.w3.clearkey")); + const nsAutoString clearkey(u"org.w3.clearkey"); for (const ParseKeySystemTestCase& test : ParseKeySystemTests) { nsAutoString keySystem; int32_t version; bool rv = ParseKeySystem(nsDependentString(test.mInputKeySystemString), keySystem, version); EXPECT_EQ(rv, test.mShouldPass) << "parse should succeed if expected to"; if (!test.mShouldPass) {
--- a/dom/media/webrtc/MediaEngineDefault.cpp +++ b/dom/media/webrtc/MediaEngineDefault.cpp @@ -54,17 +54,17 @@ MediaEngineDefaultVideoSource::MediaEngi } MediaEngineDefaultVideoSource::~MediaEngineDefaultVideoSource() {} void MediaEngineDefaultVideoSource::GetName(nsAString& aName) const { - aName.AssignLiteral(MOZ_UTF16("Default Video Device")); + aName.AssignLiteral(u"Default Video Device"); return; } void MediaEngineDefaultVideoSource::GetUUID(nsACString& aUUID) const { aUUID.AssignLiteral("1041FCBD-3F12-4F7B-9E9B-1EC556DD5676"); return; @@ -382,17 +382,17 @@ MediaEngineDefaultAudioSource::MediaEngi } MediaEngineDefaultAudioSource::~MediaEngineDefaultAudioSource() {} void MediaEngineDefaultAudioSource::GetName(nsAString& aName) const { - aName.AssignLiteral(MOZ_UTF16("Default Audio Device")); + aName.AssignLiteral(u"Default Audio Device"); return; } void MediaEngineDefaultAudioSource::GetUUID(nsACString& aUUID) const { aUUID.AssignLiteral("B7CBD7C1-53EF-42F9-8353-73F61C70C092"); return;
--- a/dom/media/webrtc/MediaEngineTabVideoSource.cpp +++ b/dom/media/webrtc/MediaEngineTabVideoSource.cpp @@ -117,17 +117,17 @@ MediaEngineTabVideoSource::InitRunnable: nsCOMPtr<nsIRunnable> start(new StartRunnable(mVideoSource)); start->Run(); return NS_OK; } void MediaEngineTabVideoSource::GetName(nsAString_internal& aName) const { - aName.AssignLiteral(MOZ_UTF16("&getUserMedia.videoSource.tabShare;")); + aName.AssignLiteral(u"&getUserMedia.videoSource.tabShare;"); } void MediaEngineTabVideoSource::GetUUID(nsACString_internal& aUuid) const { aUuid.AssignLiteral("tab"); }
--- a/dom/notification/Notification.cpp +++ b/dom/notification/Notification.cpp @@ -834,21 +834,21 @@ NotificationTelemetryService::RecordSend NS_IMETHODIMP NotificationTelemetryService::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) { uint32_t capability; if (strcmp("perm-changed", aTopic) || - !NS_strcmp(MOZ_UTF16("cleared"), aData) || + !NS_strcmp(u"cleared", aData) || !GetNotificationPermission(aSubject, &capability)) { return NS_OK; } - if (!NS_strcmp(MOZ_UTF16("deleted"), aData)) { + if (!NS_strcmp(u"deleted", aData)) { if (capability == nsIPermissionManager::DENY_ACTION) { Telemetry::Accumulate( Telemetry::WEB_NOTIFICATION_PERMISSION_REMOVED, 0); } else if (capability == nsIPermissionManager::ALLOW_ACTION) { Telemetry::Accumulate( Telemetry::WEB_NOTIFICATION_PERMISSION_REMOVED, 1); } }
--- a/dom/performance/PerformanceObserver.cpp +++ b/dom/performance/PerformanceObserver.cpp @@ -129,21 +129,21 @@ PerformanceObserver::QueueEntry(Performa aEntry->GetEntryType(entryType); if (!mEntryTypes.Contains<nsString>(entryType)) { return; } mQueuedEntries.AppendElement(aEntry); } -static const char16_t* sValidTypeNames[4] = { - MOZ_UTF16("mark"), - MOZ_UTF16("measure"), - MOZ_UTF16("resource"), - MOZ_UTF16("server") +static const char16_t *const sValidTypeNames[4] = { + u"mark", + u"measure", + u"resource", + u"server" }; void PerformanceObserver::Observe(const PerformanceObserverInit& aOptions, ErrorResult& aRv) { if (aOptions.mEntryTypes.IsEmpty()) { aRv.Throw(NS_ERROR_DOM_TYPE_ERR);
--- a/dom/plugins/ipc/PluginHangUIParent.cpp +++ b/dom/plugins/ipc/PluginHangUIParent.cpp @@ -382,17 +382,17 @@ PluginHangUIParent::GetHangUIOwnerWindow windowHandle = nullptr; nsresult rv; nsCOMPtr<nsIWindowMediator> winMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<mozIDOMWindowProxy> navWin; - rv = winMediator->GetMostRecentWindow(MOZ_UTF16("navigator:browser"), + rv = winMediator->GetMostRecentWindow(u"navigator:browser", getter_AddRefs(navWin)); NS_ENSURE_SUCCESS(rv, rv); if (!navWin) { return NS_ERROR_FAILURE; } nsPIDOMWindowOuter* win = nsPIDOMWindowOuter::From(navWin); nsCOMPtr<nsIWidget> widget = WidgetUtils::DOMWindowToWidget(win);
--- a/dom/presentation/PresentationDeviceManager.cpp +++ b/dom/presentation/PresentationDeviceManager.cpp @@ -176,17 +176,17 @@ PresentationDeviceManager::AddDevice(nsI MOZ_ASSERT(NS_IsMainThread()); if (NS_WARN_IF(mDevices.Contains(aDevice))) { return NS_ERROR_FAILURE; } mDevices.AppendElement(aDevice); - NotifyDeviceChange(aDevice, MOZ_UTF16("add")); + NotifyDeviceChange(aDevice, u"add"); return NS_OK; } NS_IMETHODIMP PresentationDeviceManager::RemoveDevice(nsIPresentationDevice* aDevice) { NS_ENSURE_ARG(aDevice); @@ -194,32 +194,32 @@ PresentationDeviceManager::RemoveDevice( int32_t index = mDevices.IndexOf(aDevice); if (NS_WARN_IF(index < 0)) { return NS_ERROR_FAILURE; } mDevices.RemoveElementAt(index); - NotifyDeviceChange(aDevice, MOZ_UTF16("remove")); + NotifyDeviceChange(aDevice, u"remove"); return NS_OK; } NS_IMETHODIMP PresentationDeviceManager::UpdateDevice(nsIPresentationDevice* aDevice) { NS_ENSURE_ARG(aDevice); MOZ_ASSERT(NS_IsMainThread()); if (NS_WARN_IF(!mDevices.Contains(aDevice))) { return NS_ERROR_FAILURE; } - NotifyDeviceChange(aDevice, MOZ_UTF16("update")); + NotifyDeviceChange(aDevice, u"update"); return NS_OK; } NS_IMETHODIMP PresentationDeviceManager::OnSessionRequest(nsIPresentationDevice* aDevice, const nsAString& aUrl, const nsAString& aPresentationId,
--- a/dom/security/nsCSPContext.cpp +++ b/dom/security/nsCSPContext.cpp @@ -887,17 +887,17 @@ nsCSPContext::SendReports(nsISupports* a for (uint32_t r = 0; r < reportURIs.Length(); r++) { nsAutoCString reportURICstring = NS_ConvertUTF16toUTF8(reportURIs[r]); // try to create a new uri from every report-uri string rv = NS_NewURI(getter_AddRefs(reportURI), reportURIs[r]); if (NS_FAILED(rv)) { const char16_t* params[] = { reportURIs[r].get() }; CSPCONTEXTLOG(("Could not create nsIURI for report URI %s", reportURICstring.get())); - logToConsole(MOZ_UTF16("triedToSendReport"), params, ArrayLength(params), + logToConsole(u"triedToSendReport", params, ArrayLength(params), aSourceFile, aScriptSample, aLineNum, 0, nsIScriptError::errorFlag); continue; // don't return yet, there may be more URIs } // try to create a new channel for every report-uri nsLoadFlags loadFlags = nsIRequest::LOAD_NORMAL | nsIChannel::LOAD_CLASSIFY_URI; if (doc) { rv = NS_NewChannel(getter_AddRefs(reportChannel), @@ -928,17 +928,17 @@ nsCSPContext::SendReports(nsISupports* a // log a warning to console if scheme is not http or https bool isHttpScheme = (NS_SUCCEEDED(reportURI->SchemeIs("http", &isHttpScheme)) && isHttpScheme) || (NS_SUCCEEDED(reportURI->SchemeIs("https", &isHttpScheme)) && isHttpScheme); if (!isHttpScheme) { const char16_t* params[] = { reportURIs[r].get() }; - logToConsole(MOZ_UTF16("reportURInotHttpsOrHttp2"), params, ArrayLength(params), + logToConsole(u"reportURInotHttpsOrHttp2", params, ArrayLength(params), aSourceFile, aScriptSample, aLineNum, 0, nsIScriptError::errorFlag); continue; } // make sure this is an anonymous request (no cookies) so in case the // policy URI is injected, it can't be abused for CSRF. nsLoadFlags flags; rv = reportChannel->GetLoadFlags(&flags); @@ -991,17 +991,17 @@ nsCSPContext::SendReports(nsISupports* a // AsyncOpen should not fail, but could if there's no load group (like if // SetRequestContext is not given a channel). This should fail quietly and // not return an error since it's really ok if reports don't go out, but // it's good to log the error locally. if (NS_FAILED(rv)) { const char16_t* params[] = { reportURIs[r].get() }; CSPCONTEXTLOG(("AsyncOpen failed for report URI %s", params[0])); - logToConsole(MOZ_UTF16("triedToSendReport"), params, ArrayLength(params), + logToConsole(u"triedToSendReport", params, ArrayLength(params), aSourceFile, aScriptSample, aLineNum, 0, nsIScriptError::errorFlag); } else { CSPCONTEXTLOG(("Sent violation report to URI %s", reportURICstring.get())); } } return NS_OK; } @@ -1076,18 +1076,18 @@ class CSPReportSenderRunnable final : pu } else if (blockedString) { blockedString->GetData(blockedDataStr); } if (blockedDataStr.Length() > 0) { nsString blockedDataChar16 = NS_ConvertUTF8toUTF16(blockedDataStr); const char16_t* params[] = { mViolatedDirective.get(), blockedDataChar16.get() }; - mCSPContext->logToConsole(mReportOnlyFlag ? MOZ_UTF16("CSPROViolationWithURI") : - MOZ_UTF16("CSPViolationWithURI"), + mCSPContext->logToConsole(mReportOnlyFlag ? u"CSPROViolationWithURI" : + u"CSPViolationWithURI", params, ArrayLength(params), mSourceFile, mScriptSample, mLineNum, 0, nsIScriptError::errorFlag); } return NS_OK; } private: nsCOMPtr<nsISupports> mBlockedContentSource; @@ -1350,17 +1350,17 @@ nsCSPContext::GetCSPSandboxFlags(uint32_ // continue the loop checking for an enforcement policy. nsAutoString policy; mPolicies[i]->toString(policy); CSPCONTEXTLOG(("nsCSPContext::GetCSPSandboxFlags, report only policy, ignoring sandbox in: %s", policy.get())); const char16_t* params[] = { policy.get() }; - logToConsole(MOZ_UTF16("ignoringReportOnlyDirective"), params, ArrayLength(params), + logToConsole(u"ignoringReportOnlyDirective", params, ArrayLength(params), EmptyString(), EmptyString(), 0, 0, nsIScriptError::warningFlag); } } return NS_OK; } /* ========== CSPViolationReportListener implementation ========== */ @@ -1446,17 +1446,17 @@ CSPReportRedirectSink::AsyncOnChannelRed nsCOMPtr<nsIURI> uri; rv = aOldChannel->GetURI(getter_AddRefs(uri)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); NS_ASSERTION(observerService, "Observer service required to log CSP violations"); observerService->NotifyObservers(uri, CSP_VIOLATION_TOPIC, - MOZ_UTF16("denied redirect while sending violation report")); + u"denied redirect while sending violation report"); return NS_BINDING_REDIRECTED; } NS_IMETHODIMP CSPReportRedirectSink::GetInterface(const nsIID& aIID, void** aResult) { if (aIID.Equals(NS_GET_IID(nsINetworkInterceptController)) &&
--- a/dom/security/nsCSPParser.cpp +++ b/dom/security/nsCSPParser.cpp @@ -1156,48 +1156,48 @@ nsCSPParser::directive() CSPPARSERLOG(("nsCSPParser::directive, mCurToken: %s, mCurValue: %s", NS_ConvertUTF16toUTF8(mCurToken).get(), NS_ConvertUTF16toUTF8(mCurValue).get())); // Make sure that the directive-srcs-array contains at least // one directive and one src. if (mCurDir.Length() < 1) { - const char16_t* params[] = { MOZ_UTF16("directive missing") }; + const char16_t* params[] = { u"directive missing" }; logWarningErrorToConsole(nsIScriptError::warningFlag, "failedToParseUnrecognizedSource", params, ArrayLength(params)); return; } // Try to create a new CSPDirective nsCSPDirective* cspDir = directiveName(); if (!cspDir) { // if we can not create a CSPDirective, we can skip parsing the srcs for that array return; } // special case handling for block-all-mixed-content, which is only specified // by a directive name but does not include any srcs. if (cspDir->equals(nsIContentSecurityPolicy::BLOCK_ALL_MIXED_CONTENT)) { if (mCurDir.Length() > 1) { - const char16_t* params[] = { MOZ_UTF16("block-all-mixed-content") }; + const char16_t* params[] = { u"block-all-mixed-content" }; logWarningErrorToConsole(nsIScriptError::warningFlag, "ignoreSrcForDirective", params, ArrayLength(params)); } // add the directive and return mPolicy->addDirective(cspDir); return; } // special case handling for upgrade-insecure-requests, which is only specified // by a directive name but does not include any srcs. if (cspDir->equals(nsIContentSecurityPolicy::UPGRADE_IF_INSECURE_DIRECTIVE)) { if (mCurDir.Length() > 1) { - const char16_t* params[] = { MOZ_UTF16("upgrade-insecure-requests") }; + const char16_t* params[] = { u"upgrade-insecure-requests" }; logWarningErrorToConsole(nsIScriptError::warningFlag, "ignoreSrcForDirective", params, ArrayLength(params)); } // add the directive and return mPolicy->addUpgradeInsecDir(static_cast<nsUpgradeInsecureDirective*>(cspDir)); return; } @@ -1228,17 +1228,17 @@ nsCSPParser::directive() // Ignore unsafe-inline within script-src or style-src if nonce // or hash is specified, see: // http://www.w3.org/TR/CSP2/#directive-script-src if ((cspDir->equals(nsIContentSecurityPolicy::SCRIPT_SRC_DIRECTIVE) || cspDir->equals(nsIContentSecurityPolicy::STYLE_SRC_DIRECTIVE)) && mHasHashOrNonce && mUnsafeInlineKeywordSrc) { mUnsafeInlineKeywordSrc->invalidate(); // log to the console that unsafe-inline will be ignored - const char16_t* params[] = { MOZ_UTF16("'unsafe-inline'") }; + const char16_t* params[] = { u"'unsafe-inline'" }; logWarningErrorToConsole(nsIScriptError::warningFlag, "ignoringSrcWithinScriptStyleSrc", params, ArrayLength(params)); } // Add the newly created srcs to the directive and add the directive to the policy cspDir->addSrcs(srcs); mPolicy->addDirective(cspDir); }
--- a/dom/security/nsMixedContentBlocker.cpp +++ b/dom/security/nsMixedContentBlocker.cpp @@ -694,17 +694,17 @@ nsMixedContentBlocker::ShouldLoad(bool a if (docShell->GetDocument()->GetBlockAllMixedContent(isPreload)) { // log a message to the console before returning. nsAutoCString spec; rv = aContentLocation->GetSpec(spec); NS_ENSURE_SUCCESS(rv, rv); NS_ConvertUTF8toUTF16 reportSpec(spec); const char16_t* params[] = { reportSpec.get()}; - CSP_LogLocalizedStr(MOZ_UTF16("blockAllMixedContent"), + CSP_LogLocalizedStr(u"blockAllMixedContent", params, ArrayLength(params), EmptyString(), // aSourceFile EmptyString(), // aScriptSample 0, // aLineNumber 0, // aColumnNumber nsIScriptError::errorFlag, "CSP", docShell->GetDocument()->InnerWindowID()); *aDecision = REJECT_REQUEST;
--- a/dom/storage/DOMStorage.cpp +++ b/dom/storage/DOMStorage.cpp @@ -213,18 +213,18 @@ DOMStorage::BroadcastChangeNotification( // Note, this DOM event should never reach JS. It is cloned later in // nsGlobalWindow. RefPtr<StorageEvent> event = StorageEvent::Constructor(nullptr, NS_LITERAL_STRING("storage"), dict); RefPtr<StorageNotifierRunnable> r = new StorageNotifierRunnable(event, GetType() == LocalStorage - ? MOZ_UTF16("localStorage") - : MOZ_UTF16("sessionStorage")); + ? u"localStorage" + : u"sessionStorage"); NS_DispatchToMainThread(r); } static const char kPermissionType[] = "cookie"; static const char kStorageEnabled[] = "dom.storage.enabled"; // static, public bool
--- a/dom/svg/SVGLength.cpp +++ b/dom/svg/SVGLength.cpp @@ -20,17 +20,17 @@ namespace mozilla { static void GetUnitString(nsAString& unit, uint16_t unitType); static uint16_t GetUnitTypeForString(const nsAString& unitStr); void SVGLength::GetValueAsString(nsAString &aValue) const { char16_t buf[24]; nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("%g"), + u"%g", (double)mValue); aValue.Assign(buf); nsAutoString unitString; GetUnitString(unitString, mUnit); aValue.Append(unitString); }
--- a/dom/svg/SVGNumberList.cpp +++ b/dom/svg/SVGNumberList.cpp @@ -28,17 +28,17 @@ SVGNumberList::GetValueAsString(nsAStrin { aValue.Truncate(); char16_t buf[24]; uint32_t last = mNumbers.Length() - 1; for (uint32_t i = 0; i < mNumbers.Length(); ++i) { // Would like to use aValue.AppendPrintf("%f", mNumbers[i]), but it's not // possible to always avoid trailing zeros. nsTextFormatter::snprintf(buf, ArrayLength(buf), - MOZ_UTF16("%g"), + u"%g", double(mNumbers[i])); // We ignore OOM, since it's not useful for us to return an error. aValue.Append(buf); if (i != last) { aValue.Append(' '); } } }
--- a/dom/svg/SVGPathSegUtils.cpp +++ b/dom/svg/SVGPathSegUtils.cpp @@ -32,51 +32,51 @@ SVGPathSegUtils::GetValueAsString(const uint32_t type = DecodeType(aSeg[0]); char16_t typeAsChar = GetPathSegTypeAsLetter(type); // Special case arcs: if (IsArcType(type)) { bool largeArcFlag = aSeg[4] != 0.0f; bool sweepFlag = aSeg[5] != 0.0f; nsTextFormatter::ssprintf(aValue, - MOZ_UTF16("%c%g,%g %g %d,%d %g,%g"), + u"%c%g,%g %g %d,%d %g,%g", typeAsChar, aSeg[1], aSeg[2], aSeg[3], largeArcFlag, sweepFlag, aSeg[6], aSeg[7]); } else { switch (ArgCountForType(type)) { case 0: aValue = typeAsChar; break; case 1: - nsTextFormatter::ssprintf(aValue, MOZ_UTF16("%c%g"), + nsTextFormatter::ssprintf(aValue, u"%c%g", typeAsChar, aSeg[1]); break; case 2: - nsTextFormatter::ssprintf(aValue, MOZ_UTF16("%c%g,%g"), + nsTextFormatter::ssprintf(aValue, u"%c%g,%g", typeAsChar, aSeg[1], aSeg[2]); break; case 4: - nsTextFormatter::ssprintf(aValue, MOZ_UTF16("%c%g,%g %g,%g"), + nsTextFormatter::ssprintf(aValue, u"%c%g,%g %g,%g", typeAsChar, aSeg[1], aSeg[2], aSeg[3], aSeg[4]); break; case 6: nsTextFormatter::ssprintf(aValue, - MOZ_UTF16("%c%g,%g %g,%g %g,%g"), + u"%c%g,%g %g,%g %g,%g", typeAsChar, aSeg[1], aSeg[2], aSeg[3], aSeg[4], aSeg[5], aSeg[6]); break; default: MOZ_ASSERT(false, "Unknown segment type"); - aValue = MOZ_UTF16("<unknown-segment-type>"); + aValue = u"<unknown-segment-type>"; return; } } // nsTextFormatter::ssprintf is one of the nsTextFormatter methods that // randomly appends '\0' to its output string, which means that the length // of the output string is one too long. We need to manually remove that '\0' // until nsTextFormatter is fixed.
--- a/dom/svg/SVGPointList.cpp +++ b/dom/svg/SVGPointList.cpp @@ -27,17 +27,17 @@ SVGPointList::GetValueAsString(nsAString { aValue.Truncate(); char16_t buf[50]; uint32_t last = mItems.Length() - 1; for (uint32_t i = 0; i < mItems.Length(); ++i) { // Would like to use aValue.AppendPrintf("%f,%f", item.mX, item.mY), // but it's not possible to always avoid trailing zeros. nsTextFormatter::snprintf(buf, ArrayLength(buf), - MOZ_UTF16("%g,%g"), + u"%g,%g", double(mItems[i].mX), double(mItems[i].mY)); // We ignore OOM, since it's not useful for us to return an error. aValue.Append(buf); if (i != last) { aValue.Append(' '); } } }
--- a/dom/svg/nsSVGAngle.cpp +++ b/dom/svg/nsSVGAngle.cpp @@ -81,17 +81,17 @@ GetUnitTypeForString(const nsAString& un return SVG_ANGLETYPE_UNKNOWN; } static void GetValueString(nsAString &aValueAsString, float aValue, uint16_t aUnitType) { char16_t buf[24]; nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("%g"), + u"%g", (double)aValue); aValueAsString.Assign(buf); nsAutoString unitString; GetUnitString(unitString, aUnitType); aValueAsString.Append(unitString); }
--- a/dom/svg/nsSVGLength2.cpp +++ b/dom/svg/nsSVGLength2.cpp @@ -84,17 +84,17 @@ GetUnitTypeForString(const nsAString& un return nsIDOMSVGLength::SVG_LENGTHTYPE_UNKNOWN; } static void GetValueString(nsAString &aValueAsString, float aValue, uint16_t aUnitType) { char16_t buf[24]; nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("%g"), + u"%g", (double)aValue); aValueAsString.Assign(buf); nsAutoString unitString; GetUnitString(unitString, aUnitType); aValueAsString.Append(unitString); }
--- a/dom/svg/nsSVGTransform.cpp +++ b/dom/svg/nsSVGTransform.cpp @@ -20,51 +20,51 @@ nsSVGTransform::GetValueAsString(nsAStri { char16_t buf[256]; switch (mType) { case SVG_TRANSFORM_TRANSLATE: // The spec say that if Y is not provided, it is assumed to be zero. if (mMatrix._32 != 0) nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("translate(%g, %g)"), + u"translate(%g, %g)", mMatrix._31, mMatrix._32); else nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("translate(%g)"), + u"translate(%g)", mMatrix._31); break; case SVG_TRANSFORM_ROTATE: if (mOriginX != 0.0f || mOriginY != 0.0f) nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("rotate(%g, %g, %g)"), + u"rotate(%g, %g, %g)", mAngle, mOriginX, mOriginY); else nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("rotate(%g)"), mAngle); + u"rotate(%g)", mAngle); break; case SVG_TRANSFORM_SCALE: if (mMatrix._11 != mMatrix._22) nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("scale(%g, %g)"), mMatrix._11, mMatrix._22); + u"scale(%g, %g)", mMatrix._11, mMatrix._22); else nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("scale(%g)"), mMatrix._11); + u"scale(%g)", mMatrix._11); break; case SVG_TRANSFORM_SKEWX: nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("skewX(%g)"), mAngle); + u"skewX(%g)", mAngle); break; case SVG_TRANSFORM_SKEWY: nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("skewY(%g)"), mAngle); + u"skewY(%g)", mAngle); break; case SVG_TRANSFORM_MATRIX: nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("matrix(%g, %g, %g, %g, %g, %g)"), + u"matrix(%g, %g, %g, %g, %g, %g)", mMatrix._11, mMatrix._12, mMatrix._21, mMatrix._22, mMatrix._31, mMatrix._32); break; default: buf[0] = '\0'; NS_ERROR("unknown transformation type"); break;
--- a/dom/svg/nsSVGViewBox.cpp +++ b/dom/svg/nsSVGViewBox.cpp @@ -202,17 +202,17 @@ void nsSVGViewBox::GetBaseValueString(nsAString& aValue) const { if (mBaseVal.none) { aValue.AssignLiteral("none"); return; } char16_t buf[200]; nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(char16_t), - MOZ_UTF16("%g %g %g %g"), + u"%g %g %g %g", (double)mBaseVal.x, (double)mBaseVal.y, (double)mBaseVal.width, (double)mBaseVal.height); aValue.Assign(buf); } already_AddRefed<dom::SVGAnimatedRect> nsSVGViewBox::ToSVGAnimatedRect(nsSVGElement* aSVGElement)
--- a/dom/system/gonk/AudioManager.cpp +++ b/dom/system/gonk/AudioManager.cpp @@ -51,20 +51,20 @@ using namespace mozilla::dom; using namespace mozilla::dom::gonk; using namespace android; using namespace mozilla; using namespace mozilla::dom::bluetooth; #undef LOG #define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "AudioManager" , ## args) -#define HEADPHONES_STATUS_HEADSET MOZ_UTF16("headset") -#define HEADPHONES_STATUS_HEADPHONE MOZ_UTF16("headphone") -#define HEADPHONES_STATUS_OFF MOZ_UTF16("off") -#define HEADPHONES_STATUS_UNKNOWN MOZ_UTF16("unknown") +#define HEADPHONES_STATUS_HEADSET u"headset" +#define HEADPHONES_STATUS_HEADPHONE u"headphone" +#define HEADPHONES_STATUS_OFF u"off" +#define HEADPHONES_STATUS_UNKNOWN u"unknown" #define HEADPHONES_STATUS_CHANGED "headphones-status-changed" #define MOZ_SETTINGS_CHANGE_ID "mozsettings-changed" #define AUDIO_CHANNEL_PROCESS_CHANGED "audio-channel-process-changed" #define AUDIO_POLICY_SERVICE_NAME "media.audio_policy" #define SETTINGS_SERVICE "@mozilla.org/settingsService;1" // Refer AudioService.java from Android static const uint32_t sMaxStreamVolumeTbl[AUDIO_STREAM_CNT] = {
--- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -173,39 +173,37 @@ public: nsCOMPtr<nsIObserverService> obsService = services::GetObserverService(); obsService->NotifyObservers(provider, "geolocation-device-events", mData); return NS_OK; } private: const char16_t* mData; }; - - void GonkGPSGeolocationProvider::StatusCallback(GpsStatus* status) { const char* msgStream=0; switch (status->status) { case GPS_STATUS_NONE: msgStream = "geo: GPS_STATUS_NONE\n"; break; case GPS_STATUS_SESSION_BEGIN: msgStream = "geo: GPS_STATUS_SESSION_BEGIN\n"; break; case GPS_STATUS_SESSION_END: msgStream = "geo: GPS_STATUS_SESSION_END\n"; break; case GPS_STATUS_ENGINE_ON: msgStream = "geo: GPS_STATUS_ENGINE_ON\n"; - NS_DispatchToMainThread(new NotifyObserversGPSTask( MOZ_UTF16("GPSStarting"))); + NS_DispatchToMainThread(new NotifyObserversGPSTask(u"GPSStarting")); break; case GPS_STATUS_ENGINE_OFF: msgStream = "geo: GPS_STATUS_ENGINE_OFF\n"; - NS_DispatchToMainThread(new NotifyObserversGPSTask( MOZ_UTF16("GPSShutdown"))); + NS_DispatchToMainThread(new NotifyObserversGPSTask(u"GPSShutdown")); break; default: msgStream = "geo: Unknown GPS status\n"; break; } if (gDebug_isLoggingEnabled){ DBG("%s", msgStream); }
--- a/dom/xbl/nsXBLProtoImplField.cpp +++ b/dom/xbl/nsXBLProtoImplField.cpp @@ -489,10 +489,10 @@ nsXBLProtoImplField::Write(nsIObjectOutp nsresult rv = aStream->Write8(type); NS_ENSURE_SUCCESS(rv, rv); rv = aStream->WriteWStringZ(mName); NS_ENSURE_SUCCESS(rv, rv); rv = aStream->Write32(mLineNumber); NS_ENSURE_SUCCESS(rv, rv); - return aStream->WriteWStringZ(mFieldText ? mFieldText : MOZ_UTF16("")); + return aStream->WriteWStringZ(mFieldText ? mFieldText : u""); }
--- a/dom/xbl/nsXBLPrototypeHandler.cpp +++ b/dom/xbl/nsXBLPrototypeHandler.cpp @@ -997,10 +997,10 @@ nsXBLPrototypeHandler::Write(nsIObjectOu rv = aStream->Write32(mDetail); NS_ENSURE_SUCCESS(rv, rv); rv = aStream->WriteWStringZ(nsDependentAtomString(mEventName).get()); NS_ENSURE_SUCCESS(rv, rv); rv = aStream->Write32(mLineNumber); NS_ENSURE_SUCCESS(rv, rv); - return aStream->WriteWStringZ(mHandlerText ? mHandlerText : MOZ_UTF16("")); + return aStream->WriteWStringZ(mHandlerText ? mHandlerText : u""); }
--- a/dom/xml/nsXMLContentSink.cpp +++ b/dom/xml/nsXMLContentSink.cpp @@ -1324,18 +1324,18 @@ nsXMLContentSink::ReportError(const char mXSLTProcessor->CancelLoads(); mXSLTProcessor = nullptr; } // release the nodes on stack mContentStack.Clear(); mNotifyLevel = 0; - rv = HandleProcessingInstruction(MOZ_UTF16("xml-stylesheet"), - MOZ_UTF16("href=\"chrome://global/locale/intl.css\" type=\"text/css\"")); + rv = HandleProcessingInstruction(u"xml-stylesheet", + u"href=\"chrome://global/locale/intl.css\" type=\"text/css\""); NS_ENSURE_SUCCESS(rv, rv); const char16_t* noAtts[] = { 0, 0 }; NS_NAMED_LITERAL_STRING(errorNs, "http://www.mozilla.org/newlayout/xml/parsererror.xml"); nsAutoString parsererror(errorNs);
--- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp +++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp @@ -1089,22 +1089,22 @@ txMozillaXSLTProcessor::reportError(nsre nsXPIDLString errorMessage; nsCOMPtr<nsIStringBundle> bundle; sbs->CreateBundle(XSLT_MSGS_URL, getter_AddRefs(bundle)); if (bundle) { const char16_t* error[] = { errorText.get() }; if (mStylesheet) { - bundle->FormatStringFromName(MOZ_UTF16("TransformError"), + bundle->FormatStringFromName(u"TransformError", error, 1, getter_Copies(errorMessage)); } else { - bundle->FormatStringFromName(MOZ_UTF16("LoadingError"), + bundle->FormatStringFromName(u"LoadingError", error, 1, getter_Copies(errorMessage)); } } mErrorText.Assign(errorMessage); } }
--- a/dom/xul/templates/nsXULContentUtils.cpp +++ b/dom/xul/templates/nsXULContentUtils.cpp @@ -89,17 +89,17 @@ nsXULContentUtils::Init() #define XUL_RESOURCE(ident, uri) \ PR_BEGIN_MACRO \ rv = gRDF->GetResource(NS_LITERAL_CSTRING(uri), &(ident)); \ if (NS_FAILED(rv)) return rv; \ PR_END_MACRO #define XUL_LITERAL(ident, val) \ PR_BEGIN_MACRO \ - rv = gRDF->GetLiteral(MOZ_UTF16(val), &(ident)); \ + rv = gRDF->GetLiteral(val, &(ident)); \ if (NS_FAILED(rv)) return rv; \ PR_END_MACRO #include "nsXULResourceList.h" #undef XUL_RESOURCE #undef XUL_LITERAL gFormat = nsIDateTimeFormat::Create().take();
--- a/dom/xul/templates/nsXULResourceList.h +++ b/dom/xul/templates/nsXULResourceList.h @@ -5,9 +5,9 @@ // N.B., no include guard! We'll include this multiple times in some // files. XUL_RESOURCE(NC_child, NC_NAMESPACE_URI "child"); XUL_RESOURCE(NC_Folder, NC_NAMESPACE_URI "Folder"); XUL_RESOURCE(NC_open, NC_NAMESPACE_URI "open"); -XUL_LITERAL(true_, "true"); +XUL_LITERAL(true_, u"true");
--- a/editor/composer/nsEditingSession.cpp +++ b/editor/composer/nsEditingSession.cpp @@ -1028,17 +1028,17 @@ nsEditingSession::EndDocumentLoad(nsIWeb void nsEditingSession::TimerCallback(nsITimer* aTimer, void* aClosure) { nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(static_cast<nsIWeakReference*> (aClosure)); if (docShell) { nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(docShell)); if (webNav) - webNav->LoadURI(MOZ_UTF16("about:blank"), + webNav->LoadURI(u"about:blank", 0, nullptr, nullptr, nullptr); } } /*--------------------------------------------------------------------------- StartPageLoad
--- a/editor/libeditor/HTMLEditor.cpp +++ b/editor/libeditor/HTMLEditor.cpp @@ -1207,22 +1207,20 @@ HTMLEditor::ReplaceHeadContentsWithHTML( NS_ENSURE_TRUE(headNode, NS_ERROR_NULL_POINTER); // First, make sure there are no return chars in the source. Bad things // happen if you insert returns (instead of dom newlines, \n) into an editor // document. nsAutoString inputString (aSourceToInsert); // hope this does copy-on-write // Windows linebreaks: Map CRLF to LF: - inputString.ReplaceSubstring(MOZ_UTF16("\r\n"), - MOZ_UTF16("\n")); + inputString.ReplaceSubstring(u"\r\n", u"\n"); // Mac linebreaks: Map any remaining CR to LF: - inputString.ReplaceSubstring(MOZ_UTF16("\r"), - MOZ_UTF16("\n")); + inputString.ReplaceSubstring(u"\r", u"\n"); AutoEditBatch beginBatching(this); // Get the first range in the selection, for context: RefPtr<nsRange> range = selection->GetRangeAt(0); NS_ENSURE_TRUE(range, NS_ERROR_NULL_POINTER); ErrorResult err;
--- a/embedding/components/commandhandler/nsCommandManager.cpp +++ b/embedding/components/commandhandler/nsCommandManager.cpp @@ -77,17 +77,17 @@ nsCommandManager::CommandStatusChanged(c if (commandObservers) { // XXX Should we worry about observers removing themselves from Observe()? int32_t i, numItems = commandObservers->Length(); for (i = 0; i < numItems; ++i) { nsCOMPtr<nsIObserver> observer = commandObservers->ElementAt(i); // should we get the command state to pass here? This might be expensive. observer->Observe(NS_ISUPPORTS_CAST(nsICommandManager*, this), aCommandName, - MOZ_UTF16("command_status_changed")); + u"command_status_changed"); } } return NS_OK; } #if 0 #pragma mark -
--- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -1690,17 +1690,17 @@ nsPermissionManager::AddInternal(nsIPrin } if (aNotifyOperation == eNotify) { NotifyObserversWithPermission(aPrincipal, mTypeArray[typeIndex], aPermission, aExpireType, aExpireTime, - MOZ_UTF16("added")); + u"added"); } break; } case eOperationRemoving: { PermissionEntry oldPermissionEntry = entry->GetPermissions()[index]; @@ -1714,17 +1714,17 @@ nsPermissionManager::AddInternal(nsIPrin nsIPermissionManager::EXPIRE_NEVER, 0, 0); if (aNotifyOperation == eNotify) { NotifyObserversWithPermission(aPrincipal, mTypeArray[typeIndex], oldPermissionEntry.mPermission, oldPermissionEntry.mExpireType, oldPermissionEntry.mExpireTime, - MOZ_UTF16("deleted")); + u"deleted"); } // If there are no more permissions stored for that entry, clear it. if (entry->GetPermissions().IsEmpty()) { mPermissionTable.RemoveEntry(entry); } break; @@ -1760,17 +1760,17 @@ nsPermissionManager::AddInternal(nsIPrin aPermission, aExpireType, aExpireTime, aModificationTime); if (aNotifyOperation == eNotify) { NotifyObserversWithPermission(aPrincipal, mTypeArray[typeIndex], aPermission, aExpireType, aExpireTime, - MOZ_UTF16("changed")); + u"changed"); } break; } case eOperationReplacingDefault: { // this is handling the case when we have an existing permission // entry that was created as a "default" (and thus isn't in the DB) with @@ -1808,17 +1808,17 @@ nsPermissionManager::AddInternal(nsIPrin } if (aNotifyOperation == eNotify) { NotifyObserversWithPermission(aPrincipal, mTypeArray[typeIndex], aPermission, aExpireType, aExpireTime, - MOZ_UTF16("changed")); + u"changed"); } } break; } return NS_OK; } @@ -1919,17 +1919,17 @@ nsPermissionManager::RemoveAllInternal(b // database is authoritative, we do not need confirmation from the // on-disk database to notify observers. RemoveAllFromMemory(); // Re-import the defaults ImportDefaults(); if (aNotifyObservers) { - NotifyObservers(nullptr, MOZ_UTF16("cleared")); + NotifyObservers(nullptr, u"cleared"); } // clear the db if (mDBConn) { nsCOMPtr<mozIStorageAsyncStatement> removeStmt; nsresult rv = mDBConn-> CreateAsyncStatement(NS_LITERAL_CSTRING( "DELETE FROM moz_perms" @@ -2448,32 +2448,32 @@ nsPermissionManager::RemoveExpiredPermis entry->GetPermissions().RemoveElementAt(i); NotifyObserversWithPermission(principal, mTypeArray.ElementAt(oldPermEntry.mType), oldPermEntry.mPermission, oldPermEntry.mExpireType, oldPermEntry.mExpireTime, - MOZ_UTF16("deleted")); + u"deleted"); --i; continue; } permEntry.mPermission = permEntry.mNonSessionPermission; permEntry.mExpireType = permEntry.mNonSessionExpireType; permEntry.mExpireTime = permEntry.mNonSessionExpireTime; NotifyObserversWithPermission(principal, mTypeArray.ElementAt(permEntry.mType), permEntry.mPermission, permEntry.mExpireType, permEntry.mExpireTime, - MOZ_UTF16("changed")); + u"changed"); } } return NS_OK; } //***************************************************************************** //*** nsPermissionManager private methods
--- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -821,27 +821,27 @@ mount_operation_ask_password (GMountOper return; } nsAutoString nsmessage; if (flags & G_ASK_PASSWORD_NEED_PASSWORD) { if (flags & G_ASK_PASSWORD_NEED_USERNAME) { if (!realm.IsEmpty()) { const char16_t *strings[] = { realm.get(), dispHost.get() }; - bundle->FormatStringFromName(MOZ_UTF16("EnterLoginForRealm2"), + bundle->FormatStringFromName(u"EnterLoginForRealm2", strings, 2, getter_Copies(nsmessage)); } else { const char16_t *strings[] = { dispHost.get() }; - bundle->FormatStringFromName(MOZ_UTF16("EnterUserPasswordFor2"), + bundle->FormatStringFromName(u"EnterUserPasswordFor2", strings, 1, getter_Copies(nsmessage)); } } else { NS_ConvertUTF8toUTF16 userName(default_user); const char16_t *strings[] = { userName.get(), dispHost.get() }; - bundle->FormatStringFromName(MOZ_UTF16("EnterPasswordFor"), + bundle->FormatStringFromName(u"EnterPasswordFor", strings, 2, getter_Copies(nsmessage)); } } else { g_warning("Unknown mount operation request (flags: %x)", flags); } if (nsmessage.IsEmpty()) { g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED);
--- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -509,21 +509,21 @@ nsresult nsAutoConfig::PromptForEMailAdd NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIStringBundle> bundle; rv = bundleService->CreateBundle("chrome://autoconfig/locale/autoconfig.properties", getter_AddRefs(bundle)); NS_ENSURE_SUCCESS(rv, rv); nsXPIDLString title; - rv = bundle->GetStringFromName(MOZ_UTF16("emailPromptTitle"), getter_Copies(title)); + rv = bundle->GetStringFromName(u"emailPromptTitle", getter_Copies(title)); NS_ENSURE_SUCCESS(rv, rv); nsXPIDLString err; - rv = bundle->GetStringFromName(MOZ_UTF16("emailPromptMsg"), getter_Copies(err)); + rv = bundle->GetStringFromName(u"emailPromptMsg", getter_Copies(err)); NS_ENSURE_SUCCESS(rv, rv); bool check = false; nsXPIDLString emailResult; bool success; rv = promptService->Prompt(nullptr, title.get(), err.get(), getter_Copies(emailResult), nullptr, &check, &success); if (!success) return NS_ERROR_FAILURE; NS_ENSURE_SUCCESS(rv, rv);
--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -51,22 +51,22 @@ static void DisplayError(void) nsCOMPtr<nsIStringBundle> bundle; bundleService->CreateBundle("chrome://autoconfig/locale/autoconfig.properties", getter_AddRefs(bundle)); if (!bundle) return; nsXPIDLString title; - rv = bundle->GetStringFromName(MOZ_UTF16("readConfigTitle"), getter_Copies(title)); + rv = bundle->GetStringFromName(u"readConfigTitle", getter_Copies(title)); if (NS_FAILED(rv)) return; nsXPIDLString err; - rv = bundle->GetStringFromName(MOZ_UTF16("readConfigMsg"), getter_Copies(err)); + rv = bundle->GetStringFromName(u"readConfigMsg", getter_Copies(err)); if (NS_FAILED(rv)) return; promptService->Alert(nullptr, title.get(), err.get()); } // nsISupports Implementation
--- a/gfx/2d/SFNTNameTable.cpp +++ b/gfx/2d/SFNTNameTable.cpp @@ -211,17 +211,17 @@ SFNTNameTable::GetU16FullName(mozilla::u } mozilla::u16string styleName; if (!ReadU16Name(StyleMatchers(), styleName)) { return false; } aU16FullName.assign(Move(familyName)); - aU16FullName.append(MOZ_UTF16(" ")); + aU16FullName.append(u" "); aU16FullName.append(styleName); return true; } bool SFNTNameTable::ReadU16Name(const NameRecordMatchers& aMatchers, mozilla::u16string& aU16Name) {
--- a/gfx/thebes/gfxFontUtils.cpp +++ b/gfx/thebes/gfxFontUtils.cpp @@ -881,17 +881,17 @@ nsresult gfxFontUtils::MakeUniqueUserFon // all b64 characters except for '/' are allowed in Postscript names, so convert / ==> - char *p; for (p = guidB64; *p; p++) { if (*p == '/') *p = '-'; } - aName.AssignLiteral(MOZ_UTF16("uf")); + aName.AssignLiteral(u"uf"); aName.AppendASCII(guidB64); return NS_OK; } // TrueType/OpenType table handling code // need byte aligned structs
--- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -1087,17 +1087,17 @@ gfxWindowsPlatform::UseClearTypeAlways() return mUseClearTypeAlways; } void gfxWindowsPlatform::GetDLLVersion(char16ptr_t aDLLPath, nsAString& aVersion) { DWORD versInfoSize, vers[4] = {0}; // version info not available case - aVersion.AssignLiteral(MOZ_UTF16("0.0.0.0")); + aVersion.AssignLiteral(u"0.0.0.0"); versInfoSize = GetFileVersionInfoSizeW(aDLLPath, nullptr); AutoTArray<BYTE,512> versionInfo; if (versInfoSize == 0 || !versionInfo.AppendElements(uint32_t(versInfoSize))) { return; }
--- a/image/imgLoader.cpp +++ b/image/imgLoader.cpp @@ -1296,17 +1296,17 @@ imgLoader::RespectPrivacyNotifications() } NS_IMETHODIMP imgLoader::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) { // We listen for pref change notifications... if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { - if (!NS_strcmp(aData, MOZ_UTF16("image.http.accept"))) { + if (!NS_strcmp(aData, u"image.http.accept")) { ReadAcceptHeaderPref(); } } else if (strcmp(aTopic, "memory-pressure") == 0) { MinimizeCaches(); } else if (strcmp(aTopic, "app-theme-changed") == 0) { ClearImageCache(); MinimizeCaches();
--- a/ipc/glue/GeckoChildProcessHost.cpp +++ b/ipc/glue/GeckoChildProcessHost.cpp @@ -683,20 +683,20 @@ AddContentSandboxAllowedFiles(int32_t aS } if (::GetDriveTypeW(volPath) != DRIVE_REMOTE) { return; } // Convert network share path to format for sandbox policy. if (Substring(binDirPath, 0, 2).Equals(L"\\\\")) { - binDirPath.InsertLiteral(MOZ_UTF16("??\\UNC"), 1); + binDirPath.InsertLiteral(u"??\\UNC", 1); } - binDirPath.AppendLiteral(MOZ_UTF16("\\*")); + binDirPath.AppendLiteral(u"\\*"); aAllowedFilesRead.push_back(std::wstring(binDirPath.get())); } #endif bool GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExtraOpts, base::ProcessArchitecture arch) {
--- a/js/public/UbiNode.h +++ b/js/public/UbiNode.h @@ -563,17 +563,17 @@ class Base { // opposed to something from a deserialized core dump. Returns false, // otherwise. virtual bool isLive() const { return true; }; // Return the coarse-grained type-of-thing that this node represents. virtual CoarseType coarseType() const { return CoarseType::Other; } // Return a human-readable name for the referent's type. The result should - // be statically allocated. (You can use MOZ_UTF16("strings") for this.) + // be statically allocated. (You can use u"strings" for this.) // // This must always return Concrete<T>::concreteTypeName; we use that // pointer as a tag for this particular referent type. virtual const char16_t* typeName() const = 0; // Return the size of this node, in bytes. Include any structures that this // node owns exclusively that are not exposed as their own ubi::Nodes. // |mallocSizeOf| should be a malloc block sizing function; see
--- a/js/src/asmjs/WasmBinaryToAST.cpp +++ b/js/src/asmjs/WasmBinaryToAST.cpp @@ -222,17 +222,17 @@ AstDecodeCall(AstDecodeContext& c) if (calleeIndex >= c.funcSigs().length()) return c.iter().fail("callee index out of range"); uint32_t sigIndex = c.funcSigs()[calleeIndex]; const AstSig* sig = c.module().sigs()[sigIndex]; AstRef funcRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("func")), calleeIndex, &funcRef)) + if (!AstDecodeGenerateRef(c, AstName(u"func"), calleeIndex, &funcRef)) return false; AstExprVector args(c.lifo); if (!AstDecodeCallArgs(c, arity, *sig, &args)) return false; if (!AstDecodeCallReturn(c, *sig)) return false; @@ -250,17 +250,17 @@ static bool AstDecodeCallIndirect(AstDecodeContext& c) { uint32_t sigIndex; uint32_t arity; if (!c.iter().readCallIndirect(&sigIndex, &arity)) return false; AstRef sigRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("type")), sigIndex, &sigRef)) + if (!AstDecodeGenerateRef(c, AstName(u"type"), sigIndex, &sigRef)) return false; if (sigIndex >= c.module().sigs().length()) return c.iter().fail("signature index out of range"); const AstSig* sig = c.module().sigs()[sigIndex]; AstExprVector args(c.lifo); if (!AstDecodeCallArgs(c, arity, *sig, &args)) @@ -292,17 +292,17 @@ AstDecodeCallImport(AstDecodeContext& c) return false; if (importIndex >= c.module().imports().length()) return c.iter().fail("import index out of range"); AstImport* import = c.module().imports()[importIndex]; AstSig* sig = c.module().sigs()[import->funcSig().index()]; AstRef funcRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("import")), importIndex, &funcRef)) + if (!AstDecodeGenerateRef(c, AstName(u"import"), importIndex, &funcRef)) return false; AstExprVector args(c.lifo); if (!AstDecodeCallArgs(c, arity, *sig, &args)) return false; if (!AstDecodeCallReturn(c, *sig)) return false; @@ -322,17 +322,17 @@ AstDecodeGetBlockRef(AstDecodeContext& c if (!c.generateNames || depth >= c.blockLabels().length()) { // Also ignoring if it's a function body label. *ref = AstRef(AstName(), depth); return true; } uint32_t index = c.blockLabels().length() - depth - 1; if (c.blockLabels()[index].empty()) { - if (!AstDecodeGenerateName(c, AstName(MOZ_UTF16("label")), c.nextLabelIndex(), &c.blockLabels()[index])) + if (!AstDecodeGenerateName(c, AstName(u"label"), c.nextLabelIndex(), &c.blockLabels()[index])) return false; } *ref = AstRef(c.blockLabels()[index], AstNoIndex); ref->setIndex(depth); return true; } static bool @@ -651,17 +651,17 @@ AstDecodeBranch(AstDecodeContext& c, Exp static bool AstDecodeGetLocal(AstDecodeContext& c) { uint32_t getLocalId; if (!c.iter().readGetLocal(c.locals(), &getLocalId)) return false; AstRef localRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("var")), getLocalId, &localRef)) + if (!AstDecodeGenerateRef(c, AstName(u"var"), getLocalId, &localRef)) return false; AstGetLocal* getLocal = new(c.lifo) AstGetLocal(localRef); if (!getLocal) return false; c.iter().setResult(AstDecodeStackItem(getLocal)); return true; @@ -671,17 +671,17 @@ static bool AstDecodeSetLocal(AstDecodeContext& c) { uint32_t setLocalId; AstDecodeStackItem setLocalValue; if (!c.iter().readSetLocal(c.locals(), &setLocalId, &setLocalValue)) return false; AstRef localRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("var")), setLocalId, &localRef)) + if (!AstDecodeGenerateRef(c, AstName(u"var"), setLocalId, &localRef)) return false; AstSetLocal* setLocal = new(c.lifo) AstSetLocal(localRef, *setLocalValue.expr); if (!setLocal) return false; c.iter().setResult(AstDecodeStackItem(setLocal, 1)); return true; @@ -1158,17 +1158,17 @@ AstDecodeTypeSection(AstDecodeContext& c if (!c.d.readValType(&type)) return AstDecodeFail(c, "bad expression type"); result = ToExprType(type); } AstSig sigNoName(Move(args), result); AstName sigName; - if (!AstDecodeGenerateName(c, AstName(MOZ_UTF16("type")), sigIndex, &sigName)) + if (!AstDecodeGenerateName(c, AstName(u"type"), sigIndex, &sigName)) return false; AstSig* sig = new(c.lifo) AstSig(sigName, Move(sigNoName)); if (!sig || !c.module().append(sig)) return false; } if (!c.d.finishSection(sectionStart, sectionSize)) @@ -1286,32 +1286,32 @@ AstDecodeName(AstDecodeContext& c, AstNa static bool AstDecodeImport(AstDecodeContext& c, uint32_t importIndex, AstImport** import) { uint32_t sigIndex = AstNoIndex; if (!AstDecodeSignatureIndex(c, &sigIndex)) return false; AstRef sigRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("type")), sigIndex, &sigRef)) + if (!AstDecodeGenerateRef(c, AstName(u"type"), sigIndex, &sigRef)) return false; AstName moduleName; if (!AstDecodeName(c, &moduleName)) return AstDecodeFail(c, "expected import module name"); if (moduleName.empty()) return AstDecodeFail(c, "module name cannot be empty"); AstName funcName; if (!AstDecodeName(c, &funcName)) return AstDecodeFail(c, "expected import func name"); AstName importName; - if (!AstDecodeGenerateName(c, AstName(MOZ_UTF16("import")), importIndex, &importName)) + if (!AstDecodeGenerateName(c, AstName(u"import"), importIndex, &importName)) return false; *import = new(c.lifo) AstImport(importName, moduleName, funcName, sigRef); if (!*import) return false; return true; } @@ -1373,17 +1373,17 @@ AstDecodeMemorySection(AstDecodeContext& if (!maxSize.isValid()) return AstDecodeFail(c, "maximum memory size too big"); uint8_t exported; if (!c.d.readFixedU8(&exported)) return AstDecodeFail(c, "expected exported byte"); if (exported) { - AstName fieldName(MOZ_UTF16("memory")); + AstName fieldName(u"memory"); AstExport* export_ = new(c.lifo) AstExport(fieldName, DefinitionKind::Memory); if (!export_ || !c.module().append(export_)) return false; } if (!c.d.finishSection(sectionStart, sectionSize)) return AstDecodeFail(c, "memory section byte size mismatch"); @@ -1470,28 +1470,28 @@ AstDecodeFunctionBody(AstDecodeContext & return false; if (!DecodeLocalEntries(c.d, &locals)) return AstDecodeFail(c, "failed decoding local entries"); c.startFunction(&iter, &locals); AstName funcName; - if (!AstDecodeGenerateName(c, AstName(MOZ_UTF16("func")), funcIndex, &funcName)) + if (!AstDecodeGenerateName(c, AstName(u"func"), funcIndex, &funcName)) return false; uint32_t numParams = sig->args().length(); uint32_t numLocals = locals.length(); for (uint32_t i = numParams; i < numLocals; i++) { if (!vars.append(locals[i])) return false; } for (uint32_t i = 0; i < numLocals; i++) { AstName varName; - if (!AstDecodeGenerateName(c, AstName(MOZ_UTF16("var")), i, &varName)) + if (!AstDecodeGenerateName(c, AstName(u"var"), i, &varName)) return false; if (!localsNames.append(varName)) return false; } if (!c.iter().readFunctionStart()) return false; @@ -1509,17 +1509,17 @@ AstDecodeFunctionBody(AstDecodeContext & return false; c.endFunction(); if (c.d.currentPosition() != bodyEnd) return AstDecodeFail(c, "function body length mismatch"); AstRef sigRef; - if (!AstDecodeGenerateRef(c, AstName(MOZ_UTF16("type")), sigIndex, &sigRef)) + if (!AstDecodeGenerateRef(c, AstName(u"type"), sigIndex, &sigRef)) return false; *func = new(c.lifo) AstFunc(funcName, sigRef, Move(vars), Move(localsNames), Move(body)); if (!*func) return false; (*func)->setOffset(offset); return true; @@ -1659,9 +1659,8 @@ wasm::BinaryToAst(JSContext* cx, const u while (!d.done()) { if (!d.skipSection()) return AstDecodeFail(c, "failed to skip unknown section at end"); } *module = result; return true; } -
--- a/js/src/asmjs/WasmTextToBinary.cpp +++ b/js/src/asmjs/WasmTextToBinary.cpp @@ -550,33 +550,33 @@ class WasmTokenStream } }; } // end anonymous namespace WasmToken WasmTokenStream::nan(const char16_t* begin) { - if (consume(MOZ_UTF16(":"))) { - if (!consume(MOZ_UTF16("0x"))) + if (consume(u":")) { + if (!consume(u"0x")) return fail(begin); uint8_t digit; while (cur_ != end_ && IsHexDigit(*cur_, &digit)) cur_++; } return WasmToken(WasmToken::NaN, begin, cur_); } WasmToken WasmTokenStream::literal(const char16_t* begin) { CheckedInt<uint64_t> u = 0; - if (consume(MOZ_UTF16("0x"))) { + if (consume(u"0x")) { if (cur_ == end_) return fail(begin); do { if (*cur_ == '.' || *cur_ == 'p') return LexHexFloatLiteral(begin, end_, &cur_); uint8_t digit; @@ -636,28 +636,28 @@ WasmTokenStream::literal(const char16_t* return WasmToken(u.value(), begin, cur_); } void WasmTokenStream::skipSpaces() { while (cur_ != end_) { char16_t ch = *cur_; - if (ch == ';' && consume(MOZ_UTF16(";;"))) { + if (ch == ';' && consume(u";;")) { // Skipping single line comment. while (cur_ != end_ && !IsWasmNewLine(*cur_)) cur_++; - } else if (ch == '(' && consume(MOZ_UTF16("(;"))) { + } else if (ch == '(' && consume(u"(;")) { // Skipping multi-line and possibly nested comments. size_t level = 1; while (cur_ != end_) { char16_t ch = *cur_; - if (ch == '(' && consume(MOZ_UTF16("(;"))) { + if (ch == '(' && consume(u"(;")) { level++; - } else if (ch == ';' && consume(MOZ_UTF16(";)"))) { + } else if (ch == ';' && consume(u";)")) { if (--level == 0) break; } else { cur_++; if (IsWasmNewLine(ch)) { lineStart_ = cur_; line_++; } @@ -712,635 +712,635 @@ WasmTokenStream::next() return WasmToken(WasmToken::CloseParen, begin, cur_); case '=': cur_++; return WasmToken(WasmToken::Equal, begin, cur_); case '+': case '-': cur_++; - if (consume(MOZ_UTF16("infinity"))) + if (consume(u"infinity")) return WasmToken(WasmToken::Infinity, begin, cur_); - if (consume(MOZ_UTF16("nan"))) + if (consume(u"nan")) return nan(begin); if (!IsWasmDigit(*cur_)) break; MOZ_FALLTHROUGH; case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': return literal(begin); case 'a': - if (consume(MOZ_UTF16("align"))) + if (consume(u"align")) return WasmToken(WasmToken::Align, begin, cur_); break; case 'b': - if (consume(MOZ_UTF16("block"))) + if (consume(u"block")) return WasmToken(WasmToken::Block, begin, cur_); - if (consume(MOZ_UTF16("br"))) { - if (consume(MOZ_UTF16("_table"))) + if (consume(u"br")) { + if (consume(u"_table")) return WasmToken(WasmToken::BrTable, begin, cur_); - if (consume(MOZ_UTF16("_if"))) + if (consume(u"_if")) return WasmToken(WasmToken::BrIf, begin, cur_); return WasmToken(WasmToken::Br, begin, cur_); } break; case 'c': - if (consume(MOZ_UTF16("call"))) { - if (consume(MOZ_UTF16("_indirect"))) + if (consume(u"call")) { + if (consume(u"_indirect")) return WasmToken(WasmToken::CallIndirect, begin, cur_); - if (consume(MOZ_UTF16("_import"))) + if (consume(u"_import")) return WasmToken(WasmToken::CallImport, begin, cur_); return WasmToken(WasmToken::Call, begin, cur_); } break; case 'd': - if (consume(MOZ_UTF16("data"))) + if (consume(u"data")) return WasmToken(WasmToken::Data, begin, cur_); break; case 'e': - if (consume(MOZ_UTF16("elem"))) + if (consume(u"elem")) return WasmToken(WasmToken::Elem, begin, cur_); - if (consume(MOZ_UTF16("else"))) + if (consume(u"else")) return WasmToken(WasmToken::Else, begin, cur_); - if (consume(MOZ_UTF16("export"))) + if (consume(u"export")) return WasmToken(WasmToken::Export, begin, cur_); break; case 'f': - if (consume(MOZ_UTF16("func"))) + if (consume(u"func")) return WasmToken(WasmToken::Func, begin, cur_); - if (consume(MOZ_UTF16("f32"))) { - if (!consume(MOZ_UTF16("."))) + if (consume(u"f32")) { + if (!consume(u".")) return WasmToken(WasmToken::ValueType, ValType::F32, begin, cur_); switch (*cur_) { case 'a': - if (consume(MOZ_UTF16("abs"))) + if (consume(u"abs")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Abs, begin, cur_); - if (consume(MOZ_UTF16("add"))) + if (consume(u"add")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Add, begin, cur_); break; case 'c': - if (consume(MOZ_UTF16("ceil"))) + if (consume(u"ceil")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Ceil, begin, cur_); - if (consume(MOZ_UTF16("const"))) + if (consume(u"const")) return WasmToken(WasmToken::Const, ValType::F32, begin, cur_); - if (consume(MOZ_UTF16("convert_s/i32"))) { + if (consume(u"convert_s/i32")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F32ConvertSI32, begin, cur_); } - if (consume(MOZ_UTF16("convert_u/i32"))) { + if (consume(u"convert_u/i32")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F32ConvertUI32, begin, cur_); } - if (consume(MOZ_UTF16("convert_s/i64"))) { + if (consume(u"convert_s/i64")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F32ConvertSI64, begin, cur_); } - if (consume(MOZ_UTF16("convert_u/i64"))) { + if (consume(u"convert_u/i64")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F32ConvertUI64, begin, cur_); } - if (consume(MOZ_UTF16("copysign"))) + if (consume(u"copysign")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32CopySign, begin, cur_); break; case 'd': - if (consume(MOZ_UTF16("demote/f64"))) + if (consume(u"demote/f64")) return WasmToken(WasmToken::ConversionOpcode, Expr::F32DemoteF64, begin, cur_); - if (consume(MOZ_UTF16("div"))) + if (consume(u"div")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Div, begin, cur_); break; case 'e': - if (consume(MOZ_UTF16("eq"))) + if (consume(u"eq")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Eq, begin, cur_); break; case 'f': - if (consume(MOZ_UTF16("floor"))) + if (consume(u"floor")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Floor, begin, cur_); break; case 'g': - if (consume(MOZ_UTF16("ge"))) + if (consume(u"ge")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Ge, begin, cur_); - if (consume(MOZ_UTF16("gt"))) + if (consume(u"gt")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Gt, begin, cur_); break; case 'l': - if (consume(MOZ_UTF16("le"))) + if (consume(u"le")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Le, begin, cur_); - if (consume(MOZ_UTF16("lt"))) + if (consume(u"lt")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Lt, begin, cur_); - if (consume(MOZ_UTF16("load"))) + if (consume(u"load")) return WasmToken(WasmToken::Load, Expr::F32Load, begin, cur_); break; case 'm': - if (consume(MOZ_UTF16("max"))) + if (consume(u"max")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Max, begin, cur_); - if (consume(MOZ_UTF16("min"))) + if (consume(u"min")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Min, begin, cur_); - if (consume(MOZ_UTF16("mul"))) + if (consume(u"mul")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Mul, begin, cur_); break; case 'n': - if (consume(MOZ_UTF16("nearest"))) + if (consume(u"nearest")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Nearest, begin, cur_); - if (consume(MOZ_UTF16("neg"))) + if (consume(u"neg")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Neg, begin, cur_); - if (consume(MOZ_UTF16("ne"))) + if (consume(u"ne")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F32Ne, begin, cur_); break; case 'r': - if (consume(MOZ_UTF16("reinterpret/i32"))) + if (consume(u"reinterpret/i32")) return WasmToken(WasmToken::ConversionOpcode, Expr::F32ReinterpretI32, begin, cur_); break; case 's': - if (consume(MOZ_UTF16("sqrt"))) + if (consume(u"sqrt")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Sqrt, begin, cur_); - if (consume(MOZ_UTF16("sub"))) + if (consume(u"sub")) return WasmToken(WasmToken::BinaryOpcode, Expr::F32Sub, begin, cur_); - if (consume(MOZ_UTF16("store"))) + if (consume(u"store")) return WasmToken(WasmToken::Store, Expr::F32Store, begin, cur_); break; case 't': - if (consume(MOZ_UTF16("trunc"))) + if (consume(u"trunc")) return WasmToken(WasmToken::UnaryOpcode, Expr::F32Trunc, begin, cur_); break; } break; } - if (consume(MOZ_UTF16("f64"))) { - if (!consume(MOZ_UTF16("."))) + if (consume(u"f64")) { + if (!consume(u".")) return WasmToken(WasmToken::ValueType, ValType::F64, begin, cur_); switch (*cur_) { case 'a': - if (consume(MOZ_UTF16("abs"))) + if (consume(u"abs")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Abs, begin, cur_); - if (consume(MOZ_UTF16("add"))) + if (consume(u"add")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Add, begin, cur_); break; case 'c': - if (consume(MOZ_UTF16("ceil"))) + if (consume(u"ceil")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Ceil, begin, cur_); - if (consume(MOZ_UTF16("const"))) + if (consume(u"const")) return WasmToken(WasmToken::Const, ValType::F64, begin, cur_); - if (consume(MOZ_UTF16("convert_s/i32"))) { + if (consume(u"convert_s/i32")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F64ConvertSI32, begin, cur_); } - if (consume(MOZ_UTF16("convert_u/i32"))) { + if (consume(u"convert_u/i32")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F64ConvertUI32, begin, cur_); } - if (consume(MOZ_UTF16("convert_s/i64"))) { + if (consume(u"convert_s/i64")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F64ConvertSI64, begin, cur_); } - if (consume(MOZ_UTF16("convert_u/i64"))) { + if (consume(u"convert_u/i64")) { return WasmToken(WasmToken::ConversionOpcode, Expr::F64ConvertUI64, begin, cur_); } - if (consume(MOZ_UTF16("copysign"))) + if (consume(u"copysign")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64CopySign, begin, cur_); break; case 'd': - if (consume(MOZ_UTF16("div"))) + if (consume(u"div")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Div, begin, cur_); break; case 'e': - if (consume(MOZ_UTF16("eq"))) + if (consume(u"eq")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Eq, begin, cur_); break; case 'f': - if (consume(MOZ_UTF16("floor"))) + if (consume(u"floor")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Floor, begin, cur_); break; case 'g': - if (consume(MOZ_UTF16("ge"))) + if (consume(u"ge")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Ge, begin, cur_); - if (consume(MOZ_UTF16("gt"))) + if (consume(u"gt")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Gt, begin, cur_); break; case 'l': - if (consume(MOZ_UTF16("le"))) + if (consume(u"le")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Le, begin, cur_); - if (consume(MOZ_UTF16("lt"))) + if (consume(u"lt")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Lt, begin, cur_); - if (consume(MOZ_UTF16("load"))) + if (consume(u"load")) return WasmToken(WasmToken::Load, Expr::F64Load, begin, cur_); break; case 'm': - if (consume(MOZ_UTF16("max"))) + if (consume(u"max")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Max, begin, cur_); - if (consume(MOZ_UTF16("min"))) + if (consume(u"min")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Min, begin, cur_); - if (consume(MOZ_UTF16("mul"))) + if (consume(u"mul")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Mul, begin, cur_); break; case 'n': - if (consume(MOZ_UTF16("nearest"))) + if (consume(u"nearest")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Nearest, begin, cur_); - if (consume(MOZ_UTF16("neg"))) + if (consume(u"neg")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Neg, begin, cur_); - if (consume(MOZ_UTF16("ne"))) + if (consume(u"ne")) return WasmToken(WasmToken::ComparisonOpcode, Expr::F64Ne, begin, cur_); break; case 'p': - if (consume(MOZ_UTF16("promote/f32"))) + if (consume(u"promote/f32")) return WasmToken(WasmToken::ConversionOpcode, Expr::F64PromoteF32, begin, cur_); break; case 'r': - if (consume(MOZ_UTF16("reinterpret/i64"))) + if (consume(u"reinterpret/i64")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64ReinterpretI64, begin, cur_); break; case 's': - if (consume(MOZ_UTF16("sqrt"))) + if (consume(u"sqrt")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Sqrt, begin, cur_); - if (consume(MOZ_UTF16("sub"))) + if (consume(u"sub")) return WasmToken(WasmToken::BinaryOpcode, Expr::F64Sub, begin, cur_); - if (consume(MOZ_UTF16("store"))) + if (consume(u"store")) return WasmToken(WasmToken::Store, Expr::F64Store, begin, cur_); break; case 't': - if (consume(MOZ_UTF16("trunc"))) + if (consume(u"trunc")) return WasmToken(WasmToken::UnaryOpcode, Expr::F64Trunc, begin, cur_); break; } break; } break; case 'g': - if (consume(MOZ_UTF16("get_local"))) + if (consume(u"get_local")) return WasmToken(WasmToken::GetLocal, begin, cur_); break; case 'i': - if (consume(MOZ_UTF16("i32"))) { - if (!consume(MOZ_UTF16("."))) + if (consume(u"i32")) { + if (!consume(u".")) return WasmToken(WasmToken::ValueType, ValType::I32, begin, cur_); switch (*cur_) { case 'a': - if (consume(MOZ_UTF16("add"))) + if (consume(u"add")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Add, begin, cur_); - if (consume(MOZ_UTF16("and"))) + if (consume(u"and")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32And, begin, cur_); break; case 'c': - if (consume(MOZ_UTF16("const"))) + if (consume(u"const")) return WasmToken(WasmToken::Const, ValType::I32, begin, cur_); - if (consume(MOZ_UTF16("clz"))) + if (consume(u"clz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I32Clz, begin, cur_); - if (consume(MOZ_UTF16("ctz"))) + if (consume(u"ctz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I32Ctz, begin, cur_); break; case 'd': - if (consume(MOZ_UTF16("div_s"))) + if (consume(u"div_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32DivS, begin, cur_); - if (consume(MOZ_UTF16("div_u"))) + if (consume(u"div_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32DivU, begin, cur_); break; case 'e': - if (consume(MOZ_UTF16("eqz"))) + if (consume(u"eqz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I32Eqz, begin, cur_); - if (consume(MOZ_UTF16("eq"))) + if (consume(u"eq")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32Eq, begin, cur_); break; case 'g': - if (consume(MOZ_UTF16("ge_s"))) + if (consume(u"ge_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32GeS, begin, cur_); - if (consume(MOZ_UTF16("ge_u"))) + if (consume(u"ge_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32GeU, begin, cur_); - if (consume(MOZ_UTF16("gt_s"))) + if (consume(u"gt_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32GtS, begin, cur_); - if (consume(MOZ_UTF16("gt_u"))) + if (consume(u"gt_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32GtU, begin, cur_); break; case 'l': - if (consume(MOZ_UTF16("le_s"))) + if (consume(u"le_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32LeS, begin, cur_); - if (consume(MOZ_UTF16("le_u"))) + if (consume(u"le_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32LeU, begin, cur_); - if (consume(MOZ_UTF16("lt_s"))) + if (consume(u"lt_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32LtS, begin, cur_); - if (consume(MOZ_UTF16("lt_u"))) + if (consume(u"lt_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32LtU, begin, cur_); - if (consume(MOZ_UTF16("load"))) { + if (consume(u"load")) { if (IsWasmSpace(*cur_)) return WasmToken(WasmToken::Load, Expr::I32Load, begin, cur_); - if (consume(MOZ_UTF16("8_s"))) + if (consume(u"8_s")) return WasmToken(WasmToken::Load, Expr::I32Load8S, begin, cur_); - if (consume(MOZ_UTF16("8_u"))) + if (consume(u"8_u")) return WasmToken(WasmToken::Load, Expr::I32Load8U, begin, cur_); - if (consume(MOZ_UTF16("16_s"))) + if (consume(u"16_s")) return WasmToken(WasmToken::Load, Expr::I32Load16S, begin, cur_); - if (consume(MOZ_UTF16("16_u"))) + if (consume(u"16_u")) return WasmToken(WasmToken::Load, Expr::I32Load16U, begin, cur_); break; } break; case 'm': - if (consume(MOZ_UTF16("mul"))) + if (consume(u"mul")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Mul, begin, cur_); break; case 'n': - if (consume(MOZ_UTF16("ne"))) + if (consume(u"ne")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I32Ne, begin, cur_); break; case 'o': - if (consume(MOZ_UTF16("or"))) + if (consume(u"or")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Or, begin, cur_); break; case 'p': - if (consume(MOZ_UTF16("popcnt"))) + if (consume(u"popcnt")) return WasmToken(WasmToken::UnaryOpcode, Expr::I32Popcnt, begin, cur_); break; case 'r': - if (consume(MOZ_UTF16("reinterpret/f32"))) + if (consume(u"reinterpret/f32")) return WasmToken(WasmToken::UnaryOpcode, Expr::I32ReinterpretF32, begin, cur_); - if (consume(MOZ_UTF16("rem_s"))) + if (consume(u"rem_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32RemS, begin, cur_); - if (consume(MOZ_UTF16("rem_u"))) + if (consume(u"rem_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32RemU, begin, cur_); - if (consume(MOZ_UTF16("rotr"))) + if (consume(u"rotr")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Rotr, begin, cur_); - if (consume(MOZ_UTF16("rotl"))) + if (consume(u"rotl")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Rotl, begin, cur_); break; case 's': - if (consume(MOZ_UTF16("sub"))) + if (consume(u"sub")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Sub, begin, cur_); - if (consume(MOZ_UTF16("shl"))) + if (consume(u"shl")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Shl, begin, cur_); - if (consume(MOZ_UTF16("shr_s"))) + if (consume(u"shr_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32ShrS, begin, cur_); - if (consume(MOZ_UTF16("shr_u"))) + if (consume(u"shr_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32ShrU, begin, cur_); - if (consume(MOZ_UTF16("store"))) { + if (consume(u"store")) { if (IsWasmSpace(*cur_)) return WasmToken(WasmToken::Store, Expr::I32Store, begin, cur_); - if (consume(MOZ_UTF16("8"))) + if (consume(u"8")) return WasmToken(WasmToken::Store, Expr::I32Store8, begin, cur_); - if (consume(MOZ_UTF16("16"))) + if (consume(u"16")) return WasmToken(WasmToken::Store, Expr::I32Store16, begin, cur_); break; } break; case 't': - if (consume(MOZ_UTF16("trunc_s/f32"))) + if (consume(u"trunc_s/f32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I32TruncSF32, begin, cur_); - if (consume(MOZ_UTF16("trunc_s/f64"))) + if (consume(u"trunc_s/f64")) return WasmToken(WasmToken::ConversionOpcode, Expr::I32TruncSF64, begin, cur_); - if (consume(MOZ_UTF16("trunc_u/f32"))) + if (consume(u"trunc_u/f32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I32TruncUF32, begin, cur_); - if (consume(MOZ_UTF16("trunc_u/f64"))) + if (consume(u"trunc_u/f64")) return WasmToken(WasmToken::ConversionOpcode, Expr::I32TruncUF64, begin, cur_); break; case 'w': - if (consume(MOZ_UTF16("wrap/i64"))) + if (consume(u"wrap/i64")) return WasmToken(WasmToken::ConversionOpcode, Expr::I32WrapI64, begin, cur_); break; case 'x': - if (consume(MOZ_UTF16("xor"))) + if (consume(u"xor")) return WasmToken(WasmToken::BinaryOpcode, Expr::I32Xor, begin, cur_); break; } break; } - if (consume(MOZ_UTF16("i64"))) { - if (!consume(MOZ_UTF16("."))) + if (consume(u"i64")) { + if (!consume(u".")) return WasmToken(WasmToken::ValueType, ValType::I64, begin, cur_); switch (*cur_) { case 'a': - if (consume(MOZ_UTF16("add"))) + if (consume(u"add")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Add, begin, cur_); - if (consume(MOZ_UTF16("and"))) + if (consume(u"and")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64And, begin, cur_); break; case 'c': - if (consume(MOZ_UTF16("const"))) + if (consume(u"const")) return WasmToken(WasmToken::Const, ValType::I64, begin, cur_); - if (consume(MOZ_UTF16("clz"))) + if (consume(u"clz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I64Clz, begin, cur_); - if (consume(MOZ_UTF16("ctz"))) + if (consume(u"ctz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I64Ctz, begin, cur_); break; case 'd': - if (consume(MOZ_UTF16("div_s"))) + if (consume(u"div_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64DivS, begin, cur_); - if (consume(MOZ_UTF16("div_u"))) + if (consume(u"div_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64DivU, begin, cur_); break; case 'e': - if (consume(MOZ_UTF16("eqz"))) + if (consume(u"eqz")) return WasmToken(WasmToken::UnaryOpcode, Expr::I64Eqz, begin, cur_); - if (consume(MOZ_UTF16("eq"))) + if (consume(u"eq")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64Eq, begin, cur_); - if (consume(MOZ_UTF16("extend_s/i32"))) + if (consume(u"extend_s/i32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64ExtendSI32, begin, cur_); - if (consume(MOZ_UTF16("extend_u/i32"))) + if (consume(u"extend_u/i32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64ExtendUI32, begin, cur_); break; case 'g': - if (consume(MOZ_UTF16("ge_s"))) + if (consume(u"ge_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64GeS, begin, cur_); - if (consume(MOZ_UTF16("ge_u"))) + if (consume(u"ge_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64GeU, begin, cur_); - if (consume(MOZ_UTF16("gt_s"))) + if (consume(u"gt_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64GtS, begin, cur_); - if (consume(MOZ_UTF16("gt_u"))) + if (consume(u"gt_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64GtU, begin, cur_); break; case 'l': - if (consume(MOZ_UTF16("le_s"))) + if (consume(u"le_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64LeS, begin, cur_); - if (consume(MOZ_UTF16("le_u"))) + if (consume(u"le_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64LeU, begin, cur_); - if (consume(MOZ_UTF16("lt_s"))) + if (consume(u"lt_s")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64LtS, begin, cur_); - if (consume(MOZ_UTF16("lt_u"))) + if (consume(u"lt_u")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64LtU, begin, cur_); - if (consume(MOZ_UTF16("load"))) { + if (consume(u"load")) { if (IsWasmSpace(*cur_)) return WasmToken(WasmToken::Load, Expr::I64Load, begin, cur_); - if (consume(MOZ_UTF16("8_s"))) + if (consume(u"8_s")) return WasmToken(WasmToken::Load, Expr::I64Load8S, begin, cur_); - if (consume(MOZ_UTF16("8_u"))) + if (consume(u"8_u")) return WasmToken(WasmToken::Load, Expr::I64Load8U, begin, cur_); - if (consume(MOZ_UTF16("16_s"))) + if (consume(u"16_s")) return WasmToken(WasmToken::Load, Expr::I64Load16S, begin, cur_); - if (consume(MOZ_UTF16("16_u"))) + if (consume(u"16_u")) return WasmToken(WasmToken::Load, Expr::I64Load16U, begin, cur_); - if (consume(MOZ_UTF16("32_s"))) + if (consume(u"32_s")) return WasmToken(WasmToken::Load, Expr::I64Load32S, begin, cur_); - if (consume(MOZ_UTF16("32_u"))) + if (consume(u"32_u")) return WasmToken(WasmToken::Load, Expr::I64Load32U, begin, cur_); break; } break; case 'm': - if (consume(MOZ_UTF16("mul"))) + if (consume(u"mul")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Mul, begin, cur_); break; case 'n': - if (consume(MOZ_UTF16("ne"))) + if (consume(u"ne")) return WasmToken(WasmToken::ComparisonOpcode, Expr::I64Ne, begin, cur_); break; case 'o': - if (consume(MOZ_UTF16("or"))) + if (consume(u"or")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Or, begin, cur_); break; case 'p': - if (consume(MOZ_UTF16("popcnt"))) + if (consume(u"popcnt")) return WasmToken(WasmToken::UnaryOpcode, Expr::I64Popcnt, begin, cur_); break; case 'r': - if (consume(MOZ_UTF16("reinterpret/f64"))) + if (consume(u"reinterpret/f64")) return WasmToken(WasmToken::UnaryOpcode, Expr::I64ReinterpretF64, begin, cur_); - if (consume(MOZ_UTF16("rem_s"))) + if (consume(u"rem_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64RemS, begin, cur_); - if (consume(MOZ_UTF16("rem_u"))) + if (consume(u"rem_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64RemU, begin, cur_); - if (consume(MOZ_UTF16("rotr"))) + if (consume(u"rotr")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Rotr, begin, cur_); - if (consume(MOZ_UTF16("rotl"))) + if (consume(u"rotl")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Rotl, begin, cur_); break; case 's': - if (consume(MOZ_UTF16("sub"))) + if (consume(u"sub")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Sub, begin, cur_); - if (consume(MOZ_UTF16("shl"))) + if (consume(u"shl")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Shl, begin, cur_); - if (consume(MOZ_UTF16("shr_s"))) + if (consume(u"shr_s")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64ShrS, begin, cur_); - if (consume(MOZ_UTF16("shr_u"))) + if (consume(u"shr_u")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64ShrU, begin, cur_); - if (consume(MOZ_UTF16("store"))) { + if (consume(u"store")) { if (IsWasmSpace(*cur_)) return WasmToken(WasmToken::Store, Expr::I64Store, begin, cur_); - if (consume(MOZ_UTF16("8"))) + if (consume(u"8")) return WasmToken(WasmToken::Store, Expr::I64Store8, begin, cur_); - if (consume(MOZ_UTF16("16"))) + if (consume(u"16")) return WasmToken(WasmToken::Store, Expr::I64Store16, begin, cur_); - if (consume(MOZ_UTF16("32"))) + if (consume(u"32")) return WasmToken(WasmToken::Store, Expr::I64Store32, begin, cur_); break; } break; case 't': - if (consume(MOZ_UTF16("trunc_s/f32"))) + if (consume(u"trunc_s/f32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64TruncSF32, begin, cur_); - if (consume(MOZ_UTF16("trunc_s/f64"))) + if (consume(u"trunc_s/f64")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64TruncSF64, begin, cur_); - if (consume(MOZ_UTF16("trunc_u/f32"))) + if (consume(u"trunc_u/f32")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64TruncUF32, begin, cur_); - if (consume(MOZ_UTF16("trunc_u/f64"))) + if (consume(u"trunc_u/f64")) return WasmToken(WasmToken::ConversionOpcode, Expr::I64TruncUF64, begin, cur_); break; case 'x': - if (consume(MOZ_UTF16("xor"))) + if (consume(u"xor")) return WasmToken(WasmToken::BinaryOpcode, Expr::I64Xor, begin, cur_); break; } break; } - if (consume(MOZ_UTF16("import"))) + if (consume(u"import")) return WasmToken(WasmToken::Import, begin, cur_); - if (consume(MOZ_UTF16("infinity"))) + if (consume(u"infinity")) return WasmToken(WasmToken::Infinity, begin, cur_); - if (consume(MOZ_UTF16("if"))) + if (consume(u"if")) return WasmToken(WasmToken::If, begin, cur_); break; case 'l': - if (consume(MOZ_UTF16("local"))) + if (consume(u"local")) return WasmToken(WasmToken::Local, begin, cur_); - if (consume(MOZ_UTF16("loop"))) + if (consume(u"loop")) return WasmToken(WasmToken::Loop, begin, cur_); break; case 'm': - if (consume(MOZ_UTF16("module"))) + if (consume(u"module")) return WasmToken(WasmToken::Module, begin, cur_); - if (consume(MOZ_UTF16("memory"))) + if (consume(u"memory")) return WasmToken(WasmToken::Memory, begin, cur_); break; case 'n': - if (consume(MOZ_UTF16("nan"))) + if (consume(u"nan")) return nan(begin); - if (consume(MOZ_UTF16("nop"))) + if (consume(u"nop")) return WasmToken(WasmToken::Nop, begin, cur_); break; case 'o': - if (consume(MOZ_UTF16("offset"))) + if (consume(u"offset")) return WasmToken(WasmToken::Offset, begin, cur_); break; case 'p': - if (consume(MOZ_UTF16("param"))) + if (consume(u"param")) return WasmToken(WasmToken::Param, begin, cur_); break; case 'r': - if (consume(MOZ_UTF16("resizable"))) + if (consume(u"resizable")) return WasmToken(WasmToken::Resizable, begin, cur_); - if (consume(MOZ_UTF16("result"))) + if (consume(u"result")) return WasmToken(WasmToken::Result, begin, cur_); - if (consume(MOZ_UTF16("return"))) + if (consume(u"return")) return WasmToken(WasmToken::Return, begin, cur_); break; case 's': - if (consume(MOZ_UTF16("select"))) + if (consume(u"select")) return WasmToken(WasmToken::TernaryOpcode, Expr::Select, begin, cur_); - if (consume(MOZ_UTF16("set_local"))) + if (consume(u"set_local")) return WasmToken(WasmToken::SetLocal, begin, cur_); - if (consume(MOZ_UTF16("segment"))) + if (consume(u"segment")) return WasmToken(WasmToken::Segment, begin, cur_); - if (consume(MOZ_UTF16("start"))) + if (consume(u"start")) return WasmToken(WasmToken::Start, begin, cur_); break; case 't': - if (consume(MOZ_UTF16("table"))) + if (consume(u"table")) return WasmToken(WasmToken::Table, begin, cur_); - if (consume(MOZ_UTF16("then"))) + if (consume(u"then")) return WasmToken(WasmToken::Then, begin, cur_); - if (consume(MOZ_UTF16("type"))) + if (consume(u"type")) return WasmToken(WasmToken::Type, begin, cur_); break; case 'u': - if (consume(MOZ_UTF16("unreachable"))) + if (consume(u"unreachable")) return WasmToken(WasmToken::Unreachable, begin, cur_); break; default: break; } return fail(begin);
--- a/js/src/jsapi-tests/testDeflateStringToUTF8Buffer.cpp +++ b/js/src/jsapi-tests/testDeflateStringToUTF8Buffer.cpp @@ -95,17 +95,17 @@ BEGIN_TEST(test_DeflateStringToUTF8Buffe CHECK_EQUAL(dstlen, 0u); CHECK_EQUAL(numchars, 0u); } // Test with a Latin-1 string, which calls JSFlatString::latin1Chars // like with the ASCII string but generates UTF-8 output that is different // from the ASCII input. - str = JS_NewUCStringCopyZ(cx, MOZ_UTF16("\xD3\x68\xE3\xEF")); // u"Óhãï" + str = JS_NewUCStringCopyZ(cx, u"\xD3\x68\xE3\xEF"); // u"Óhãï" MOZ_RELEASE_ASSERT(str); flatStr = JS_FlattenString(cx, str); { const unsigned char expected[] = { 0xC3, 0x93, 0x68, 0xC3, 0xA3, 0xC3, 0xAF, 0x1 }; memset(actual, 0x1, 100); JS::DeflateStringToUTF8Buffer(flatStr, range); CHECK_EQUAL(memcmp(actual, expected, sizeof(expected)), 0); @@ -187,17 +187,17 @@ BEGIN_TEST(test_DeflateStringToUTF8Buffe CHECK_EQUAL(memcmp(actual, expected, sizeof(expected)), 0); CHECK_EQUAL(dstlen, 0u); CHECK_EQUAL(numchars, 0u); } // Test with a UTF-16 string, which calls JSFlatString::twoByteChars // to retrieve the characters from the string. - str = JS_NewUCStringCopyZ(cx, MOZ_UTF16("\x038C\x0068\x0203\x0457")); // u"Όhȃї" + str = JS_NewUCStringCopyZ(cx, u"\x038C\x0068\x0203\x0457"); // u"Όhȃї" MOZ_RELEASE_ASSERT(str); flatStr = JS_FlattenString(cx, str); { const unsigned char expected[] = { 0xCE, 0x8C, 0x68, 0xC8, 0x83, 0xD1, 0x97, 0x1 }; memset(actual, 0x1, 100); JS::DeflateStringToUTF8Buffer(flatStr, range); CHECK_EQUAL(memcmp(actual, expected, sizeof(expected)), 0);
--- a/js/src/jsapi-tests/testJSEvaluateScript.cpp +++ b/js/src/jsapi-tests/testJSEvaluateScript.cpp @@ -6,17 +6,17 @@ using mozilla::ArrayLength; BEGIN_TEST(testJSEvaluateScript) { JS::RootedObject obj(cx, JS_NewPlainObject(cx)); CHECK(obj); - static const char16_t src[] = MOZ_UTF16("var x = 5;"); + static const char16_t src[] = u"var x = 5;"; JS::RootedValue retval(cx); JS::CompileOptions opts(cx); JS::AutoObjectVector scopeChain(cx); CHECK(scopeChain.append(obj)); CHECK(JS::Evaluate(cx, scopeChain, opts.setFileAndLine(__FILE__, __LINE__), src, ArrayLength(src) - 1, &retval));
--- a/js/src/jsapi-tests/testSharedImmutableStringsCache.cpp +++ b/js/src/jsapi-tests/testSharedImmutableStringsCache.cpp @@ -10,21 +10,21 @@ #include "jsapi-tests/tests.h" #include "vm/SharedImmutableStringsCache.h" const int NUM_THREADS = 256; const int NUM_ITERATIONS = 256; const int NUM_STRINGS = 4; -const char16_t* STRINGS[NUM_STRINGS] = { - MOZ_UTF16("uno"), - MOZ_UTF16("dos"), - MOZ_UTF16("tres"), - MOZ_UTF16("quattro") +const char16_t *const STRINGS[NUM_STRINGS] = { + u"uno", + u"dos", + u"tres", + u"quattro" }; struct CacheAndIndex { js::SharedImmutableStringsCache* cache; int index; CacheAndIndex(js::SharedImmutableStringsCache* cache, int index)
--- a/js/src/jsapi-tests/testUbiNode.cpp +++ b/js/src/jsapi-tests/testUbiNode.cpp @@ -57,17 +57,17 @@ class Concrete<FakeNode> : public Base Node::Size size(mozilla::MallocSizeOf) const override { return 1; } static const char16_t concreteTypeName[]; const char16_t* typeName() const override { return concreteTypeName; } }; -const char16_t Concrete<FakeNode>::concreteTypeName[] = MOZ_UTF16("FakeNode"); +const char16_t Concrete<FakeNode>::concreteTypeName[] = u"FakeNode"; } // namespace ubi } // namespace JS // ubi::Node::zone works BEGIN_TEST(test_ubiNodeZone) { RootedObject global1(cx, JS::CurrentGlobalOrNull(cx)); @@ -152,17 +152,17 @@ BEGIN_TEST(test_ubiNodeJSObjectConstruct { JS::RootedValue val(cx); EVAL("this.Ctor = function Ctor() {}; new Ctor", &val); CHECK(val.isObject()); UniqueTwoByteChars ctorName; CHECK(JS::ubi::Node(&val.toObject()).jsObjectConstructorName(cx, ctorName)); CHECK(ctorName); - CHECK(js_strcmp(ctorName.get(), MOZ_UTF16("Ctor")) == 0); + CHECK(js_strcmp(ctorName.get(), u"Ctor") == 0); return true; } END_TEST(test_ubiNodeJSObjectConstructorName) template <typename F, typename G> static bool checkString(const char* expected, F fillBufferFunction, G stringGetterFunction) @@ -933,19 +933,19 @@ BEGIN_TEST(test_JS_ubi_ShortestPaths_mul // |x |y |z // | | | // | V | // | .---. | // '---->| b |<----' // '---' FakeNode a('a'); FakeNode b('b'); - CHECK(a.addEdgeTo(b, MOZ_UTF16("x"))); - CHECK(a.addEdgeTo(b, MOZ_UTF16("y"))); - CHECK(a.addEdgeTo(b, MOZ_UTF16("z"))); + CHECK(a.addEdgeTo(b, u"x")); + CHECK(a.addEdgeTo(b, u"y")); + CHECK(a.addEdgeTo(b, u"z")); mozilla::Maybe<JS::ubi::ShortestPaths> maybeShortestPaths; { JS::AutoCheckCannotGC noGC(rt); JS::ubi::NodeSet targets; CHECK(targets.init()); CHECK(targets.put(&b));
--- a/js/src/jsexn.cpp +++ b/js/src/jsexn.cpp @@ -634,17 +634,17 @@ ErrorReportToString(JSContext* cx, JSErr if (type != JSEXN_WARN) str = ClassName(GetExceptionProtoKey(type), cx); /* * If "str" is null at this point, that means we just want to use * reportp->ucmessage without prefixing it with anything. */ if (str) { - RootedString separator(cx, JS_NewUCStringCopyN(cx, MOZ_UTF16(": "), 2)); + RootedString separator(cx, JS_NewUCStringCopyN(cx, u": ", 2)); if (!separator) return nullptr; str = ConcatStrings<CanGC>(cx, str, separator); if (!str) return nullptr; } RootedString message(cx, JS_NewUCStringCopyZ(cx, reportp->ucmessage));
--- a/js/src/jsobj.cpp +++ b/js/src/jsobj.cpp @@ -3828,17 +3828,17 @@ JS::ubi::Concrete<JSObject>::size(mozill if (!obj.isTenured()) return obj.sizeOfIncludingThisInNursery(); JS::ClassInfo info; obj.addSizeOfExcludingThis(mallocSizeOf, &info); return obj.tenuredSizeOfThis() + info.sizeOfAllThings(); } -const char16_t JS::ubi::Concrete<JSObject>::concreteTypeName[] = MOZ_UTF16("JSObject"); +const char16_t JS::ubi::Concrete<JSObject>::concreteTypeName[] = u"JSObject"; void JSObject::traceChildren(JSTracer* trc) { TraceEdge(trc, &group_, "group"); const Class* clasp = group_->clasp(); if (clasp->isNative()) {
--- a/js/src/jsprf.cpp +++ b/js/src/jsprf.cpp @@ -313,17 +313,17 @@ static bool cvt_f(SprintfState* ss, doub } #endif snprintf_literal(fout, fin, d); return (*ss->stuff)(ss, fout, strlen(fout)); } static inline const char* generic_null_str(const char*) { return "(null)"; } -static inline const char16_t* generic_null_str(const char16_t*) { return MOZ_UTF16("(null)"); } +static inline const char16_t* generic_null_str(const char16_t*) { return u"(null)"; } static inline size_t generic_strlen(const char* s) { return strlen(s); } static inline size_t generic_strlen(const char16_t* s) { return js_strlen(s); } /* * Convert a string into its printable form. "width" is the output * width. "prec" is the maximum number of characters of "s" to output, * where -1 means until NUL.
--- a/js/src/vm/Runtime.cpp +++ b/js/src/vm/Runtime.cpp @@ -596,17 +596,17 @@ InvokeInterruptCallback(JSContext* cx) JSString* stack = ComputeStackString(cx); JSFlatString* flat = stack ? stack->ensureFlat(cx) : nullptr; const char16_t* chars; AutoStableStringChars stableChars(cx); if (flat && stableChars.initTwoByte(cx, flat)) chars = stableChars.twoByteRange().start().get(); else - chars = MOZ_UTF16("(stack not available)"); + chars = u"(stack not available)"; JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_WARNING, GetErrorMessage, nullptr, JSMSG_TERMINATED, chars); return false; } void JSRuntime::resetJitStackLimit()
--- a/js/src/vm/String.cpp +++ b/js/src/vm/String.cpp @@ -77,17 +77,17 @@ JS::ubi::Concrete<JSString>::size(mozill // We can't use mallocSizeof on things in the nursery. At the moment, // strings are never in the nursery, but that may change. MOZ_ASSERT(!IsInsideNursery(&str)); size += str.sizeOfExcludingThis(mallocSizeOf); return size; } -const char16_t JS::ubi::Concrete<JSString>::concreteTypeName[] = MOZ_UTF16("JSString"); +const char16_t JS::ubi::Concrete<JSString>::concreteTypeName[] = u"JSString"; #ifdef DEBUG template <typename CharT> /*static */ void JSString::dumpChars(const CharT* s, size_t n, FILE* fp) { if (n == SIZE_MAX) {
--- a/js/src/vm/UbiNode.cpp +++ b/js/src/vm/UbiNode.cpp @@ -382,23 +382,23 @@ Concrete<JSObject>::jsObjectConstructorN mozilla::Range<char16_t> chars(outName.get(), size); if (!JS_CopyStringChars(cx, chars, name)) return false; outName[len] = '\0'; return true; } -const char16_t Concrete<JS::Symbol>::concreteTypeName[] = MOZ_UTF16("JS::Symbol"); -const char16_t Concrete<JSScript>::concreteTypeName[] = MOZ_UTF16("JSScript"); -const char16_t Concrete<js::LazyScript>::concreteTypeName[] = MOZ_UTF16("js::LazyScript"); -const char16_t Concrete<js::jit::JitCode>::concreteTypeName[] = MOZ_UTF16("js::jit::JitCode"); -const char16_t Concrete<js::Shape>::concreteTypeName[] = MOZ_UTF16("js::Shape"); -const char16_t Concrete<js::BaseShape>::concreteTypeName[] = MOZ_UTF16("js::BaseShape"); -const char16_t Concrete<js::ObjectGroup>::concreteTypeName[] = MOZ_UTF16("js::ObjectGroup"); +const char16_t Concrete<JS::Symbol>::concreteTypeName[] = u"JS::Symbol"; +const char16_t Concrete<JSScript>::concreteTypeName[] = u"JSScript"; +const char16_t Concrete<js::LazyScript>::concreteTypeName[] = u"js::LazyScript"; +const char16_t Concrete<js::jit::JitCode>::concreteTypeName[] = u"js::jit::JitCode"; +const char16_t Concrete<js::Shape>::concreteTypeName[] = u"js::Shape"; +const char16_t Concrete<js::BaseShape>::concreteTypeName[] = u"js::BaseShape"; +const char16_t Concrete<js::ObjectGroup>::concreteTypeName[] = u"js::ObjectGroup"; namespace JS { namespace ubi { RootList::RootList(JSRuntime* rt, Maybe<AutoCheckCannotGC>& noGC, bool wantNames /* = false */) : noGC(noGC), rt(rt), edges(), @@ -473,17 +473,17 @@ RootList::init(HandleObject debuggees) } if (!init(debuggeeCompartments)) return false; // Ensure that each of our debuggee globals are in the root list. for (js::WeakGlobalObjectSet::Range r = dbg->allDebuggees(); !r.empty(); r.popFront()) { if (!addRoot(JS::ubi::Node(static_cast<JSObject*>(r.front())), - MOZ_UTF16("debuggee global"))) + u"debuggee global")) { return false; } } return true; } @@ -498,17 +498,17 @@ RootList::addRoot(Node node, const char1 name = js::DuplicateString(edgeName); if (!name) return false; } return edges.append(mozilla::Move(Edge(name.release(), node))); } -const char16_t Concrete<RootList>::concreteTypeName[] = MOZ_UTF16("JS::ubi::RootList"); +const char16_t Concrete<RootList>::concreteTypeName[] = u"JS::ubi::RootList"; UniquePtr<EdgeRange> Concrete<RootList>::edges(JSRuntime* rt, bool wantNames) const { MOZ_ASSERT_IF(wantNames, get().wantNames); return UniquePtr<EdgeRange>(js_new<PreComputedEdgeRange>(get().edges)); } } // namespace ubi
--- a/js/src/vm/UbiNodeShortestPaths.cpp +++ b/js/src/vm/UbiNodeShortestPaths.cpp @@ -65,17 +65,17 @@ dumpPaths(JSRuntime* rt, Node node, uint for (auto backEdge : path) { dumpNode(backEdge->predecessor()); fprintf(stderr, " |\n"); fprintf(stderr, " |\n"); fprintf(stderr, " '"); const char16_t* name = backEdge->name().get(); if (!name) - name = (const char16_t*) MOZ_UTF16("<no edge name>"); + name = u"<no edge name>"; js_fputs(name, stderr); fprintf(stderr, "'\n"); fprintf(stderr, " |\n"); fprintf(stderr, " V\n"); } dumpNode(node);
--- a/js/xpconnect/src/XPCConvert.cpp +++ b/js/xpconnect/src/XPCConvert.cpp @@ -514,17 +514,17 @@ XPCConvert::JSData2Native(void* d, Handl (**((nsAString**)d)).Truncate(); return true; } } nsAString* ws = *((nsAString**)d); if (!str) { - ws->AssignLiteral(MOZ_UTF16("undefined")); + ws->AssignLiteral(u"undefined"); } else if (XPCStringConvert::IsDOMString(str)) { // The characters represent an existing nsStringBuffer that // was shared by XPCStringConvert::ReadableToJSVal. const char16_t* chars = JS_GetTwoByteExternalStringChars(str); nsStringBuffer::FromData((void*)chars)->ToString(length, *ws); } else if (XPCStringConvert::IsLiteral(str)) { // The characters represent a literal char16_t string constant // compiled into libxul, such as the string "undefined" above.
--- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -1507,17 +1507,17 @@ XPCJSRuntime::CustomOutOfMemoryCallback( /* minimizeMemoryUsage = */ false); } void XPCJSRuntime::CustomLargeAllocationFailureCallback() { nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService(); if (os) { - os->NotifyObservers(nullptr, "memory-pressure", MOZ_UTF16("heap-minimize")); + os->NotifyObservers(nullptr, "memory-pressure", u"heap-minimize"); } } size_t XPCJSRuntime::SizeOfIncludingThis(MallocSizeOf mallocSizeOf) { size_t n = 0; n += mallocSizeOf(this);
--- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -10123,23 +10123,23 @@ PresShell::DelayedKeyEvent::DelayedKeyEv static void LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg) { nsAutoString n1, n2; if (k1) { k1->GetFrameName(n1); } else { - n1.AssignLiteral(MOZ_UTF16("(null)")); + n1.AssignLiteral(u"(null)"); } if (k2) { k2->GetFrameName(n2); } else { - n2.AssignLiteral(MOZ_UTF16("(null)")); + n2.AssignLiteral(u"(null)"); } printf("verifyreflow: %s %p != %s %p %s\n", NS_LossyConvertUTF16toASCII(n1).get(), (void*)k1, NS_LossyConvertUTF16toASCII(n2).get(), (void*)k2, aMsg); } static void
--- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -2859,18 +2859,18 @@ static bool IsChineseOrJapanese(nsTextFr // be expanded properly even when surrounded by other language. return true; } nsIAtom* language = aFrame->StyleFont()->mLanguage; if (!language) { return false; } - return nsStyleUtil::MatchesLanguagePrefix(language, MOZ_UTF16("ja")) || - nsStyleUtil::MatchesLanguagePrefix(language, MOZ_UTF16("zh")); + return nsStyleUtil::MatchesLanguagePrefix(language, u"ja") || + nsStyleUtil::MatchesLanguagePrefix(language, u"zh"); } #ifdef DEBUG static bool IsInBounds(const gfxSkipCharsIterator& aStart, int32_t aContentLength, gfxTextRun::Range aRange) { if (aStart.GetSkippedOffset() > aRange.start) return false; if (aContentLength == INT32_MAX)
--- a/layout/printing/nsPrintData.cpp +++ b/layout/printing/nsPrintData.cpp @@ -36,17 +36,17 @@ nsPrintData::nsPrintData(ePrintDataType { MOZ_COUNT_CTOR(nsPrintData); nsCOMPtr<nsIStringBundle> brandBundle; nsCOMPtr<nsIStringBundleService> svc = mozilla::services::GetStringBundleService(); if (svc) { svc->CreateBundle( "chrome://branding/locale/brand.properties", getter_AddRefs( brandBundle ) ); if (brandBundle) { - brandBundle->GetStringFromName(MOZ_UTF16("brandShortName"), &mBrandName ); + brandBundle->GetStringFromName(u"brandShortName", &mBrandName ); } } if (!mBrandName) { mBrandName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document")); } }
--- a/layout/style/CounterStyleManager.cpp +++ b/layout/style/CounterStyleManager.cpp @@ -657,21 +657,21 @@ BuiltinCounterStyle::GetSuffix(nsSubstri case NS_STYLE_LIST_STYLE_JAPANESE_INFORMAL: case NS_STYLE_LIST_STYLE_JAPANESE_FORMAL: aResult = 0x3001; break; case NS_STYLE_LIST_STYLE_KOREAN_HANGUL_FORMAL: case NS_STYLE_LIST_STYLE_KOREAN_HANJA_INFORMAL: case NS_STYLE_LIST_STYLE_KOREAN_HANJA_FORMAL: - aResult.AssignLiteral(MOZ_UTF16(", ")); + aResult.AssignLiteral(u", "); break; default: - aResult.AssignLiteral(MOZ_UTF16(". ")); + aResult.AssignLiteral(u". "); break; } } static const char16_t kDiscCharacter = 0x2022; static const char16_t kCircleCharacter = 0x25e6; static const char16_t kSquareCharacter = 0x25fe; static const char16_t kRightPointingCharacter = 0x25b8; @@ -753,17 +753,17 @@ BuiltinCounterStyle::GetNegative(Negativ break; case NS_STYLE_LIST_STYLE_TRAD_CHINESE_FORMAL: case NS_STYLE_LIST_STYLE_TRAD_CHINESE_INFORMAL: aResult.before = gTradChineseNegative; break; default: - aResult.before.AssignLiteral(MOZ_UTF16("-")); + aResult.before.AssignLiteral(u"-"); } aResult.after.Truncate(); } /* virtual */ bool BuiltinCounterStyle::IsOrdinalInRange(CounterValue aOrdinal) { switch (mStyle) { @@ -1261,17 +1261,17 @@ CustomCounterStyle::GetSuffix(nsSubstrin mFlags |= FLAG_SUFFIX_INITED; const nsCSSValue& value = mRule->GetDesc(eCSSCounterDesc_Suffix); if (value.UnitHasStringValue()) { value.GetStringValue(mSuffix); } else if (IsExtendsSystem()) { GetExtends()->GetSuffix(mSuffix); } else { - mSuffix.AssignLiteral(MOZ_UTF16(". ")); + mSuffix.AssignLiteral(u". "); } } aResult = mSuffix; } /* virtual */ void CustomCounterStyle::GetSpokenCounterText(CounterValue aOrdinal, WritingMode aWritingMode, @@ -1320,17 +1320,17 @@ CustomCounterStyle::GetNegative(Negative pair.mXValue.GetStringValue(mNegative.before); pair.mYValue.GetStringValue(mNegative.after); break; } default: { if (IsExtendsSystem()) { GetExtends()->GetNegative(mNegative); } else { - mNegative.before.AssignLiteral(MOZ_UTF16("-")); + mNegative.before.AssignLiteral(u"-"); mNegative.after.Truncate(); } } } } aResult = mNegative; } @@ -1770,17 +1770,17 @@ AnonymousCounterStyle::IsBullet() default: return false; } } /* virtual */ void AnonymousCounterStyle::GetNegative(NegativeType& aResult) { - aResult.before.AssignLiteral(MOZ_UTF16("-")); + aResult.before.AssignLiteral(u"-"); aResult.after.Truncate(); } /* virtual */ bool AnonymousCounterStyle::IsOrdinalInRange(CounterValue aOrdinal) { switch (mSystem) { case NS_STYLE_COUNTER_SYSTEM_CYCLIC:
--- a/layout/style/ErrorReporter.cpp +++ b/layout/style/ErrorReporter.cpp @@ -345,34 +345,34 @@ ErrorReporter::ReportUnexpectedEOF(const if (!ShouldReportErrors()) return; nsAutoString innerStr; sStringBundle->GetStringFromName(NS_ConvertASCIItoUTF16(aMessage).get(), getter_Copies(innerStr)); const char16_t *params[1] = { innerStr.get() }; nsAutoString str; - sStringBundle->FormatStringFromName(MOZ_UTF16("PEUnexpEOF2"), + sStringBundle->FormatStringFromName(u"PEUnexpEOF2", params, ArrayLength(params), getter_Copies(str)); AddToError(str); } void ErrorReporter::ReportUnexpectedEOF(char16_t aExpected) { if (!ShouldReportErrors()) return; const char16_t expectedStr[] = { char16_t('\''), aExpected, char16_t('\''), char16_t(0) }; const char16_t *params[1] = { expectedStr }; nsAutoString str; - sStringBundle->FormatStringFromName(MOZ_UTF16("PEUnexpEOF2"), + sStringBundle->FormatStringFromName(u"PEUnexpEOF2", params, ArrayLength(params), getter_Copies(str)); AddToError(str); } } // namespace css } // namespace mozilla
--- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -2896,33 +2896,33 @@ nsCSSCounterStyleRule::GetType(uint16_t* { *aType = nsIDOMCSSRule::COUNTER_STYLE_RULE; return NS_OK; } NS_IMETHODIMP nsCSSCounterStyleRule::GetCssText(nsAString& aCssText) { - aCssText.AssignLiteral(MOZ_UTF16("@counter-style ")); + aCssText.AssignLiteral(u"@counter-style "); nsStyleUtil::AppendEscapedCSSIdent(mName, aCssText); - aCssText.AppendLiteral(MOZ_UTF16(" {\n")); + aCssText.AppendLiteral(u" {\n"); for (nsCSSCounterDesc id = nsCSSCounterDesc(0); id < eCSSCounterDesc_COUNT; id = nsCSSCounterDesc(id + 1)) { if (mValues[id].GetUnit() != eCSSUnit_Null) { nsAutoString tmp; (this->*kGetters[id])(tmp); - aCssText.AppendLiteral(MOZ_UTF16(" ")); + aCssText.AppendLiteral(u" "); AppendASCIItoUTF16(nsCSSProps::GetStringValue(id), aCssText); - aCssText.AppendLiteral(MOZ_UTF16(": ")); + aCssText.AppendLiteral(u": "); aCssText.Append(tmp); - aCssText.AppendLiteral(MOZ_UTF16(";\n")); + aCssText.AppendLiteral(u";\n"); } } - aCssText.AppendLiteral(MOZ_UTF16("}")); + aCssText.AppendLiteral(u"}"); return NS_OK; } NS_IMETHODIMP nsCSSCounterStyleRule::SetCssText(const nsAString& aCssText) { // FIXME: implement??? return NS_ERROR_NOT_IMPLEMENTED; @@ -3084,17 +3084,17 @@ nsCSSCounterStyleRule::GetAdditiveSymbol NS_IMETHODIMP nsCSSCounterStyleRule::GetRange(nsAString& aRange) { const nsCSSValue& value = GetDesc(eCSSCounterDesc_Range); switch (value.GetUnit()) { case eCSSUnit_Auto: - aRange.AssignLiteral(MOZ_UTF16("auto")); + aRange.AssignLiteral(u"auto"); break; case eCSSUnit_PairList: aRange.Truncate(); for (const nsCSSValuePairList* item = value.GetPairListValue(); item; item = item->mNext) { const nsCSSValue& lower = item->mXValue; const nsCSSValue& upper = item->mYValue; @@ -3131,26 +3131,26 @@ NS_IMETHODIMP nsCSSCounterStyleRule::GetSpeakAs(nsAString& aSpeakAs) { const nsCSSValue& value = GetDesc(eCSSCounterDesc_SpeakAs); switch (value.GetUnit()) { case eCSSUnit_Enumerated: switch (value.GetIntValue()) { case NS_STYLE_COUNTER_SPEAKAS_BULLETS: - aSpeakAs.AssignLiteral(MOZ_UTF16("bullets")); + aSpeakAs.AssignLiteral(u"bullets"); break; case NS_STYLE_COUNTER_SPEAKAS_NUMBERS: - aSpeakAs.AssignLiteral(MOZ_UTF16("numbers")); + aSpeakAs.AssignLiteral(u"numbers"); break; case NS_STYLE_COUNTER_SPEAKAS_WORDS: - aSpeakAs.AssignLiteral(MOZ_UTF16("words")); + aSpeakAs.AssignLiteral(u"words"); break; case NS_STYLE_COUNTER_SPEAKAS_SPELL_OUT: - aSpeakAs.AssignLiteral(MOZ_UTF16("spell-out")); + aSpeakAs.AssignLiteral(u"spell-out"); break; default: NS_NOTREACHED("Unknown speech synthesis"); } break; case eCSSUnit_Auto: case eCSSUnit_Ident:
--- a/layout/style/nsROCSSPrimitiveValue.cpp +++ b/layout/style/nsROCSSPrimitiveValue.cpp @@ -106,17 +106,17 @@ nsROCSSPrimitiveValue::GetCssText(nsAStr nsStyleUtil::AppendEscapedCSSString(NS_ConvertUTF8toUTF16(specUTF8), tmpStr); tmpStr.Append(')'); } else { // http://dev.w3.org/csswg/css3-values/#attr defines // 'about:invalid' as the default value for url attributes, // so let's also use it here as the default computed value // for invalid URLs. - tmpStr.AssignLiteral(MOZ_UTF16("url(about:invalid)")); + tmpStr.AssignLiteral(u"url(about:invalid)"); } break; } case CSS_ATTR : { tmpStr.AppendLiteral("attr("); tmpStr.Append(mValue.mString); tmpStr.Append(char16_t(')'));
--- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -4266,47 +4266,43 @@ nsRuleNode::GetShadowData(const nsCSSVal struct TextEmphasisChars { const char16_t* mFilled; const char16_t* mOpen; }; #define TEXT_EMPHASIS_CHARS_LIST() \ - TEXT_EMPHASIS_CHARS_ITEM("", "", NONE) \ - TEXT_EMPHASIS_CHARS_ITEM("\u2022", "\u25e6", DOT) \ - TEXT_EMPHASIS_CHARS_ITEM("\u25cf", "\u25cb", CIRCLE) \ - TEXT_EMPHASIS_CHARS_ITEM("\u25c9", "\u25ce", DOUBLE_CIRCLE) \ - TEXT_EMPHASIS_CHARS_ITEM("\u25b2", "\u25b3", TRIANGLE) \ - TEXT_EMPHASIS_CHARS_ITEM("\ufe45", "\ufe46", SESAME) + TEXT_EMPHASIS_CHARS_ITEM(u"", u"", NONE) \ + TEXT_EMPHASIS_CHARS_ITEM(u"\u2022", u"\u25e6", DOT) \ + TEXT_EMPHASIS_CHARS_ITEM(u"\u25cf", u"\u25cb", CIRCLE) \ + TEXT_EMPHASIS_CHARS_ITEM(u"\u25c9", u"\u25ce", DOUBLE_CIRCLE) \ + TEXT_EMPHASIS_CHARS_ITEM(u"\u25b2", u"\u25b3", TRIANGLE) \ + TEXT_EMPHASIS_CHARS_ITEM(u"\ufe45", u"\ufe46", SESAME) static constexpr TextEmphasisChars kTextEmphasisChars[] = { #define TEXT_EMPHASIS_CHARS_ITEM(filled_, open_, type_) \ - { MOZ_UTF16(filled_), MOZ_UTF16(open_) }, // type_ + { filled_, open_ }, // type_ TEXT_EMPHASIS_CHARS_LIST() #undef TEXT_EMPHASIS_CHARS_ITEM }; -// MSVC before 2015 doesn't consider string literal as a constant expr, -// and doesn't have constexpr either, so we cannot do the checks below. -#if !defined(_MSC_VER) || _MSC_VER >= 1900 #define TEXT_EMPHASIS_CHARS_ITEM(filled_, open_, type_) \ - static_assert(ArrayLength(MOZ_UTF16(filled_)) <= 2 && \ - ArrayLength(MOZ_UTF16(open_)) <= 2, \ + static_assert(ArrayLength(filled_) <= 2 && \ + ArrayLength(open_) <= 2, \ "emphasis marks should have no more than one char"); \ static_assert( \ *kTextEmphasisChars[NS_STYLE_TEXT_EMPHASIS_STYLE_##type_].mFilled == \ - *MOZ_UTF16(filled_), "filled " #type_ " should be " #filled_); \ + *filled_, "filled " #type_ " should be " #filled_); \ static_assert( \ *kTextEmphasisChars[NS_STYLE_TEXT_EMPHASIS_STYLE_##type_].mOpen == \ - *MOZ_UTF16(open_), "open " #type_ " should be " #open_); + *open_, "open " #type_ " should be " #open_); TEXT_EMPHASIS_CHARS_LIST() #undef TEXT_EMPHASIS_CHARS_ITEM -#endif #undef TEXT_EMPHASIS_CHARS_LIST static void TruncateStringToSingleGrapheme(nsAString& aStr) { unicode::ClusterIterator iter(aStr.Data(), aStr.Length()); if (!iter.AtEnd()) { @@ -4702,17 +4698,17 @@ nsRuleNode::ComputeTextData(void* aStart const nsCSSValue* textEmphasisStyleValue = aRuleData->ValueForTextEmphasisStyle(); switch (textEmphasisStyleValue->GetUnit()) { case eCSSUnit_Null: break; case eCSSUnit_Initial: case eCSSUnit_None: { text->mTextEmphasisStyle = NS_STYLE_TEXT_EMPHASIS_STYLE_NONE; - text->mTextEmphasisStyleString = MOZ_UTF16(""); + text->mTextEmphasisStyleString = u""; break; } case eCSSUnit_Inherit: case eCSSUnit_Unset: { conditions.SetUncacheable(); text->mTextEmphasisStyle = parentText->mTextEmphasisStyle; text->mTextEmphasisStyleString = parentText->mTextEmphasisStyleString; break; @@ -7891,26 +7887,26 @@ nsRuleNode::ComputeListData(void* aStart } case eCSSUnit_Enumerated: { // For compatibility with html attribute map. // This branch should never be called for value from CSS. int32_t intValue = typeValue->GetIntValue(); nsAutoString name; switch (intValue) { case NS_STYLE_LIST_STYLE_LOWER_ROMAN: - name.AssignLiteral(MOZ_UTF16("lower-roman")); + name.AssignLiteral(u"lower-roman"); break; case NS_STYLE_LIST_STYLE_UPPER_ROMAN: - name.AssignLiteral(MOZ_UTF16("upper-roman")); + name.AssignLiteral(u"upper-roman"); break; case NS_STYLE_LIST_STYLE_LOWER_ALPHA: - name.AssignLiteral(MOZ_UTF16("lower-alpha")); + name.AssignLiteral(u"lower-alpha"); break; case NS_STYLE_LIST_STYLE_UPPER_ALPHA: - name.AssignLiteral(MOZ_UTF16("upper-alpha")); + name.AssignLiteral(u"upper-alpha"); break; default: CopyASCIItoUTF16(nsCSSProps::ValueToKeyword( intValue, nsCSSProps::kListStyleKTable), name); break; } list->SetListStyleType(name, mPresContext); break;
--- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -3684,17 +3684,17 @@ nsStyleText::nsStyleText(StyleStructCont , mLineHeight(eStyleUnit_Normal) , mTextIndent(0, nsStyleCoord::CoordConstructor) , mWebkitTextStrokeWidth(0, nsStyleCoord::CoordConstructor) , mTextShadow(nullptr) { MOZ_COUNT_CTOR(nsStyleText); nsCOMPtr<nsIAtom> language = aContext.GetContentLanguage(); mTextEmphasisPosition = language && - nsStyleUtil::MatchesLanguagePrefix(language, MOZ_UTF16("zh")) ? + nsStyleUtil::MatchesLanguagePrefix(language, u"zh") ? NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT_ZH : NS_STYLE_TEXT_EMPHASIS_POSITION_DEFAULT; } nsStyleText::nsStyleText(const nsStyleText& aSource) : mTextAlign(aSource.mTextAlign) , mTextAlignLast(aSource.mTextAlignLast) , mTextAlignTrue(false)
--- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -356,34 +356,33 @@ nsTreeBodyFrame::EnsureView() } nsCOMPtr<nsIBoxObject> box = do_QueryInterface(mTreeBoxObject); if (box) { nsWeakFrame weakFrame(this); nsCOMPtr<nsITreeView> treeView; mTreeBoxObject->GetView(getter_AddRefs(treeView)); if (treeView && weakFrame.IsAlive()) { nsXPIDLString rowStr; - box->GetProperty(MOZ_UTF16("topRow"), - getter_Copies(rowStr)); + box->GetProperty(u"topRow", getter_Copies(rowStr)); nsAutoString rowStr2(rowStr); nsresult error; int32_t rowIndex = rowStr2.ToInteger(&error); // Set our view. SetView(treeView); ENSURE_TRUE(weakFrame.IsAlive()); // Scroll to the given row. // XXX is this optimal if we haven't laid out yet? ScrollToRow(rowIndex); ENSURE_TRUE(weakFrame.IsAlive()); // Clear out the property info for the top row, but we always keep the // view current. - box->RemoveProperty(MOZ_UTF16("topRow")); + box->RemoveProperty(u"topRow"); } } } } void nsTreeBodyFrame::ManageReflowCallback(const nsRect& aRect, nscoord aHorzWidth) {
--- a/netwerk/base/CaptivePortalService.cpp +++ b/netwerk/base/CaptivePortalService.cpp @@ -4,17 +4,17 @@ #include "CaptivePortalService.h" #include "mozilla/Services.h" #include "mozilla/Preferences.h" #include "nsIObserverService.h" #include "nsServiceManagerUtils.h" #include "nsXULAppAPI.h" -#define kInterfaceName "captive-portal-inteface" +static const char16_t kInterfaceName[] = u"captive-portal-inteface"; static const char kOpenCaptivePortalLoginEvent[] = "captive-portal-login"; static const char kAbortCaptivePortalLoginEvent[] = "captive-portal-login-abort"; static const char kCaptivePortalLoginSuccessEvent[] = "captive-portal-login-success"; static const uint32_t kDefaultInterval = 60*1000; // check every 60 seconds namespace mozilla { @@ -64,18 +64,17 @@ CaptivePortalService::PerformCheck() if (NS_FAILED(rv)) { LOG(("Unable to get a captive portal detector\n")); return rv; } } LOG(("CaptivePortalService::PerformCheck - Calling CheckCaptivePortal\n")); mRequestInProgress = true; - mCaptivePortalDetector->CheckCaptivePortal( - MOZ_UTF16(kInterfaceName), this); + mCaptivePortalDetector->CheckCaptivePortal(kInterfaceName, this); return NS_OK; } nsresult CaptivePortalService::RearmTimer() { // Start a timer to recheck if (mTimer) { @@ -156,17 +155,17 @@ CaptivePortalService::Stop() if (mTimer) { mTimer->Cancel(); } mTimer = nullptr; mRequestInProgress = false; mStarted = false; if (mCaptivePortalDetector) { - mCaptivePortalDetector->Abort(MOZ_UTF16(kInterfaceName)); + mCaptivePortalDetector->Abort(kInterfaceName); } mCaptivePortalDetector = nullptr; return NS_OK; } //----------------------------------------------------------------------------- // CaptivePortalService::nsICaptivePortalService //----------------------------------------------------------------------------- @@ -273,17 +272,17 @@ CaptivePortalService::Observe(nsISupport // CaptivePortalService::nsICaptivePortalCallback //----------------------------------------------------------------------------- NS_IMETHODIMP CaptivePortalService::Prepare() { LOG(("CaptivePortalService::Prepare\n")); // XXX: Finish preparation shouldn't be called until dns and routing is available. if (mCaptivePortalDetector) { - mCaptivePortalDetector->FinishPreparation(MOZ_UTF16(kInterfaceName)); + mCaptivePortalDetector->FinishPreparation(kInterfaceName); } return NS_OK; } NS_IMETHODIMP CaptivePortalService::Complete(bool success) { LOG(("CaptivePortalService::Complete(success=%d) mState=%d\n", success, mState));
--- a/netwerk/base/Dashboard.cpp +++ b/netwerk/base/Dashboard.cpp @@ -190,17 +190,17 @@ ConnectionData::Notify(nsITimer *aTimer) if (mSocket) { mSocket->Close(NS_ERROR_ABORT); mSocket = nullptr; mStreamIn = nullptr; } mTimer = nullptr; - mStatus.AssignLiteral(MOZ_UTF16("NS_ERROR_NET_TIMEOUT")); + mStatus.AssignLiteral(u"NS_ERROR_NET_TIMEOUT"); mThread->Dispatch(NewRunnableMethod<RefPtr<ConnectionData>> (mDashboard, &Dashboard::GetConnectionStatus, this), NS_DISPATCH_NORMAL); return NS_OK; } void @@ -753,40 +753,40 @@ Dashboard::RequestDNSLookup(const nsACSt return rv; } void HttpConnInfo::SetHTTP1ProtocolVersion(uint8_t pv) { switch (pv) { case NS_HTTP_VERSION_0_9: - protocolVersion.AssignLiteral(MOZ_UTF16("http/0.9")); + protocolVersion.AssignLiteral(u"http/0.9"); break; case NS_HTTP_VERSION_1_0: - protocolVersion.AssignLiteral(MOZ_UTF16("http/1.0")); + protocolVersion.AssignLiteral(u"http/1.0"); break; case NS_HTTP_VERSION_1_1: - protocolVersion.AssignLiteral(MOZ_UTF16("http/1.1")); + protocolVersion.AssignLiteral(u"http/1.1"); break; case NS_HTTP_VERSION_2_0: - protocolVersion.AssignLiteral(MOZ_UTF16("http/2.0")); + protocolVersion.AssignLiteral(u"http/2.0"); break; default: - protocolVersion.AssignLiteral(MOZ_UTF16("unknown protocol version")); + protocolVersion.AssignLiteral(u"unknown protocol version"); } } void HttpConnInfo::SetHTTP2ProtocolVersion(uint8_t pv) { if (pv == SPDY_VERSION_31) { - protocolVersion.AssignLiteral(MOZ_UTF16("spdy/3.1")); + protocolVersion.AssignLiteral(u"spdy/3.1"); } else { MOZ_ASSERT (pv == HTTP_VERSION_2); - protocolVersion.Assign(MOZ_UTF16("h2")); + protocolVersion.Assign(u"h2"); } } NS_IMETHODIMP Dashboard::RequestConnection(const nsACString& aHost, uint32_t aPort, const char *aProtocol, uint32_t aTimeout, NetDashboardCallback *aCallback) {
--- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -685,18 +685,18 @@ nsIOService::NewChannelFromURI2(nsIURI* * See nsIIoService.idl for a detailed description of those arguments */ NS_IMETHODIMP nsIOService::NewChannelFromURI(nsIURI *aURI, nsIChannel **result) { NS_ASSERTION(false, "Deprecated, use NewChannelFromURI2 providing loadInfo arguments!"); const char16_t* params[] = { - MOZ_UTF16("nsIOService::NewChannelFromURI()"), - MOZ_UTF16("nsIOService::NewChannelFromURI2()") + u"nsIOService::NewChannelFromURI()", + u"nsIOService::NewChannelFromURI2()" }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, ArrayLength(params)); @@ -885,18 +885,18 @@ NS_IMETHODIMP nsIOService::NewChannelFromURIWithProxyFlags(nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags, nsIChannel **result) { NS_ASSERTION(false, "Deprecated, use NewChannelFromURIWithProxyFlags2 providing loadInfo arguments!"); const char16_t* params[] = { - MOZ_UTF16("nsIOService::NewChannelFromURIWithProxyFlags()"), - MOZ_UTF16("nsIOService::NewChannelFromURIWithProxyFlags2()") + u"nsIOService::NewChannelFromURIWithProxyFlags()", + u"nsIOService::NewChannelFromURIWithProxyFlags2()" }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, ArrayLength(params)); @@ -947,18 +947,18 @@ nsIOService::NewChannel2(const nsACStrin * See nsIIoService.idl for a detailed description of those arguments */ NS_IMETHODIMP nsIOService::NewChannel(const nsACString &aSpec, const char *aCharset, nsIURI *aBaseURI, nsIChannel **result) { NS_ASSERTION(false, "Deprecated, use NewChannel2 providing loadInfo arguments!"); const char16_t* params[] = { - MOZ_UTF16("nsIOService::NewChannel()"), - MOZ_UTF16("nsIOService::NewChannel2()") + u"nsIOService::NewChannel()", + u"nsIOService::NewChannel2()" }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, ArrayLength(params)); @@ -1028,18 +1028,18 @@ nsIOService::SetOffline(bool offline) nsCOMPtr<nsIObserverService> observerService = services::GetObserverService(); NS_ASSERTION(observerService, "The observer service should not be null"); if (XRE_IsParentProcess()) { if (observerService) { (void)observerService->NotifyObservers(nullptr, NS_IPC_IOSERVICE_SET_OFFLINE_TOPIC, offline ? - MOZ_UTF16("true") : - MOZ_UTF16("false")); + u"true" : + u"false"); } } nsIIOService *subject = static_cast<nsIIOService *>(this); while (mSetOfflineValue != mOffline) { offline = mSetOfflineValue; if (offline && !mOffline) { @@ -1141,18 +1141,18 @@ nsIOService::SetConnectivityInternal(boo nsCOMPtr<nsIObserverService> observerService = services::GetObserverService(); if (!observerService) { return NS_OK; } // This notification sends the connectivity to the child processes if (XRE_IsParentProcess()) { observerService->NotifyObservers(nullptr, NS_IPC_IOSERVICE_SET_CONNECTIVITY_TOPIC, aConnectivity ? - MOZ_UTF16("true") : - MOZ_UTF16("false")); + u"true" : + u"false"); } if (mOffline) { // We don't need to send any notifications if we're offline return NS_OK; } if (aConnectivity) { @@ -1905,17 +1905,17 @@ nsIOService::NotifyAppOfflineStatus(uint nsCOMPtr<nsIObserverService> observerService = services::GetObserverService(); MOZ_ASSERT(observerService, "The observer service should not be null"); if (observerService) { RefPtr<nsAppOfflineInfo> info = new nsAppOfflineInfo(appId, state); observerService->NotifyObservers( info, NS_IOSERVICE_APP_OFFLINE_STATUS_TOPIC, - MOZ_UTF16("all data in nsIAppOfflineInfo subject argument")); + u"all data in nsIAppOfflineInfo subject argument"); } } namespace { class SetAppOfflineMainThread : public Runnable { public:
--- a/netwerk/base/nsNetUtil.cpp +++ b/netwerk/base/nsNetUtil.cpp @@ -2312,17 +2312,17 @@ NS_ShouldSecureUpgrade(nsIURI* aURI, aURI->GetScheme(scheme); // append the additional 's' for security to the scheme :-) scheme.AppendASCII("s"); NS_ConvertUTF8toUTF16 reportSpec(spec); NS_ConvertUTF8toUTF16 reportScheme(scheme); const char16_t* params[] = { reportSpec.get(), reportScheme.get() }; uint32_t innerWindowId = aLoadInfo->GetInnerWindowID(); - CSP_LogLocalizedStr(MOZ_UTF16("upgradeInsecureRequest"), + CSP_LogLocalizedStr(u"upgradeInsecureRequest", params, ArrayLength(params), EmptyString(), // aSourceFile EmptyString(), // aScriptSample 0, // aLineNumber 0, // aColumnNumber nsIScriptError::warningFlag, "CSP", innerWindowId);
--- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -1924,17 +1924,17 @@ nsCookieService::SetCookieString(nsIURI // The aPrompt argument is deprecated and unused. Avoid introducing new // code that uses this argument by warning if the value is non-null. MOZ_ASSERT(!aPrompt); if (aPrompt) { nsCOMPtr<nsIConsoleService> aConsoleService = do_GetService("@mozilla.org/consoleservice;1"); if (aConsoleService) { aConsoleService->LogStringMessage( - MOZ_UTF16("Non-null prompt ignored by nsCookieService.")); + u"Non-null prompt ignored by nsCookieService."); } } return SetCookieStringCommon(aHostURI, aCookieHeader, nullptr, aChannel, false); } NS_IMETHODIMP nsCookieService::SetCookieStringFromHttp(nsIURI *aHostURI, @@ -1947,17 +1947,17 @@ nsCookieService::SetCookieStringFromHttp // The aPrompt argument is deprecated and unused. Avoid introducing new // code that uses this argument by warning if the value is non-null. MOZ_ASSERT(!aPrompt); if (aPrompt) { nsCOMPtr<nsIConsoleService> aConsoleService = do_GetService("@mozilla.org/consoleservice;1"); if (aConsoleService) { aConsoleService->LogStringMessage( - MOZ_UTF16("Non-null prompt ignored by nsCookieService.")); + u"Non-null prompt ignored by nsCookieService."); } } return SetCookieStringCommon(aHostURI, aCookieHeader, aServerTime, aChannel, true); } nsresult nsCookieService::SetCookieStringCommon(nsIURI *aHostURI, @@ -2129,17 +2129,17 @@ nsCookieService::NotifyThirdParty(nsIURI } nsAutoString referringHostUTF16 = NS_ConvertUTF8toUTF16(referringHost); os->NotifyObservers(aHostURI, topic, referringHostUTF16.get()); return; } while (0); // This can fail for a number of reasons, in which kind we fallback to "?" - os->NotifyObservers(aHostURI, topic, MOZ_UTF16("?")); + os->NotifyObservers(aHostURI, topic, u"?"); } // notify observers that the cookie list changed. there are five possible // values for aData: // "deleted" means a cookie was deleted. aSubject is the deleted cookie. // "added" means a cookie was added. aSubject is the added cookie. // "changed" means a cookie was altered. aSubject is the new cookie. // "cleared" means the entire cookie list was cleared. aSubject is null. @@ -2230,17 +2230,17 @@ nsCookieService::RemoveAll() } else { // Recreate the database. COOKIE_LOGSTRING(LogLevel::Debug, ("RemoveAll(): corruption detected with rv 0x%x", rv)); HandleCorruptDB(mDefaultDBState); } } - NotifyChanged(nullptr, MOZ_UTF16("cleared")); + NotifyChanged(nullptr, u"cleared"); return NS_OK; } NS_IMETHODIMP nsCookieService::GetEnumerator(nsISimpleEnumerator **aEnumerator) { if (!mDBState) { NS_WARNING("No DBState! Profile already closed?"); @@ -2314,18 +2314,18 @@ nsCookieService::Add(const nsACString &a { MOZ_ASSERT(aArgc == 0 || aArgc == 1); NeckoOriginAttributes attrs; nsresult rv = InitializeOriginAttributes(&attrs, aOriginAttributes, aCx, aArgc, - MOZ_UTF16("nsICookieManager2.add()"), - MOZ_UTF16("2")); + u"nsICookieManager2.add()", + u"2"); NS_ENSURE_SUCCESS(rv, rv); return AddNative(aHost, aPath, aName, aValue, aIsSecure, aIsHttpOnly, aIsSession, aExpiry, &attrs); } NS_IMETHODIMP_(nsresult) nsCookieService::AddNative(const nsACString &aHost, @@ -2421,17 +2421,17 @@ nsCookieService::Remove(const nsACString NS_NewURI(getter_AddRefs(uri), host); if (uri) mPermissionService->SetAccess(uri, nsICookiePermission::ACCESS_DENY); } if (cookie) { // Everything's done. Notify observers. - NotifyChanged(cookie, MOZ_UTF16("deleted")); + NotifyChanged(cookie, u"deleted"); } return NS_OK; } NS_IMETHODIMP nsCookieService::Remove(const nsACString &aHost, const nsACString &aName, @@ -2443,18 +2443,18 @@ nsCookieService::Remove(const nsACString { MOZ_ASSERT(aArgc == 0 || aArgc == 1); NeckoOriginAttributes attrs; nsresult rv = InitializeOriginAttributes(&attrs, aOriginAttributes, aCx, aArgc, - MOZ_UTF16("nsICookieManager.remove()"), - MOZ_UTF16("")); + u"nsICookieManager.remove()", + u""); NS_ENSURE_SUCCESS(rv, rv); return RemoveNative(aHost, aName, aPath, aBlocked, &attrs); } NS_IMETHODIMP_(nsresult) nsCookieService::RemoveNative(const nsACString &aHost, const nsACString &aName, @@ -3462,17 +3462,17 @@ nsCookieService::AddInternal(const nsCoo // Remove the old cookie. RemoveCookieFromList(matchIter); // If the new cookie has expired -- i.e. the intent was simply to delete // the old cookie -- then we're done. if (aCookie->Expiry() <= currentTime) { COOKIE_LOGFAILURE(SET_COOKIE, aHostURI, aCookieHeader, "previously stored cookie was deleted"); - NotifyChanged(oldCookie, MOZ_UTF16("deleted")); + NotifyChanged(oldCookie, u"deleted"); return; } // Preserve creation time of cookie for ordering purposes. aCookie->SetCreationTime(oldCookie->CreationTime()); } } else { @@ -3513,21 +3513,20 @@ nsCookieService::AddInternal(const nsCoo // Add the cookie to the db. We do not supply a params array for batching // because this might result in removals and additions being out of order. AddCookieToList(aKey, aCookie, mDBState, nullptr); COOKIE_LOGSUCCESS(SET_COOKIE, aHostURI, aCookieHeader, aCookie, foundCookie); // Now that list mutations are complete, notify observers. We do it here // because observers may themselves attempt to mutate the list. if (purgedList) { - NotifyChanged(purgedList, MOZ_UTF16("batch-deleted")); + NotifyChanged(purgedList, u"batch-deleted"); } - NotifyChanged(aCookie, foundCookie ? MOZ_UTF16("changed") - : MOZ_UTF16("added")); + NotifyChanged(aCookie, foundCookie ? u"changed" : u"added"); } /****************************************************************************** * nsCookieService impl: * private cookie header parsing functions ******************************************************************************/ // The following comment block elucidates the function of ParseAttributes. @@ -4435,18 +4434,18 @@ nsCookieService::GetCookiesFromHost(cons rv = GetBaseDomainFromHost(host, baseDomain); NS_ENSURE_SUCCESS(rv, rv); NeckoOriginAttributes attrs; rv = InitializeOriginAttributes(&attrs, aOriginAttributes, aCx, aArgc, - MOZ_UTF16("nsICookieManager2.getCookiesFromHost()"), - MOZ_UTF16("2")); + u"nsICookieManager2.getCookiesFromHost()", + u"2"); NS_ENSURE_SUCCESS(rv, rv); nsCookieKey key = nsCookieKey(baseDomain, attrs); EnsureReadDomain(key); nsCookieEntry *entry = mDBState->hostTable.GetEntry(key); if (!entry) return NS_NewEmptyEnumerator(aEnumerator);
--- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp +++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp @@ -189,18 +189,18 @@ nsAboutProtocolHandler::NewChannel2(nsIU // an interim solution we set the LoadInfo here if not // available on the channel. Bug 1087720 nsCOMPtr<nsILoadInfo> loadInfo = (*result)->GetLoadInfo(); if (aLoadInfo != loadInfo) { if (loadInfo) { NS_ASSERTION(false, "nsIAboutModule->newChannel(aURI, aLoadInfo) needs to set LoadInfo"); const char16_t* params[] = { - MOZ_UTF16("nsIAboutModule->newChannel(aURI)"), - MOZ_UTF16("nsIAboutModule->newChannel(aURI, aLoadInfo)") + u"nsIAboutModule->newChannel(aURI)", + u"nsIAboutModule->newChannel(aURI, aLoadInfo)" }; nsContentUtils::ReportToConsole( nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, mozilla::ArrayLength(params));
--- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -2201,17 +2201,17 @@ nsHttpChannel::PromptTempRedirect() do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr<nsIStringBundle> stringBundle; rv = bundleService->CreateBundle(NECKO_MSGS_URL, getter_AddRefs(stringBundle)); if (NS_FAILED(rv)) return rv; nsXPIDLString messageString; - rv = stringBundle->GetStringFromName(MOZ_UTF16("RepostFormData"), getter_Copies(messageString)); + rv = stringBundle->GetStringFromName(u"RepostFormData", getter_Copies(messageString)); // GetStringFromName can return NS_OK and nullptr messageString. if (NS_SUCCEEDED(rv) && messageString) { bool repost = false; nsCOMPtr<nsIPrompt> prompt; GetCallback(prompt); if (!prompt) return NS_ERROR_NO_INTERFACE;
--- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -113,32 +113,32 @@ mozTXTToHTMLConv::UnescapeStr(const char { const char16_t * subString = nullptr; for (uint32_t i = aStartPos; int32_t(i) - aStartPos < aLength;) { int32_t remainingChars = i - aStartPos; if (aInString[i] == '&') { subString = &aInString[i]; - if (!nsCRT::strncmp(subString, MOZ_UTF16("<"), std::min(4, aLength - remainingChars))) + if (!nsCRT::strncmp(subString, u"<", std::min(4, aLength - remainingChars))) { aOutString.Append(char16_t('<')); i += 4; } - else if (!nsCRT::strncmp(subString, MOZ_UTF16(">"), std::min(4, aLength - remainingChars))) + else if (!nsCRT::strncmp(subString, u">", std::min(4, aLength - remainingChars))) { aOutString.Append(char16_t('>')); i += 4; } - else if (!nsCRT::strncmp(subString, MOZ_UTF16("&"), std::min(5, aLength - remainingChars))) + else if (!nsCRT::strncmp(subString, u"&", std::min(5, aLength - remainingChars))) { aOutString.Append(char16_t('&')); i += 5; } - else if (!nsCRT::strncmp(subString, MOZ_UTF16("""), std::min(6, aLength - remainingChars))) + else if (!nsCRT::strncmp(subString, u""", std::min(6, aLength - remainingChars))) { aOutString.Append(char16_t('"')); i += 6; } else { aOutString += aInString[i]; i++; @@ -169,50 +169,50 @@ mozTXTToHTMLConv::CompleteAbbreviatedURL { aOutString.AssignLiteral("mailto:"); aOutString += aInString; } } else if (aInString[pos] == '.') { if (ItMatchesDelimited(aInString, aInLength, - MOZ_UTF16("www."), 4, LT_IGNORE, LT_IGNORE)) + u"www.", 4, LT_IGNORE, LT_IGNORE)) { aOutString.AssignLiteral("http://"); aOutString += aInString; } - else if (ItMatchesDelimited(aInString,aInLength, MOZ_UTF16("ftp."), 4, LT_IGNORE, LT_IGNORE)) + else if (ItMatchesDelimited(aInString,aInLength, u"ftp.", 4, LT_IGNORE, LT_IGNORE)) { aOutString.AssignLiteral("ftp://"); aOutString += aInString; } } } bool mozTXTToHTMLConv::FindURLStart(const char16_t * aInString, int32_t aInLength, const uint32_t pos, const modetype check, uint32_t& start) { switch(check) { // no breaks, because end of blocks is never reached case RFC1738: { - if (!nsCRT::strncmp(&aInString[std::max(int32_t(pos - 4), 0)], MOZ_UTF16("<URL:"), 5)) + if (!nsCRT::strncmp(&aInString[std::max(int32_t(pos - 4), 0)], u"<URL:", 5)) { start = pos + 1; return true; } else return false; } case RFC2396E: { nsString temp(aInString, aInLength); - int32_t i = pos <= 0 ? kNotFound : temp.RFindCharInSet(MOZ_UTF16("<>\""), pos - 1); + int32_t i = pos <= 0 ? kNotFound : temp.RFindCharInSet(u"<>\"", pos - 1); if (i != kNotFound && (temp[uint32_t(i)] == '<' || temp[uint32_t(i)] == '"')) { start = uint32_t(++i); return start < pos; } else return false; @@ -281,17 +281,17 @@ mozTXTToHTMLConv::FindURLEnd(const char1 { switch(check) { // no breaks, because end of blocks is never reached case RFC1738: case RFC2396E: { nsString temp(aInString, aInStringLength); - int32_t i = temp.FindCharInSet(MOZ_UTF16("<>\""), pos + 1); + int32_t i = temp.FindCharInSet(u"<>\"", pos + 1); if (i != kNotFound && temp[uint32_t(i--)] == (check == RFC1738 || temp[start - 1] == '<' ? '>' : '"')) { end = uint32_t(i); return end > pos; } return false; } @@ -918,25 +918,25 @@ mozTXTToHTMLConv::GlyphHit(const char16_ { aOutputString.AppendLiteral("<span class='moz-txt-formfeed'></span>"); glyphTextLen = 1; return true; } if (text0 == '+' || text1 == '+') { if (ItMatchesDelimited(aInString, aInLength, - MOZ_UTF16(" +/-"), 4, + u" +/-", 4, LT_IGNORE, LT_IGNORE)) { aOutputString.AppendLiteral(" ±"); glyphTextLen = 4; return true; } if (col0 && ItMatchesDelimited(aInString, aInLength, - MOZ_UTF16("+/-"), 3, + u"+/-", 3, LT_IGNORE, LT_IGNORE)) { aOutputString.AppendLiteral("±"); glyphTextLen = 3; return true; } } @@ -1120,48 +1120,48 @@ mozTXTToHTMLConv::ScanTXT(const char16_t newOffset = &aInString[i-1]; newLength = aInStringLength - i + 1; } switch (aInString[i]) // Performance increase { case '*': if (StructPhraseHit(newOffset, newLength, i == 0, - MOZ_UTF16("*"), 1, + u"*", 1, "b", "class=\"moz-txt-star\"", aOutString, structPhrase_strong)) { i++; continue; } break; case '/': if (StructPhraseHit(newOffset, newLength, i == 0, - MOZ_UTF16("/"), 1, + u"/", 1, "i", "class=\"moz-txt-slash\"", aOutString, structPhrase_italic)) { i++; continue; } break; case '_': if (StructPhraseHit(newOffset, newLength, i == 0, - MOZ_UTF16("_"), 1, + u"_", 1, "span" /* <u> is deprecated */, "class=\"moz-txt-underscore\"", aOutString, structPhrase_underline)) { i++; continue; } break; case '|': if (StructPhraseHit(newOffset, newLength, i == 0, - MOZ_UTF16("|"), 1, + u"|", 1, "code", "class=\"moz-txt-verticalline\"", aOutString, structPhrase_code)) { i++; continue; } break; }
--- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -516,17 +516,17 @@ nsIndexedToHTML::DoOnStartRequest(nsIReq htmlEscSpec.Adopt(nsEscapeHTML2(unEscapeSpec.get(), unEscapeSpec.Length())); nsXPIDLString title; const char16_t* formatTitle[] = { htmlEscSpec.get() }; - rv = mBundle->FormatStringFromName(MOZ_UTF16("DirTitle"), + rv = mBundle->FormatStringFromName(u"DirTitle", formatTitle, sizeof(formatTitle)/sizeof(char16_t*), getter_Copies(title)); if (NS_FAILED(rv)) return rv; // we want to convert string bundle to NCR // to ensure they're shown in any charsets AppendNonAsciiToNCR(title, buffer); @@ -579,74 +579,74 @@ nsIndexedToHTML::DoOnStartRequest(nsIReq buffer.AppendLiteral("</head>\n<body dir=\""); buffer.Append(direction); buffer.AppendLiteral("\">\n<h1>"); const char16_t* formatHeading[] = { htmlEscSpec.get() }; - rv = mBundle->FormatStringFromName(MOZ_UTF16("DirTitle"), + rv = mBundle->FormatStringFromName(u"DirTitle", formatHeading, sizeof(formatHeading)/sizeof(char16_t*), getter_Copies(title)); if (NS_FAILED(rv)) return rv; AppendNonAsciiToNCR(title, buffer); buffer.AppendLiteral("</h1>\n"); if (!parentStr.IsEmpty()) { nsXPIDLString parentText; - rv = mBundle->GetStringFromName(MOZ_UTF16("DirGoUp"), + rv = mBundle->GetStringFromName(u"DirGoUp", getter_Copies(parentText)); if (NS_FAILED(rv)) return rv; buffer.AppendLiteral("<p id=\"UI_goUp\"><a class=\"up\" href=\""); nsAdoptingCString htmlParentStr(nsEscapeHTML(parentStr.get())); buffer.Append(htmlParentStr); buffer.AppendLiteral("\">"); AppendNonAsciiToNCR(parentText, buffer); buffer.AppendLiteral("</a></p>\n"); } if (isSchemeFile) { nsXPIDLString showHiddenText; - rv = mBundle->GetStringFromName(MOZ_UTF16("ShowHidden"), + rv = mBundle->GetStringFromName(u"ShowHidden", getter_Copies(showHiddenText)); if (NS_FAILED(rv)) return rv; buffer.AppendLiteral("<p id=\"UI_showHidden\" style=\"display:none\"><label><input type=\"checkbox\" checked onchange=\"updateHidden()\">"); AppendNonAsciiToNCR(showHiddenText, buffer); buffer.AppendLiteral("</label></p>\n"); } buffer.AppendLiteral("<table>\n"); nsXPIDLString columnText; buffer.AppendLiteral(" <thead>\n" " <tr>\n" " <th>"); - rv = mBundle->GetStringFromName(MOZ_UTF16("DirColName"), + rv = mBundle->GetStringFromName(u"DirColName", getter_Copies(columnText)); if (NS_FAILED(rv)) return rv; AppendNonAsciiToNCR(columnText, buffer); buffer.AppendLiteral("</th>\n" " <th>"); - rv = mBundle->GetStringFromName(MOZ_UTF16("DirColSize"), + rv = mBundle->GetStringFromName(u"DirColSize", getter_Copies(columnText)); if (NS_FAILED(rv)) return rv; AppendNonAsciiToNCR(columnText, buffer); buffer.AppendLiteral("</th>\n" " <th colspan=\"2\">"); - rv = mBundle->GetStringFromName(MOZ_UTF16("DirColMTime"), + rv = mBundle->GetStringFromName(u"DirColMTime", getter_Copies(columnText)); if (NS_FAILED(rv)) return rv; AppendNonAsciiToNCR(columnText, buffer); buffer.AppendLiteral("</th>\n" " </tr>\n" " </thead>\n"); buffer.AppendLiteral(" <tbody>\n"); @@ -791,17 +791,17 @@ nsIndexedToHTML::OnIndexAvailable(nsIReq nsAdoptingCString htmlFileExt(nsEscapeHTML(locEscaped.get())); pushBuffer.Append(htmlFileExt); } else { pushBuffer.AppendLiteral("unknown"); } pushBuffer.AppendLiteral("?size=16\" alt=\""); nsXPIDLString altText; - rv = mBundle->GetStringFromName(MOZ_UTF16("DirFileLabel"), + rv = mBundle->GetStringFromName(u"DirFileLabel", getter_Copies(altText)); if (NS_FAILED(rv)) return rv; AppendNonAsciiToNCR(altText, pushBuffer); pushBuffer.AppendLiteral("\">"); } pushBuffer.Append(escaped); pushBuffer.AppendLiteral("</a></td></tr></tbody></table></td>\n <td");
--- a/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp @@ -7,17 +7,17 @@ #include "nsEscape.h" #include "nsStringStream.h" #include "nsAutoPtr.h" #include "nsIChannel.h" #include <algorithm> #include "mozilla/UniquePtrExtensions.h" -#define TOKEN_DELIMITERS MOZ_UTF16("\t\r\n ") +#define TOKEN_DELIMITERS u"\t\r\n " using namespace mozilla; // nsISupports methods NS_IMPL_ISUPPORTS(nsTXTToHTMLConv, nsIStreamConverter, nsITXTToHTMLConv, nsIRequestObserver,
--- a/parser/html/nsHtml5PlainTextUtils.cpp +++ b/parser/html/nsHtml5PlainTextUtils.cpp @@ -26,15 +26,15 @@ nsHtml5PlainTextUtils::NewLinkAttributes nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ASSERTION(NS_SUCCEEDED(rv) && bundleService, "The bundle service could not be loaded"); nsCOMPtr<nsIStringBundle> bundle; rv = bundleService->CreateBundle("chrome://global/locale/browser.properties", getter_AddRefs(bundle)); NS_ASSERTION(NS_SUCCEEDED(rv) && bundle, "chrome://global/locale/browser.properties could not be loaded"); nsXPIDLString title; if (bundle) { - bundle->GetStringFromName(MOZ_UTF16("plainText.wordWrap"), getter_Copies(title)); + bundle->GetStringFromName(u"plainText.wordWrap", getter_Copies(title)); } nsString* titleCopy = new nsString(title); linkAttrs->addAttribute(nsHtml5AttributeName::ATTR_TITLE, titleCopy); return linkAttrs; }
--- a/rdf/base/nsRDFContainerUtils.cpp +++ b/rdf/base/nsRDFContainerUtils.cpp @@ -333,17 +333,17 @@ RDFContainerUtilsImpl::RDFContainerUtils gRDFService->GetResource(NS_LITERAL_CSTRING(RDF_NAMESPACE_URI "nextVal"), &kRDF_nextVal); gRDFService->GetResource(NS_LITERAL_CSTRING(RDF_NAMESPACE_URI "Bag"), &kRDF_Bag); gRDFService->GetResource(NS_LITERAL_CSTRING(RDF_NAMESPACE_URI "Seq"), &kRDF_Seq); gRDFService->GetResource(NS_LITERAL_CSTRING(RDF_NAMESPACE_URI "Alt"), &kRDF_Alt); - gRDFService->GetLiteral(MOZ_UTF16("1"), &kOne); + gRDFService->GetLiteral(u"1", &kOne); } } } RDFContainerUtilsImpl::~RDFContainerUtilsImpl() { #ifdef DEBUG_REFS
--- a/rdf/base/nsRDFContentSink.cpp +++ b/rdf/base/nsRDFContentSink.cpp @@ -1368,17 +1368,17 @@ RDFContentSinkImpl::ReinitContainer(nsIR // Mega-kludge to deal with the fact that Make[Seq|Alt|Bag] is // idempotent, and as such, containers will have state (e.g., // RDF:nextVal) maintained in the graph across loads. This // re-initializes each container's RDF:nextVal to '1', and 'marks' // the container as such. nsresult rv; nsCOMPtr<nsIRDFLiteral> one; - rv = gRDFService->GetLiteral(MOZ_UTF16("1"), getter_AddRefs(one)); + rv = gRDFService->GetLiteral(u"1", getter_AddRefs(one)); if (NS_FAILED(rv)) return rv; // Re-initialize the 'nextval' property nsCOMPtr<nsIRDFNode> nextval; rv = mDataSource->GetTarget(aContainer, kRDF_nextVal, true, getter_AddRefs(nextval)); if (NS_FAILED(rv)) return rv; rv = mDataSource->Change(aContainer, kRDF_nextVal, nextval, one);
--- a/rdf/datasource/nsFileSystemDataSource.cpp +++ b/rdf/datasource/nsFileSystemDataSource.cpp @@ -289,17 +289,17 @@ FileSystemDataSource::GetTarget(nsIRDFRe if (! tv) return NS_RDF_NO_VALUE; if (source == mNC_FileSystemRoot) { if (property == mNC_pulse) { nsIRDFLiteral *pulseLiteral; - mRDFService->GetLiteral(MOZ_UTF16("12"), &pulseLiteral); + mRDFService->GetLiteral(u"12", &pulseLiteral); *target = pulseLiteral; return NS_OK; } } else if (isFileURI(source)) { if (property == mNC_Name) { @@ -401,17 +401,17 @@ FileSystemDataSource::GetTarget(nsIRDFRe nsCOMPtr<nsIRDFLiteral> literal; mRDFService->GetLiteral(url.get(), getter_AddRefs(literal)); rv = literal->QueryInterface(NS_GET_IID(nsIRDFNode), (void**) target); return(rv); } else if (property == mNC_pulse) { nsCOMPtr<nsIRDFLiteral> pulseLiteral; - mRDFService->GetLiteral(MOZ_UTF16("12"), getter_AddRefs(pulseLiteral)); + mRDFService->GetLiteral(u"12", getter_AddRefs(pulseLiteral)); rv = pulseLiteral->QueryInterface(NS_GET_IID(nsIRDFNode), (void**) target); return(rv); } else if (property == mNC_Child) { // Oh this is evil. Somebody kill me now. nsCOMPtr<nsISimpleEnumerator> children; rv = GetFolderList(source, false, true, getter_AddRefs(children)); @@ -477,17 +477,17 @@ FileSystemDataSource::GetTargets(nsIRDFR { if (property == mNC_Child) { return GetVolumeList(targets); } else if (property == mNC_pulse) { nsCOMPtr<nsIRDFLiteral> pulseLiteral; - mRDFService->GetLiteral(MOZ_UTF16("12"), + mRDFService->GetLiteral(u"12", getter_AddRefs(pulseLiteral)); return NS_NewSingletonEnumerator(targets, pulseLiteral); } } else if (isFileURI(source)) { if (property == mNC_Child) { @@ -521,17 +521,17 @@ FileSystemDataSource::GetTargets(nsIRDFR rv = mRDFService->GetLiteral(url.get(), getter_AddRefs(literal)); if (NS_FAILED(rv)) return rv; return NS_NewSingletonEnumerator(targets, literal); } else if (property == mNC_pulse) { nsCOMPtr<nsIRDFLiteral> pulseLiteral; - rv = mRDFService->GetLiteral(MOZ_UTF16("12"), + rv = mRDFService->GetLiteral(u"12", getter_AddRefs(pulseLiteral)); if (NS_FAILED(rv)) return rv; return NS_NewSingletonEnumerator(targets, pulseLiteral); } } return NS_NewEmptyEnumerator(targets);
--- a/security/manager/pki/nsNSSDialogs.cpp +++ b/security/manager/pki/nsNSSDialogs.cpp @@ -351,17 +351,17 @@ nsNSSDialogs::GetPKCS12FilePassword(nsII nsCOMPtr<nsIPromptService> promptSvc( do_GetService(NS_PROMPTSERVICE_CONTRACTID)); if (!promptSvc) { return NS_ERROR_FAILURE; } nsAutoString msg; nsresult rv = mPIPStringBundle->GetStringFromName( - MOZ_UTF16("getPKCS12FilePasswordMessage"), getter_Copies(msg)); + u"getPKCS12FilePasswordMessage", getter_Copies(msg)); if (NS_FAILED(rv)) { return rv; } // Get the parent window for the dialog nsCOMPtr<mozIDOMWindowProxy> parent = do_GetInterface(ctx); bool ignored = false; char16_t* pwTemp = nullptr;
--- a/toolkit/components/commandlines/nsCommandLine.cpp +++ b/toolkit/components/commandlines/nsCommandLine.cpp @@ -520,17 +520,17 @@ nsCommandLine::EnumerateHandlers(Enumera rv = catman->GetCategoryEntry("command-line-handler", entry.get(), getter_Copies(contractID)); if (NS_FAILED(rv)) continue; nsCOMPtr<nsICommandLineHandler> clh(do_GetService(contractID.get())); if (!clh) { - LogConsoleMessage(MOZ_UTF16("Contract ID '%s' was registered as a command line handler for entry '%s', but could not be created."), + LogConsoleMessage(u"Contract ID '%s' was registered as a command line handler for entry '%s', but could not be created.", contractID.get(), entry.get()); continue; } rv = (aCallback)(clh, this, aClosure); if (rv == NS_ERROR_ABORT) break;
--- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -1370,17 +1370,17 @@ nsDownloadManager::GetDefaultDownloadsDi // Vista: // Downloads // XP/2K: // My Documents/Downloads // Linux: // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; - mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"), + mBundle->GetStringFromName(u"downloadsFolder", getter_Copies(folderName)); #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, NS_GET_IID(nsIFile), getter_AddRefs(downloadDir)); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) @@ -2453,52 +2453,52 @@ nsDownloadManager::Observe(nsISupports * CleanUp(); } else if (strcmp(aTopic, "quit-application-requested") == 0 && currDownloadCount) { nsCOMPtr<nsISupportsPRBool> cancelDownloads = do_QueryInterface(aSubject, &rv); NS_ENSURE_SUCCESS(rv, rv); #ifndef XP_MACOSX ConfirmCancelDownloads(currDownloadCount, cancelDownloads, - MOZ_UTF16("quitCancelDownloadsAlertTitle"), - MOZ_UTF16("quitCancelDownloadsAlertMsgMultiple"), - MOZ_UTF16("quitCancelDownloadsAlertMsg"), - MOZ_UTF16("dontQuitButtonWin")); + u"quitCancelDownloadsAlertTitle", + u"quitCancelDownloadsAlertMsgMultiple", + u"quitCancelDownloadsAlertMsg", + u"dontQuitButtonWin"); #else ConfirmCancelDownloads(currDownloadCount, cancelDownloads, - MOZ_UTF16("quitCancelDownloadsAlertTitle"), - MOZ_UTF16("quitCancelDownloadsAlertMsgMacMultiple"), - MOZ_UTF16("quitCancelDownloadsAlertMsgMac"), - MOZ_UTF16("dontQuitButtonMac")); + u"quitCancelDownloadsAlertTitle", + u"quitCancelDownloadsAlertMsgMacMultiple", + u"quitCancelDownloadsAlertMsgMac", + u"dontQuitButtonMac"); #endif } else if (strcmp(aTopic, "offline-requested") == 0 && currDownloadCount) { nsCOMPtr<nsISupportsPRBool> cancelDownloads = do_QueryInterface(aSubject, &rv); NS_ENSURE_SUCCESS(rv, rv); ConfirmCancelDownloads(currDownloadCount, cancelDownloads, - MOZ_UTF16("offlineCancelDownloadsAlertTitle"), - MOZ_UTF16("offlineCancelDownloadsAlertMsgMultiple"), - MOZ_UTF16("offlineCancelDownloadsAlertMsg"), - MOZ_UTF16("dontGoOfflineButton")); + u"offlineCancelDownloadsAlertTitle", + u"offlineCancelDownloadsAlertMsgMultiple", + u"offlineCancelDownloadsAlertMsg", + u"dontGoOfflineButton"); } else if (strcmp(aTopic, NS_IOSERVICE_GOING_OFFLINE_TOPIC) == 0) { // Pause all downloads, and mark them to auto-resume. (void)PauseAllDownloads(true); } else if (strcmp(aTopic, NS_IOSERVICE_OFFLINE_STATUS_TOPIC) == 0 && nsDependentString(aData).EqualsLiteral(NS_IOSERVICE_ONLINE)) { // We can now resume all downloads that are supposed to auto-resume. (void)ResumeAllDownloads(false); } else if (strcmp(aTopic, "alertclickcallback") == 0) { nsCOMPtr<nsIDownloadManagerUI> dmui = do_GetService("@mozilla.org/download-manager-ui;1", &rv); NS_ENSURE_SUCCESS(rv, rv); return dmui->Show(nullptr, nullptr, nsIDownloadManagerUI::REASON_USER_INTERACTED, - aData && NS_strcmp(aData, MOZ_UTF16("private")) == 0); + aData && NS_strcmp(aData, u"private") == 0); } else if (strcmp(aTopic, "sleep_notification") == 0 || strcmp(aTopic, "suspend_process_notification") == 0) { // Pause downloads if we're sleeping, and mark the downloads as auto-resume (void)PauseAllDownloads(true); } else if (strcmp(aTopic, "wake_notification") == 0 || strcmp(aTopic, "resume_process_notification") == 0) { int32_t resumeOnWakeDelay = 10000; nsCOMPtr<nsIPrefBranch> pref = do_GetService(NS_PREFSERVICE_CONTRACTID); @@ -2523,20 +2523,20 @@ nsDownloadManager::Observe(nsISupports * // private browsing mode (thereby cancelling them). Otherwise, silently proceed. if (!mCurrentPrivateDownloads.Count()) return NS_OK; nsCOMPtr<nsISupportsPRBool> cancelDownloads = do_QueryInterface(aSubject, &rv); NS_ENSURE_SUCCESS(rv, rv); ConfirmCancelDownloads(mCurrentPrivateDownloads.Count(), cancelDownloads, - MOZ_UTF16("leavePrivateBrowsingCancelDownloadsAlertTitle"), - MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2"), - MOZ_UTF16("leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2"), - MOZ_UTF16("dontLeavePrivateBrowsingButton2")); + u"leavePrivateBrowsingCancelDownloadsAlertTitle", + u"leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2", + u"leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2", + u"dontLeavePrivateBrowsingButton2"); } return NS_OK; } void nsDownloadManager::ConfirmCancelDownloads(int32_t aCount, nsISupportsPRBool *aCancelDownloads, @@ -2556,31 +2556,31 @@ nsDownloadManager::ConfirmCancelDownload mBundle->GetStringFromName(aTitle, getter_Copies(title)); nsAutoString countString; countString.AppendInt(aCount); const char16_t *strings[1] = { countString.get() }; if (aCount > 1) { mBundle->FormatStringFromName(aCancelMessageMultiple, strings, 1, getter_Copies(message)); - mBundle->FormatStringFromName(MOZ_UTF16("cancelDownloadsOKTextMultiple"), + mBundle->FormatStringFromName(u"cancelDownloadsOKTextMultiple", strings, 1, getter_Copies(quitButton)); } else { mBundle->GetStringFromName(aCancelMessageSingle, getter_Copies(message)); - mBundle->GetStringFromName(MOZ_UTF16("cancelDownloadsOKText"), + mBundle->GetStringFromName(u"cancelDownloadsOKText", getter_Copies(quitButton)); } mBundle->GetStringFromName(aDontCancelButton, getter_Copies(dontQuitButton)); // Get Download Manager window, to be parent of alert. nsCOMPtr<nsIWindowMediator> wm = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID); nsCOMPtr<mozIDOMWindowProxy> dmWindow; if (wm) { - wm->GetMostRecentWindow(MOZ_UTF16("Download:Manager"), + wm->GetMostRecentWindow(u"Download:Manager", getter_AddRefs(dmWindow)); } // Show alert. nsCOMPtr<nsIPromptService> prompter(do_GetService(NS_PROMPTSERVICE_CONTRACTID)); if (prompter) { int32_t flags = (nsIPromptService::BUTTON_TITLE_IS_STRING * nsIPromptService::BUTTON_POS_0) + (nsIPromptService::BUTTON_TITLE_IS_STRING * nsIPromptService::BUTTON_POS_1); bool nothing = false; @@ -2737,20 +2737,20 @@ nsDownload::SetState(DownloadState aStat mDownloadManager->mCurrentDownloads.Count(); if (showTaskbarAlert && size == 0) { nsCOMPtr<nsIAlertsService> alerts = do_GetService("@mozilla.org/alerts-service;1"); if (alerts) { nsXPIDLString title, message; mDownloadManager->mBundle->GetStringFromName( - MOZ_UTF16("downloadsCompleteTitle"), + u"downloadsCompleteTitle", getter_Copies(title)); mDownloadManager->mBundle->GetStringFromName( - MOZ_UTF16("downloadsCompleteMsg"), + u"downloadsCompleteMsg", getter_Copies(message)); bool removeWhenDone = mDownloadManager->GetRetentionBehavior() == 0; // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -3741,34 +3741,34 @@ nsDownload::FailDownload(nsresult aStatu // Grab the bundle before potentially losing our member variables nsCOMPtr<nsIStringBundle> bundle = mDownloadManager->mBundle; (void)SetState(nsIDownloadManager::DOWNLOAD_FAILED); // Get title for alert. nsXPIDLString title; nsresult rv = bundle->GetStringFromName( - MOZ_UTF16("downloadErrorAlertTitle"), getter_Copies(title)); + u"downloadErrorAlertTitle", getter_Copies(title)); NS_ENSURE_SUCCESS(rv, rv); // Get a generic message if we weren't supplied one nsXPIDLString message; message = aMessage; if (message.IsEmpty()) { rv = bundle->GetStringFromName( - MOZ_UTF16("downloadErrorGeneric"), getter_Copies(message)); + u"downloadErrorGeneric", getter_Copies(message)); NS_ENSURE_SUCCESS(rv, rv); } // Get Download Manager window to be parent of alert nsCOMPtr<nsIWindowMediator> wm = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<mozIDOMWindowProxy> dmWindow; - rv = wm->GetMostRecentWindow(MOZ_UTF16("Download:Manager"), + rv = wm->GetMostRecentWindow(u"Download:Manager", getter_AddRefs(dmWindow)); NS_ENSURE_SUCCESS(rv, rv); // Show alert nsCOMPtr<nsIPromptService> prompter = do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv); NS_ENSURE_SUCCESS(rv, rv); return prompter->Alert(dmWindow, title, message);
--- a/toolkit/components/filepicker/nsFileView.cpp +++ b/toolkit/components/filepicker/nsFileView.cpp @@ -856,17 +856,17 @@ nsFileView::FilterFiles() // need to check return value for GetLeafName() continue; } if (!isHidden) { for (uint32_t j = 0; j < filterCount; ++j) { bool matched = false; if (!nsCRT::strcmp(mCurrentFilters.ElementAt(j), - MOZ_UTF16("..apps"))) + u"..apps")) { file->IsExecutable(&matched); } else matched = (NS_WildCardMatch(ucsLeafName.get(), mCurrentFilters.ElementAt(j), true) == MATCH); if (matched) {
--- a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp +++ b/toolkit/components/jsdownloads/src/DownloadPlatform.cpp @@ -133,17 +133,17 @@ nsresult DownloadPlatform::DownloadDone( if (mozilla::Preferences::GetBool("device.storage.enabled", true)) { // Tell DeviceStorage that a new file may have been added. nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); nsCOMPtr<nsISupportsString> pathString = do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID); if (obs && pathString) { if (NS_SUCCEEDED(pathString->SetData(path))) { (void)obs->NotifyObservers(pathString, "download-watcher-notify", - MOZ_UTF16("modified")); + u"modified"); } } } } #endif return NS_OK;
--- a/toolkit/components/places/Database.cpp +++ b/toolkit/components/places/Database.cpp @@ -975,38 +975,38 @@ Database::CreateBookmarkRoots() nsXPIDLString rootTitle; // The first root's title is an empty string. rv = CreateRoot(mMainConn, NS_LITERAL_CSTRING("places"), NS_LITERAL_CSTRING("root________"), rootTitle); if (NS_FAILED(rv)) return rv; // Fetch the internationalized folder name from the string bundle. - rv = bundle->GetStringFromName(MOZ_UTF16("BookmarksMenuFolderTitle"), + rv = bundle->GetStringFromName(u"BookmarksMenuFolderTitle", getter_Copies(rootTitle)); if (NS_FAILED(rv)) return rv; rv = CreateRoot(mMainConn, NS_LITERAL_CSTRING("menu"), NS_LITERAL_CSTRING("menu________"), rootTitle); if (NS_FAILED(rv)) return rv; - rv = bundle->GetStringFromName(MOZ_UTF16("BookmarksToolbarFolderTitle"), + rv = bundle->GetStringFromName(u"BookmarksToolbarFolderTitle", getter_Copies(rootTitle)); if (NS_FAILED(rv)) return rv; rv = CreateRoot(mMainConn, NS_LITERAL_CSTRING("toolbar"), NS_LITERAL_CSTRING("toolbar_____"), rootTitle); if (NS_FAILED(rv)) return rv; - rv = bundle->GetStringFromName(MOZ_UTF16("TagsFolderTitle"), + rv = bundle->GetStringFromName(u"TagsFolderTitle", getter_Copies(rootTitle)); if (NS_FAILED(rv)) return rv; rv = CreateRoot(mMainConn, NS_LITERAL_CSTRING("tags"), NS_LITERAL_CSTRING("tags________"), rootTitle); if (NS_FAILED(rv)) return rv; - rv = bundle->GetStringFromName(MOZ_UTF16("OtherBookmarksFolderTitle"), + rv = bundle->GetStringFromName(u"OtherBookmarksFolderTitle", getter_Copies(rootTitle)); if (NS_FAILED(rv)) return rv; rv = CreateRoot(mMainConn, NS_LITERAL_CSTRING("unfiled"), NS_LITERAL_CSTRING("unfiled_____"), rootTitle); if (NS_FAILED(rv)) return rv; #if DEBUG nsCOMPtr<mozIStorageStatement> stmt;
--- a/toolkit/components/places/nsFaviconService.cpp +++ b/toolkit/components/places/nsFaviconService.cpp @@ -231,18 +231,18 @@ nsFaviconService::SetAndFetchFaviconForP } nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingPrincipal; MOZ_ASSERT(loadingPrincipal, "please provide aLoadingPrincipal for this favicon"); if (!loadingPrincipal) { // Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided // so addons not providing a loadingPrincipal do not break in release builds. const char16_t* params[] = { - MOZ_UTF16("nsFaviconService::setAndFetchFaviconForPage()"), - MOZ_UTF16("nsFaviconService::setAndFetchFaviconForPage(..., [optional aLoadingPrincipal])") + u"nsFaviconService::setAndFetchFaviconForPage()", + u"nsFaviconService::setAndFetchFaviconForPage(..., [optional aLoadingPrincipal])" }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, ArrayLength(params)); loadingPrincipal = nsContentUtils::GetSystemPrincipal(); @@ -393,18 +393,18 @@ nsFaviconService::ReplaceFaviconDataFrom NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIPrincipal> loadingPrincipal = aLoadingPrincipal; MOZ_ASSERT(loadingPrincipal, "please provide aLoadingPrincipal for this favicon"); if (!loadingPrincipal) { // Bug 1227289 : Let's default to the systemPrincipal if no loadingPrincipal is provided // so addons not providing a loadingPrincipal do not break in release builds. const char16_t* params[] = { - MOZ_UTF16("nsFaviconService::ReplaceFaviconDataFromDataURL()"), - MOZ_UTF16("nsFaviconService::ReplaceFaviconDataFromDataURL(..., [optional aLoadingPrincipal])") + u"nsFaviconService::ReplaceFaviconDataFromDataURL()", + u"nsFaviconService::ReplaceFaviconDataFromDataURL(..., [optional aLoadingPrincipal])" }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, NS_LITERAL_CSTRING("Security by Default"), nullptr, // aDocument nsContentUtils::eNECKO_PROPERTIES, "APIDeprecationWarning", params, ArrayLength(params));
--- a/toolkit/components/places/nsNavHistory.cpp +++ b/toolkit/components/places/nsNavHistory.cpp @@ -1648,78 +1648,78 @@ PlacesSQLQueryBuilder::SelectAsDay() // These are used as limits for the inside containers. nsAutoCString sqlFragmentContainerBeginTime, sqlFragmentContainerEndTime; // These are used to query if the container should be visible. nsAutoCString sqlFragmentSearchBeginTime, sqlFragmentSearchEndTime; switch(i) { case 0: // Today history->GetStringFromName( - MOZ_UTF16("finduri-AgeInDays-is-0"), dateName); + u"finduri-AgeInDays-is-0", dateName); // From start of today sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','utc')*1000000)"); // To now (tomorrow) sqlFragmentContainerEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','+1 day','utc')*1000000)"); // Search for the same timeframe. sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime; sqlFragmentSearchEndTime = sqlFragmentContainerEndTime; break; case 1: // Yesterday history->GetStringFromName( - MOZ_UTF16("finduri-AgeInDays-is-1"), dateName); + u"finduri-AgeInDays-is-1", dateName); // From start of yesterday sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','-1 day','utc')*1000000)"); // To start of today sqlFragmentContainerEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','utc')*1000000)"); // Search for the same timeframe. sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime; sqlFragmentSearchEndTime = sqlFragmentContainerEndTime; break; case 2: // Last 7 days history->GetAgeInDaysString(7, - MOZ_UTF16("finduri-AgeInDays-last-is"), dateName); + u"finduri-AgeInDays-last-is", dateName); // From start of 7 days ago sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','-7 days','utc')*1000000)"); // To now (tomorrow) sqlFragmentContainerEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','+1 day','utc')*1000000)"); // This is an overlapped container, but we show it only if there are // visits older than yesterday. sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime; sqlFragmentSearchEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','-2 days','utc')*1000000)"); break; case 3: // This month history->GetStringFromName( - MOZ_UTF16("finduri-AgeInMonths-is-0"), dateName); + u"finduri-AgeInMonths-is-0", dateName); // From start of this month sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of month','utc')*1000000)"); // To now (tomorrow) sqlFragmentContainerEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','+1 day','utc')*1000000)"); // This is an overlapped container, but we show it only if there are // visits older than 7 days ago. sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime; sqlFragmentSearchEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of day','-7 days','utc')*1000000)"); break; default: if (i == HISTORY_ADDITIONAL_DATE_CONT_NUM + 6) { // Older than 6 months history->GetAgeInDaysString(6, - MOZ_UTF16("finduri-AgeInMonths-isgreater"), dateName); + u"finduri-AgeInMonths-isgreater", dateName); // From start of epoch sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING( "(datetime(0, 'unixepoch')*1000000)"); // To start of 6 months ago ( 5 months + this month). sqlFragmentContainerEndTime = NS_LITERAL_CSTRING( "(strftime('%s','now','localtime','start of month','-5 months','utc')*1000000)"); // Search for the same timeframe. sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime; @@ -1809,17 +1809,17 @@ PlacesSQLQueryBuilder::SelectAsDay() nsresult PlacesSQLQueryBuilder::SelectAsSite() { nsAutoCString localFiles; nsNavHistory *history = nsNavHistory::GetHistoryService(); NS_ENSURE_STATE(history); - history->GetStringFromName(MOZ_UTF16("localhost"), localFiles); + history->GetStringFromName(u"localhost", localFiles); mAddParams.Put(NS_LITERAL_CSTRING("localhost"), localFiles); // If there are additional conditions the query has to join on visits too. nsAutoCString visitsJoin; nsAutoCString additionalConditions; nsAutoCString timeConstraints; if (!mConditions.IsEmpty()) { visitsJoin.AssignLiteral("JOIN moz_historyvisits v ON v.place_id = h.id "); @@ -4253,17 +4253,17 @@ void nsNavHistory::TitleForDomain(const nsCString& domain, nsACString& aTitle) { if (! domain.IsEmpty()) { aTitle = domain; return; } // use the localized one instead - GetStringFromName(MOZ_UTF16("localhost"), aTitle); + GetStringFromName(u"localhost", aTitle); } void nsNavHistory::GetAgeInDaysString(int32_t aInt, const char16_t *aName, nsACString& aResult) { nsIStringBundle *bundle = GetBundle(); if (bundle) { @@ -4323,17 +4323,17 @@ nsNavHistory::GetMonthYear(int32_t aMont nsAutoString yearString; yearString.AppendInt(aYear); const char16_t* strings[2] = { NS_ConvertUTF8toUTF16(monthName).get() , yearString.get() }; nsXPIDLString value; if (NS_SUCCEEDED(bundle->FormatStringFromName( - MOZ_UTF16("finduri-MonthYear"), strings, 2, + u"finduri-MonthYear", strings, 2, getter_Copies(value) ))) { CopyUTF16toUTF8(value, aResult); return; } } aResult.AppendLiteral("finduri-MonthYear"); }
--- a/toolkit/components/places/nsNavHistoryResult.cpp +++ b/toolkit/components/places/nsNavHistoryResult.cpp @@ -4631,17 +4631,17 @@ nsNavHistoryResult::OnVisit(nsIURI* aURI NS_ENSURE_SUCCESS(rv, rv); nsAutoCString title; rv = firstChild->GetTitle(title); NS_ENSURE_SUCCESS(rv, rv); nsNavHistory* history = nsNavHistory::GetHistoryService(); NS_ENSURE_TRUE(history, NS_OK); nsAutoCString todayLabel; history->GetStringFromName( - MOZ_UTF16("finduri-AgeInDays-is-0"), todayLabel); + u"finduri-AgeInDays-is-0", todayLabel); todayIsMissing = !todayLabel.Equals(title); } } if (!added || todayIsMissing) { // None of registered query observers has accepted our URI. This means, // that a matching query either was not expanded or it does not exist. uint32_t resultType = mRootNode->mOptions->ResultType();
--- a/toolkit/mozapps/extensions/AddonContentPolicy.cpp +++ b/toolkit/mozapps/extensions/AddonContentPolicy.cpp @@ -28,19 +28,19 @@ using namespace mozilla; /* Enforces content policies for WebExtension scopes. Currently: * * - Prevents loading scripts with a non-default JavaScript version. * - Checks custom content security policies for sufficiently stringent * script-src and object-src directives. */ #define VERSIONED_JS_BLOCKED_MESSAGE \ - MOZ_UTF16("Versioned JavaScript is a non-standard, deprecated extension, and is ") \ - MOZ_UTF16("not supported in WebExtension code. For alternatives, please see: ") \ - MOZ_UTF16("https://developer.mozilla.org/Add-ons/WebExtensions/Tips") + u"Versioned JavaScript is a non-standard, deprecated extension, and is " \ + u"not supported in WebExtension code. For alternatives, please see: " \ + u"https://developer.mozilla.org/Add-ons/WebExtensions/Tips" AddonContentPolicy::AddonContentPolicy() { } AddonContentPolicy::~AddonContentPolicy() { } @@ -233,17 +233,17 @@ class CSPValidator final : public nsCSPS if (!HostIsAllowed(host)) { FormatError("csp.error.illegal-host-wildcard", scheme); return false; } } else if (scheme.LowerCaseEqualsLiteral("moz-extension")) { // The CSP parser silently converts 'self' keywords to the origin // URL, so we need to reconstruct the URL to see if it was present. if (!mFoundSelf) { - nsAutoString url(MOZ_UTF16("moz-extension://")); + nsAutoString url(u"moz-extension://"); url.Append(host); mFoundSelf = url.Equals(mURL); } if (host.IsEmpty() || host.EqualsLiteral("*")) { FormatError("csp.error.missing-host", scheme); return false; @@ -404,17 +404,17 @@ AddonContentPolicy::ValidateAddonCSP(con nsAString& aResult) { nsresult rv; // Validate against a randomly-generated extension origin. // There is no add-on-specific behavior in the CSP code, beyond the ability // for add-ons to specify a custom policy, but the parser requires a valid // origin in order to operate correctly. - nsAutoString url(MOZ_UTF16("moz-extension://")); + nsAutoString url(u"moz-extension://"); { nsCOMPtr<nsIUUIDGenerator> uuidgen = services::GetUUIDGenerator(); NS_ENSURE_TRUE(uuidgen, NS_ERROR_FAILURE); nsID id; rv = uuidgen->GenerateUUIDInPlace(&id); NS_ENSURE_SUCCESS(rv, rv);
--- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -251,17 +251,17 @@ nsAlertsIconListener::InitAlertAsync(nsI nsAutoCString appShortName; if (bundleService) { nsCOMPtr<nsIStringBundle> bundle; bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(bundle)); nsAutoString appName; if (bundle) { - bundle->GetStringFromName(MOZ_UTF16("brandShortName"), + bundle->GetStringFromName(u"brandShortName", getter_Copies(appName)); appShortName = NS_ConvertUTF16toUTF8(appName); } else { NS_WARNING("brand.properties not present, using default application name"); appShortName.AssignLiteral("Mozilla"); } } else { appShortName.AssignLiteral("Mozilla");
--- a/toolkit/xre/ProfileReset.cpp +++ b/toolkit/xre/ProfileReset.cpp @@ -75,17 +75,17 @@ ProfileResetCleanup(nsIToolkitProfile* a rv = sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); if (!sb) return NS_ERROR_FAILURE; NS_ConvertUTF8toUTF16 appName(gAppData->name); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString resetBackupDirectoryName; - static const char16_t* kResetBackupDirectory = MOZ_UTF16("resetBackupDirectory"); + static const char16_t* kResetBackupDirectory = u"resetBackupDirectory"; rv = sb->FormatStringFromName(kResetBackupDirectory, params, 2, getter_Copies(resetBackupDirectoryName)); // Get info to copy the old root profile dir to the desktop as a backup. nsCOMPtr<nsIFile> backupDest, containerDest, profileDest; rv = NS_GetSpecialDirectory(NS_OS_DESKTOP_DIR, getter_AddRefs(backupDest)); if (NS_FAILED(rv)) { // Fall back to the home directory if the desktop is not available.
--- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1830,27 +1830,27 @@ ProfileLockedDialog(nsIFile* aProfileDir sbs->CreateBundle(kProfileProperties, getter_AddRefs(sb)); NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); NS_ConvertUTF8toUTF16 appName(gAppData->name); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString killMessage; #ifndef XP_MACOSX - sb->FormatStringFromName(aUnlocker ? MOZ_UTF16("restartMessageUnlocker") - : MOZ_UTF16("restartMessageNoUnlocker"), + sb->FormatStringFromName(aUnlocker ? u"restartMessageUnlocker" + : u"restartMessageNoUnlocker", params, 2, getter_Copies(killMessage)); #else - sb->FormatStringFromName(aUnlocker ? MOZ_UTF16("restartMessageUnlockerMac") - : MOZ_UTF16("restartMessageNoUnlockerMac"), + sb->FormatStringFromName(aUnlocker ? u"restartMessageUnlockerMac" + : u"restartMessageNoUnlockerMac", params, 2, getter_Copies(killMessage)); #endif nsXPIDLString killTitle; - sb->FormatStringFromName(MOZ_UTF16("restartTitle"), + sb->FormatStringFromName(u"restartTitle", params, 1, getter_Copies(killTitle)); if (!killMessage || !killTitle) return NS_ERROR_FAILURE; nsCOMPtr<nsIPromptService> ps (do_GetService(NS_PROMPTSERVICE_CONTRACTID)); NS_ENSURE_TRUE(ps, NS_ERROR_FAILURE); @@ -1923,20 +1923,20 @@ ProfileMissingDialog(nsINativeAppSupport NS_ENSURE_TRUE_LOG(sbs, NS_ERROR_FAILURE); NS_ConvertUTF8toUTF16 appName(gAppData->name); const char16_t* params[] = {appName.get(), appName.get()}; nsXPIDLString missingMessage; // profileMissing - sb->FormatStringFromName(MOZ_UTF16("profileMissing"), params, 2, getter_Copies(missingMessage)); + sb->FormatStringFromName(u"profileMissing", params, 2, getter_Copies(missingMessage)); nsXPIDLString missingTitle; - sb->FormatStringFromName(MOZ_UTF16("profileMissingTitle"), + sb->FormatStringFromName(u"profileMissingTitle", params, 1, getter_Copies(missingTitle)); if (missingMessage && missingTitle) { nsCOMPtr<nsIPromptService> ps (do_GetService(NS_PROMPTSERVICE_CONTRACTID)); NS_ENSURE_TRUE(ps, NS_ERROR_FAILURE); ps->Alert(nullptr, missingTitle, missingMessage);
--- a/toolkit/xre/nsNativeAppSupportWin.cpp +++ b/toolkit/xre/nsNativeAppSupportWin.cpp @@ -1255,17 +1255,17 @@ HDDEDATA nsNativeAppSupportWin::CreateDD mApplication, CF_TEXT, 0 ); return result; } void nsNativeAppSupportWin::ActivateLastWindow() { nsCOMPtr<mozIDOMWindowProxy> navWin; - GetMostRecentWindow( MOZ_UTF16("navigator:browser"), getter_AddRefs( navWin ) ); + GetMostRecentWindow( u"navigator:browser", getter_AddRefs( navWin ) ); if ( navWin ) { // Activate that window. activateWindow( navWin ); } else { // Need to create a Navigator window, then. OpenBrowserWindow(); } }
--- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -1207,17 +1207,17 @@ nsXREDirProvider::DoShutdown() Unused << DeleteDirIfExists(mContentProcessSandboxTempDir); } #endif nsCOMPtr<nsIObserverService> obsSvc = mozilla::services::GetObserverService(); NS_ASSERTION(obsSvc, "No observer service?"); if (obsSvc) { - static const char16_t kShutdownPersist[] = MOZ_UTF16("shutdown-persist"); + static const char16_t kShutdownPersist[] = u"shutdown-persist"; obsSvc->NotifyObservers(nullptr, "profile-change-net-teardown", kShutdownPersist); obsSvc->NotifyObservers(nullptr, "profile-change-teardown", kShutdownPersist); // Phase 2c: Now that things are torn down, force JS GC so that things which depend on // resources which are about to go away in "profile-before-change" are destroyed first. JSRuntime *rt = xpc::GetJSRuntime(); if (rt) {
--- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp +++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp @@ -379,28 +379,28 @@ nsMIMEInfoAndroid::nsMIMEInfoAndroid(con mHandlerApps = do_CreateInstance(NS_ARRAY_CONTRACTID, &rv); mHandlerApps->AppendElement(mPrefApp, false); } NS_IMPL_ISUPPORTS(nsMIMEInfoAndroid::SystemChooser, nsIHandlerApp) nsresult nsMIMEInfoAndroid::SystemChooser::GetName(nsAString & aName) { - aName.AssignLiteral(MOZ_UTF16("Android chooser")); + aName.AssignLiteral(u"Android chooser"); return NS_OK; } nsresult nsMIMEInfoAndroid::SystemChooser::SetName(const nsAString&) { return NS_OK; } nsresult nsMIMEInfoAndroid::SystemChooser::GetDetailedDescription(nsAString & aDesc) { - aDesc.AssignLiteral(MOZ_UTF16("Android's default handler application chooser")); + aDesc.AssignLiteral(u"Android's default handler application chooser"); return NS_OK; } nsresult nsMIMEInfoAndroid::SystemChooser::SetDetailedDescription(const nsAString&) { return NS_OK; }
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -1908,17 +1908,17 @@ void nsExternalAppHandler::SendStatusCha mDialogProgressListener->OnStatusChange(nullptr, (type == kReadError) ? aRequest : nullptr, rv, msgText); } else if (mTransfer) { mTransfer->OnStatusChange(nullptr, (type == kReadError) ? aRequest : nullptr, rv, msgText); } else if (XRE_IsParentProcess()) { // We don't have a listener. Simply show the alert ourselves. nsresult qiRv; nsCOMPtr<nsIPrompt> prompter(do_GetInterface(GetDialogParent(), &qiRv)); nsXPIDLString title; - bundle->FormatStringFromName(MOZ_UTF16("title"), + bundle->FormatStringFromName(u"title", strings, 1, getter_Copies(title)); MOZ_LOG(nsExternalHelperAppService::mLog, LogLevel::Debug, ("mContentContext=0x%p, prompter=0x%p, qi rv=0x%08X, title='%s', msg='%s'", mContentContext.get(), prompter.get(),
--- a/widget/android/AndroidContentController.cpp +++ b/widget/android/AndroidContentController.cpp @@ -127,17 +127,17 @@ AndroidContentController::NotifyAPZState // only happens on the main thread. ChromeProcessController::NotifyAPZStateChange(aGuid, aChange, aArg); if (NS_IsMainThread()) { nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); if (aChange == layers::GeckoContentController::APZStateChange::eTransformEnd) { // This is used by tests to determine when the APZ is done doing whatever // it's doing. XXX generify this as needed when writing additional tests. observerService->NotifyObservers(nullptr, "APZ:TransformEnd", nullptr); - observerService->NotifyObservers(nullptr, "PanZoom:StateChange", MOZ_UTF16("NOTHING")); + observerService->NotifyObservers(nullptr, "PanZoom:StateChange", u"NOTHING"); } else if (aChange == layers::GeckoContentController::APZStateChange::eTransformBegin) { - observerService->NotifyObservers(nullptr, "PanZoom:StateChange", MOZ_UTF16("PANNING")); + observerService->NotifyObservers(nullptr, "PanZoom:StateChange", u"PANNING"); } } } } // namespace widget } // namespace mozilla
--- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -827,19 +827,17 @@ nsAppShell::LegacyGeckoEvent::Run() nsAppShell::Get()->AddObserver(curEvent->Characters(), curEvent->Observer()); break; case AndroidGeckoEvent::LOW_MEMORY: // TODO hook in memory-reduction stuff for different levels here if (curEvent->MetaState() >= AndroidGeckoEvent::MEMORY_PRESSURE_MEDIUM) { nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService(); if (os) { - os->NotifyObservers(nullptr, - "memory-pressure", - MOZ_UTF16("low-memory")); + os->NotifyObservers(nullptr, "memory-pressure", u"low-memory"); } } break; case AndroidGeckoEvent::TELEMETRY_HISTOGRAM_ADD: // If the extras field is not empty then this is a keyed histogram. if (!curEvent->CharactersExtra().IsVoid()) { Telemetry::Accumulate(NS_ConvertUTF16toUTF8(curEvent->Characters()).get(),
--- a/widget/android/nsPrintOptionsAndroid.cpp +++ b/widget/android/nsPrintOptionsAndroid.cpp @@ -7,17 +7,17 @@ #include "nsPrintSettingsImpl.h" class nsPrintSettingsAndroid : public nsPrintSettings { public: nsPrintSettingsAndroid() { // The aim here is to set up the objects enough that silent printing works SetOutputFormat(nsIPrintSettings::kOutputFormatPDF); - SetPrinterName(MOZ_UTF16("PDF printer")); + SetPrinterName(u"PDF printer"); } }; nsPrintOptionsAndroid::nsPrintOptionsAndroid() { }
--- a/widget/cocoa/OSXNotificationCenter.mm +++ b/widget/cocoa/OSXNotificationCenter.mm @@ -292,17 +292,17 @@ OSXNotificationCenter::ShowAlertWithIcon NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIStringBundle> bundle; nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID); sbs->CreateBundle("chrome://alerts/locale/alert.properties", getter_AddRefs(bundle)); if (!hostPort.IsEmpty() && bundle) { const char16_t* formatStrings[] = { hostPort.get() }; nsXPIDLString notificationSource; - bundle->FormatStringFromName(MOZ_UTF16("source.label"), + bundle->FormatStringFromName(u"source.label", formatStrings, ArrayLength(formatStrings), getter_Copies(notificationSource)); notification.subtitle = nsCocoaUtils::ToNSString(notificationSource); } nsAutoString text; rv = aAlert->GetText(text); @@ -311,28 +311,28 @@ OSXNotificationCenter::ShowAlertWithIcon notification.soundName = NSUserNotificationDefaultSoundName; notification.hasActionButton = NO; // If this is not an application/extension alert, show additional actions dealing with permissions. bool isActionable; if (bundle && NS_SUCCEEDED(aAlert->GetActionable(&isActionable)) && isActionable) { nsXPIDLString closeButtonTitle, actionButtonTitle, disableButtonTitle, settingsButtonTitle; - bundle->GetStringFromName(MOZ_UTF16("closeButton.title"), + bundle->GetStringFromName(u"closeButton.title", getter_Copies(closeButtonTitle)); - bundle->GetStringFromName(MOZ_UTF16("actionButton.label"), + bundle->GetStringFromName(u"actionButton.label", getter_Copies(actionButtonTitle)); if (!hostPort.IsEmpty()) { const char16_t* formatStrings[] = { hostPort.get() }; - bundle->FormatStringFromName(MOZ_UTF16("webActions.disableForOrigin.label"), + bundle->FormatStringFromName(u"webActions.disableForOrigin.label", formatStrings, ArrayLength(formatStrings), getter_Copies(disableButtonTitle)); } - bundle->GetStringFromName(MOZ_UTF16("webActions.settings.label"), + bundle->GetStringFromName(u"webActions.settings.label", getter_Copies(settingsButtonTitle)); notification.otherButtonTitle = nsCocoaUtils::ToNSString(closeButtonTitle); // OS X 10.8 only shows action buttons if the "Alerts" style is set in // Notification Center preferences, and doesn't support the alternate // action menu. if ([notification respondsToSelector:@selector(set_showsButtons:)] &&
--- a/widget/cocoa/nsFilePicker.mm +++ b/widget/cocoa/nsFilePicker.mm @@ -115,18 +115,17 @@ NSView* nsFilePicker::GetAccessoryView() NSString* label = @"Format:"; // Try to get the localized string. nsCOMPtr<nsIStringBundleService> sbs = do_GetService(NS_STRINGBUNDLE_CONTRACTID); nsCOMPtr<nsIStringBundle> bundle; nsresult rv = sbs->CreateBundle("chrome://global/locale/filepicker.properties", getter_AddRefs(bundle)); if (NS_SUCCEEDED(rv)) { nsXPIDLString locaLabel; - bundle->GetStringFromName(MOZ_UTF16("formatLabel"), - getter_Copies(locaLabel)); + bundle->GetStringFromName(u"formatLabel", getter_Copies(locaLabel)); if (locaLabel) { label = [NSString stringWithCharacters:reinterpret_cast<const unichar*>(locaLabel.get()) length:locaLabel.Length()]; } } // set up label text field NSTextField* textField = [[[NSTextField alloc] init] autorelease];
--- a/widget/cocoa/nsMenuBarX.mm +++ b/widget/cocoa/nsMenuBarX.mm @@ -157,18 +157,18 @@ void nsMenuBarX::ConstructFallbackNative if (!stringBundle) { return; } nsXPIDLString labelUTF16; nsXPIDLString keyUTF16; - const char16_t* labelProp = MOZ_UTF16("quitMenuitem.label"); - const char16_t* keyProp = MOZ_UTF16("quitMenuitem.key"); + const char16_t* labelProp = u"quitMenuitem.label"; + const char16_t* keyProp = u"quitMenuitem.key"; stringBundle->GetStringFromName(labelProp, getter_Copies(labelUTF16)); stringBundle->GetStringFromName(keyProp, getter_Copies(keyUTF16)); NSString* labelStr = [NSString stringWithUTF8String: NS_ConvertUTF16toUTF8(labelUTF16).get()]; NSString* keyStr= [NSString stringWithUTF8String: NS_ConvertUTF16toUTF8(keyUTF16).get()];
--- a/widget/gonk/nsScreenManagerGonk.cpp +++ b/widget/gonk/nsScreenManagerGonk.cpp @@ -64,17 +64,17 @@ public: {} NS_IMETHOD Run() { // Notify observers that the screen state has just changed. nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); if (observerService) { observerService->NotifyObservers( nullptr, "screen-state-changed", - mIsOn ? MOZ_UTF16("on") : MOZ_UTF16("off") + mIsOn ? u"on" : u"off" ); } RefPtr<nsScreenGonk> screen = nsScreenManagerGonk::GetPrimaryScreen(); const nsTArray<nsWindow*>& windows = screen->GetTopWindows(); for (uint32_t i = 0; i < windows.Length(); i++) { nsWindow *win = windows[i];
--- a/widget/gtk/nsPrintDialogGTK.cpp +++ b/widget/gtk/nsPrintDialogGTK.cpp @@ -50,33 +50,33 @@ ShowCustomDialog(GtkComboBox *changed_bo GtkWindow* printDialog = GTK_WINDOW(user_data); nsCOMPtr<nsIStringBundleService> bundleSvc = do_GetService(NS_STRINGBUNDLE_CONTRACTID); nsCOMPtr<nsIStringBundle> printBundle; bundleSvc->CreateBundle("chrome://global/locale/printdialog.properties", getter_AddRefs(printBundle)); nsXPIDLString intlString; - printBundle->GetStringFromName(MOZ_UTF16("headerFooterCustom"), getter_Copies(intlString)); + printBundle->GetStringFromName(u"headerFooterCustom", getter_Copies(intlString)); GtkWidget* prompt_dialog = gtk_dialog_new_with_buttons(NS_ConvertUTF16toUTF8(intlString).get(), printDialog, #if (MOZ_WIDGET_GTK == 2) (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), #else (GtkDialogFlags)(GTK_DIALOG_MODAL), #endif GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, nullptr); gtk_dialog_set_default_response(GTK_DIALOG(prompt_dialog), GTK_RESPONSE_ACCEPT); gtk_dialog_set_alternative_button_order(GTK_DIALOG(prompt_dialog), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_REJECT, -1); - printBundle->GetStringFromName(MOZ_UTF16("customHeaderFooterPrompt"), getter_Copies(intlString)); + printBundle->GetStringFromName(u"customHeaderFooterPrompt", getter_Copies(intlString)); GtkWidget* custom_label = gtk_label_new(NS_ConvertUTF16toUTF8(intlString).get()); GtkWidget* custom_entry = gtk_entry_new(); GtkWidget* question_icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); // To be convenient, prefill the textbox with the existing value, if any, and select it all so they can easily // both edit it and type in a new one. const char* current_text = (const char*) g_object_get_data(G_OBJECT(changed_box), "custom-text"); if (current_text) {
--- a/widget/gtk/nsSound.cpp +++ b/widget/gtk/nsSound.cpp @@ -125,17 +125,17 @@ ca_context_get_default() nsCOMPtr<nsIStringBundleService> bundleService = mozilla::services::GetStringBundleService(); if (bundleService) { nsCOMPtr<nsIStringBundle> brandingBundle; bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(brandingBundle)); if (brandingBundle) { nsAutoString wbrand; - brandingBundle->GetStringFromName(MOZ_UTF16("brandShortName"), + brandingBundle->GetStringFromName(u"brandShortName", getter_Copies(wbrand)); NS_ConvertUTF16toUTF8 brand(wbrand); ca_context_change_props(ctx, "application.name", brand.get(), nullptr); } }
--- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -3521,21 +3521,21 @@ GetBrandName(nsXPIDLString& brandName) nsCOMPtr<nsIStringBundle> bundle; if (bundleService) bundleService->CreateBundle( "chrome://branding/locale/brand.properties", getter_AddRefs(bundle)); if (bundle) bundle->GetStringFromName( - MOZ_UTF16("brandShortName"), + u"brandShortName", getter_Copies(brandName)); if (brandName.IsEmpty()) - brandName.AssignLiteral(MOZ_UTF16("Mozilla")); + brandName.AssignLiteral(u"Mozilla"); } static GdkWindow * CreateGdkWindow(GdkWindow *parent, GtkWidget *widget) { GdkWindowAttr attributes; gint attributes_mask = GDK_WA_VISUAL;
--- a/widget/nsBaseFilePicker.cpp +++ b/widget/nsBaseFilePicker.cpp @@ -209,57 +209,57 @@ nsBaseFilePicker::AppendFilters(int32_t rv = stringService->CreateBundle(FILEPICKER_FILTERS, getter_AddRefs(filterBundle)); if (NS_FAILED(rv)) return NS_ERROR_FAILURE; nsXPIDLString title; nsXPIDLString filter; if (aFilterMask & filterAll) { - titleBundle->GetStringFromName(MOZ_UTF16("allTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("allFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"allTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"allFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterHTML) { - titleBundle->GetStringFromName(MOZ_UTF16("htmlTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("htmlFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"htmlTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"htmlFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterText) { - titleBundle->GetStringFromName(MOZ_UTF16("textTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("textFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"textTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"textFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterImages) { - titleBundle->GetStringFromName(MOZ_UTF16("imageTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("imageFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"imageTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"imageFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterAudio) { - titleBundle->GetStringFromName(MOZ_UTF16("audioTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("audioFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"audioTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"audioFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterVideo) { - titleBundle->GetStringFromName(MOZ_UTF16("videoTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("videoFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"videoTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"videoFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterXML) { - titleBundle->GetStringFromName(MOZ_UTF16("xmlTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("xmlFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"xmlTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"xmlFilter", getter_Copies(filter)); AppendFilter(title,filter); } if (aFilterMask & filterXUL) { - titleBundle->GetStringFromName(MOZ_UTF16("xulTitle"), getter_Copies(title)); - filterBundle->GetStringFromName(MOZ_UTF16("xulFilter"), getter_Copies(filter)); + titleBundle->GetStringFromName(u"xulTitle", getter_Copies(title)); + filterBundle->GetStringFromName(u"xulFilter", getter_Copies(filter)); AppendFilter(title, filter); } if (aFilterMask & filterApps) { - titleBundle->GetStringFromName(MOZ_UTF16("appsTitle"), getter_Copies(title)); + titleBundle->GetStringFromName(u"appsTitle", getter_Copies(title)); // Pass the magic string "..apps" to the platform filepicker, which it // should recognize and do the correct platform behavior for. AppendFilter(title, NS_LITERAL_STRING("..apps")); } return NS_OK; } // Set the filter index
--- a/widget/windows/AudioSession.cpp +++ b/widget/windows/AudioSession.cpp @@ -204,17 +204,17 @@ AudioSession::Start() nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID); NS_ENSURE_TRUE(bundleService, NS_ERROR_FAILURE); nsCOMPtr<nsIStringBundle> bundle; bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(bundle)); NS_ENSURE_TRUE(bundle, NS_ERROR_FAILURE); - bundle->GetStringFromName(MOZ_UTF16("brandFullName"), + bundle->GetStringFromName(u"brandFullName", getter_Copies(mDisplayName)); wchar_t *buffer; mIconPath.GetMutableData(&buffer, MAX_PATH); ::GetModuleFileNameW(nullptr, buffer, MAX_PATH); nsCOMPtr<nsIUUIDGenerator> uuidgen = do_GetService("@mozilla.org/uuid-generator;1");
--- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -94,34 +94,34 @@ GfxInfo::GetCleartypeParameters(nsAStrin if (params.pixelStructure >= 0) { foundData = true; if (params.pixelStructure == PIXEL_STRUCT_RGB || params.pixelStructure == PIXEL_STRUCT_BGR) { outStr.AppendPrintf("Pixel Structure: %S ", (params.pixelStructure == PIXEL_STRUCT_RGB - ? MOZ_UTF16("RGB") : MOZ_UTF16("BGR"))); + ? u"RGB" : u"BGR")); } else { outStr.AppendPrintf("Pixel Structure: %d ", params.pixelStructure); } } if (params.clearTypeLevel >= 0) { foundData = true; outStr.AppendPrintf("ClearType Level: %d ", params.clearTypeLevel); } if (params.enhancedContrast >= 0) { foundData = true; outStr.AppendPrintf("Enhanced Contrast: %d ", params.enhancedContrast); } if (displayNames) { - outStr.Append(MOZ_UTF16("] ")); + outStr.Append(u"] "); } } if (foundData) { aCleartypeParams.Assign(outStr); return NS_OK; } return NS_ERROR_FAILURE; @@ -519,21 +519,21 @@ GfxInfo::Init() mHasDriverVersionMismatch = false; if (mAdapterVendorID == GfxDriverInfo::GetDeviceVendor(VendorIntel)) { // we've had big crashers (bugs 590373 and 595364) apparently correlated // with bad Intel driver installations where the DriverVersion reported // by the registry was not the version of the DLL. bool is64bitApp = sizeof(void*) == 8; const char16_t *dllFileName = is64bitApp - ? MOZ_UTF16("igd10umd64.dll") - : MOZ_UTF16("igd10umd32.dll"), + ? u"igd10umd64.dll" + : u"igd10umd32.dll", *dllFileName2 = is64bitApp - ? MOZ_UTF16("igd10iumd64.dll") - : MOZ_UTF16("igd10iumd32.dll"); + ? u"igd10iumd64.dll" + : u"igd10iumd32.dll"; nsString dllVersion, dllVersion2; gfxWindowsPlatform::GetDLLVersion((char16_t*)dllFileName, dllVersion); gfxWindowsPlatform::GetDLLVersion((char16_t*)dllFileName2, dllVersion2); uint64_t dllNumericVersion = 0, dllNumericVersion2 = 0, driverNumericVersion = 0, knownSafeMismatchVersion = 0; ParseDriverVersion(dllVersion, &dllNumericVersion); ParseDriverVersion(dllVersion2, &dllNumericVersion2);
--- a/widget/windows/nsDataObj.cpp +++ b/widget/windows/nsDataObj.cpp @@ -1053,17 +1053,17 @@ nsDataObj :: GetFileDescriptorInternetSh return E_OUTOFMEMORY; } // get a valid filename in the following order: 1) from the page title, // 2) localized string for an untitled page, 3) just use "Untitled.URL" if (!CreateFilenameFromTextA(title, ".URL", fileGroupDescA->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) { nsXPIDLString untitled; - if (!GetLocalizedString(MOZ_UTF16("noPageTitle"), untitled) || + if (!GetLocalizedString(u"noPageTitle", untitled) || !CreateFilenameFromTextA(untitled, ".URL", fileGroupDescA->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) { strcpy(fileGroupDescA->fgd[0].cFileName, "Untitled.URL"); } } // one file in the file block fileGroupDescA->cItems = 1; @@ -1094,17 +1094,17 @@ nsDataObj :: GetFileDescriptorInternetSh return E_OUTOFMEMORY; } // get a valid filename in the following order: 1) from the page title, // 2) localized string for an untitled page, 3) just use "Untitled.URL" if (!CreateFilenameFromTextW(title, L".URL", fileGroupDescW->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) { nsXPIDLString untitled; - if (!GetLocalizedString(MOZ_UTF16("noPageTitle"), untitled) || + if (!GetLocalizedString(u"noPageTitle", untitled) || !CreateFilenameFromTextW(untitled, L".URL", fileGroupDescW->fgd[0].cFileName, NS_MAX_FILEDESCRIPTOR)) { wcscpy(fileGroupDescW->fgd[0].cFileName, L"Untitled.URL"); } } // one file in the file block fileGroupDescW->cItems = 1;
--- a/xpcom/base/nsMemoryImpl.cpp +++ b/xpcom/base/nsMemoryImpl.cpp @@ -26,17 +26,17 @@ static nsMemoryImpl sGlobalMemory; NS_IMPL_QUERY_INTERFACE(nsMemoryImpl, nsIMemory) NS_IMETHODIMP nsMemoryImpl::HeapMinimize(bool aImmediate) { - return FlushMemory(MOZ_UTF16("heap-minimize"), aImmediate); + return FlushMemory(u"heap-minimize", aImmediate); } NS_IMETHODIMP nsMemoryImpl::IsLowMemoryPlatform(bool* aResult) { #ifdef ANDROID static int sLowMemory = -1; // initialize to unknown, lazily evaluate to 0 or 1 if (sLowMemory == -1) {
--- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -2534,25 +2534,24 @@ public: { nsCOMPtr<nsIObserverService> os = services::GetObserverService(); if (!os) { return NS_ERROR_FAILURE; } if (mRemainingIters == 0) { os->NotifyObservers(nullptr, "after-minimize-memory-usage", - MOZ_UTF16("MinimizeMemoryUsageRunnable")); + u"MinimizeMemoryUsageRunnable"); if (mCallback) { mCallback->Run(); } return NS_OK; } - os->NotifyObservers(nullptr, "memory-pressure", - MOZ_UTF16("heap-minimize")); + os->NotifyObservers(nullptr, "memory-pressure", u"heap-minimize"); mRemainingIters--; NS_DispatchToMainThread(this); return NS_OK; } private: // Send sNumIters heap-minimize notifications, spinning the event
--- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -559,29 +559,29 @@ ParseManifest(NSLocationType aType, File } nsAutoString osVersion; #if defined(XP_WIN) #pragma warning(push) #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; if (GetVersionEx(&info)) { - nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), + nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion, info.dwMinorVersion); } #pragma warning(pop) #elif defined(MOZ_WIDGET_COCOA) SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); - nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), + nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion); #elif defined(MOZ_WIDGET_GTK) - nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), + nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version, gtk_minor_version); #elif defined(MOZ_WIDGET_ANDROID) bool isTablet = false; if (mozilla::AndroidBridge::Bridge()) { mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
--- a/xpcom/components/nsCategoryManager.cpp +++ b/xpcom/components/nsCategoryManager.cpp @@ -809,16 +809,16 @@ NS_CreateServicesFromCategory(const char continue; } if (aObserverTopic) { // try an observer, if it implements it. nsCOMPtr<nsIObserver> observer = do_QueryInterface(instance); if (observer) { observer->Observe(aOrigin, aObserverTopic, - aObserverData ? aObserverData : MOZ_UTF16("")); + aObserverData ? aObserverData : u""); } else { LogMessage("While creating services from category '%s', service for entry '%s', contract ID '%s' does not implement nsIObserver.", aCategory, entryString.get(), contractID.get()); } } } }
--- a/xpcom/glue/nsStringAPI.h +++ b/xpcom/glue/nsStringAPI.h @@ -1271,20 +1271,16 @@ static_assert(char16_t(-1) > char16_t(0) #define NS_MULTILINE_LITERAL_STRING_INIT(n, s) \ n(reinterpret_cast<const nsAString::char_type*>(s), \ uint32_t((sizeof(s) / 2) - 1)) #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) \ const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), \ uint32_t((sizeof(s) / 2) - 1)) typedef nsDependentString nsLiteralString; -/* Check that char16_t is unsigned */ -static_assert(char16_t(-1) > char16_t(0), - "char16_t is by definition an unsigned type"); - #define NS_LITERAL_STRING(s) \ static_cast<const nsString&>(NS_MULTILINE_LITERAL_STRING(MOZ_UTF16(s))) #define NS_LITERAL_STRING_INIT(n, s) \ NS_MULTILINE_LITERAL_STRING_INIT(n, MOZ_UTF16(s)) #define NS_NAMED_LITERAL_STRING(n, s) \ NS_NAMED_MULTILINE_LITERAL_STRING(n, MOZ_UTF16(s)) #define NS_LITERAL_CSTRING(s) \
--- a/xpcom/glue/nsTextFormatter.cpp +++ b/xpcom/glue/nsTextFormatter.cpp @@ -522,17 +522,17 @@ cvt_S(SprintfState* aState, const char16 slen = aStr ? NS_strlen(aStr) : 6; if (aPrec > 0) { if (aPrec < slen) { slen = aPrec; } } /* and away we go */ - return fill2(aState, aStr ? aStr : MOZ_UTF16("(null)"), slen, aWidth, aFlags); + return fill2(aState, aStr ? aStr : u"(null)", slen, aWidth, aFlags); } /* ** Convert a string into its printable form. |aWidth| is the output ** width. |aPrec| is the maximum number of characters of |aStr| to output, ** where -1 means until NUL. */ static int
--- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -86,17 +86,17 @@ GetMostRecentNavigatorHWND() nsresult rv; nsCOMPtr<nsIWindowMediator> winMediator( do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv)); if (NS_FAILED(rv)) { return nullptr; } nsCOMPtr<mozIDOMWindowProxy> navWin; - rv = winMediator->GetMostRecentWindow(MOZ_UTF16("navigator:browser"), + rv = winMediator->GetMostRecentWindow(u"navigator:browser", getter_AddRefs(navWin)); if (NS_FAILED(rv) || !navWin) { return nullptr; } nsPIDOMWindowOuter* win = nsPIDOMWindowOuter::From(navWin); nsCOMPtr<nsIWidget> widget = widget::WidgetUtils::DOMWindowToWidget(win); if (!widget) { @@ -654,17 +654,17 @@ FileTimeToPRTime(const FILETIME* aFileti // copied from nsprpub/pr/src/{io/prfile.c | md/windows/w95io.c} with some // changes : PR_GetFileInfo64, _PR_MD_GETFILEINFO64 static nsresult GetFileInfo(const nsAFlatString& aName, PRFileInfo64* aInfo) { WIN32_FILE_ATTRIBUTE_DATA fileData; - if (aName.IsEmpty() || aName.FindCharInSet(MOZ_UTF16("?*")) != kNotFound) { + if (aName.IsEmpty() || aName.FindCharInSet(u"?*") != kNotFound) { return NS_ERROR_INVALID_ARG; } if (!::GetFileAttributesExW(aName.get(), GetFileExInfoStandard, &fileData)) { return ConvertWinError(GetLastError()); } if (fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -3307,17 +3307,17 @@ nsLocalFile::Launch() if (ShellExecuteExW(&seinfo)) { return NS_OK; } DWORD r = GetLastError(); // if the file has no association, we launch windows' // "what do you want to do" dialog if (r == SE_ERR_NOASSOC) { nsAutoString shellArg; - shellArg.AssignLiteral(MOZ_UTF16("shell32.dll,OpenAs_RunDLL ")); + shellArg.AssignLiteral(u"shell32.dll,OpenAs_RunDLL "); shellArg.Append(mResolvedPath); seinfo.lpFile = L"RUNDLL32.EXE"; seinfo.lpParameters = shellArg.get(); if (ShellExecuteExW(&seinfo)) { return NS_OK; } r = GetLastError(); }
--- a/xpcom/tests/TestObserverService.cpp +++ b/xpcom/tests/TestObserverService.cpp @@ -94,23 +94,23 @@ int main(int argc, char *argv[]) printf("Adding Observer-B as observer of topic-B...\n"); rv = anObserverService->AddObserver(bObserver, topicB.get(), false); testResult(rv); printf("Testing Notify(observer-A, topic-A)...\n"); rv = anObserverService->NotifyObservers( aObserver, topicA.get(), - MOZ_UTF16("Testing Notify(observer-A, topic-A)") ); + u"Testing Notify(observer-A, topic-A)" ); testResult(rv); printf("Testing Notify(observer-B, topic-B)...\n"); rv = anObserverService->NotifyObservers( bObserver, topicB.get(), - MOZ_UTF16("Testing Notify(observer-B, topic-B)") ); + u"Testing Notify(observer-B, topic-B)" ); testResult(rv); printf("Testing EnumerateObserverList (for topic-A)...\n"); nsCOMPtr<nsISimpleEnumerator> e; rv = anObserverService->EnumerateObservers(topicA.get(), getter_AddRefs(e)); testResult(rv); @@ -124,17 +124,17 @@ int main(int argc, char *argv[]) e->GetNext(getter_AddRefs(supports)); observer = do_QueryInterface(supports); printf("Calling observe on enumerated observer "); printString(reinterpret_cast<TestObserver*> (reinterpret_cast<void*>(observer.get()))->mName); printf("...\n"); rv = observer->Observe( observer, topicA.get(), - MOZ_UTF16("during enumeration") ); + u"during enumeration" ); testResult(rv); } } printf("...done enumerating observers of topic-A\n"); printf("Removing Observer-A...\n"); rv = anObserverService->RemoveObserver(aObserver, topicA.get()); testResult(rv);
--- a/xpcom/tests/gtest/TestStrings.cpp +++ b/xpcom/tests/gtest/TestStrings.cpp @@ -819,33 +819,33 @@ static void test_strip_chars_helper(cons nsAutoString tmp(str); nsAString& data = tmp; data.StripChars(strip, offset); EXPECT_TRUE(data.Equals(result)); } TEST(String, strip_chars) { - test_strip_chars_helper(MOZ_UTF16("foo \r \nbar"), - MOZ_UTF16(" \n\r"), + test_strip_chars_helper(u"foo \r \nbar", + u" \n\r", NS_LITERAL_STRING("foobar")); - test_strip_chars_helper(MOZ_UTF16("\r\nfoo\r\n"), - MOZ_UTF16(" \n\r"), + test_strip_chars_helper(u"\r\nfoo\r\n", + u" \n\r", NS_LITERAL_STRING("foo")); - test_strip_chars_helper(MOZ_UTF16("foo"), - MOZ_UTF16(" \n\r"), + test_strip_chars_helper(u"foo", + u" \n\r", NS_LITERAL_STRING("foo")); - test_strip_chars_helper(MOZ_UTF16("foo"), - MOZ_UTF16("fo"), + test_strip_chars_helper(u"foo", + u"fo", NS_LITERAL_STRING("")); - test_strip_chars_helper(MOZ_UTF16("foo"), - MOZ_UTF16("foo"), + test_strip_chars_helper(u"foo", + u"foo", NS_LITERAL_STRING("")); - test_strip_chars_helper(MOZ_UTF16(" foo"), - MOZ_UTF16(" "), + test_strip_chars_helper(u" foo", + u" ", NS_LITERAL_STRING(" foo"), 1); } TEST(Strings, huge_capacity) { nsString a, b, c, d, e, f, g, h, i, j, k, l, m, n; nsCString n1;
--- a/xpcom/tests/windows/TestNtPathToDosPath.cpp +++ b/xpcom/tests/windows/TestNtPathToDosPath.cpp @@ -201,34 +201,34 @@ int main(int argc, char* argv[]) if (drvMapping.Init()) { wchar_t expected[] = L" :\\"; expected[0] = drvMapping.GetDriveLetter(); nsAutoString networkPath; if (!DriveToNtPath(drvMapping.GetDriveLetter(), networkPath)) { fail("Querying network drive"); return 1; } - networkPath += MOZ_UTF16("\\"); + networkPath += u"\\"; if (!TestNtPathToDosPath(networkPath.get(), expected)) { fail("Mapped UNC path"); result = 1; } // NtPathToDosPath must correctly handle paths whose drive letter mapping has // changed. We need to test this because the APIs called by NtPathToDosPath // return different info if this has happened. if (!drvMapping.ChangeDriveLetter()) { fail("Change drive letter"); return 1; } expected[0] = drvMapping.GetDriveLetter(); if (!DriveToNtPath(drvMapping.GetDriveLetter(), networkPath)) { fail("Querying second network drive"); return 1; } - networkPath += MOZ_UTF16("\\"); + networkPath += u"\\"; if (!TestNtPathToDosPath(networkPath.get(), expected)) { fail("Re-mapped UNC path"); result = 1; } } return result; }
--- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -452,26 +452,26 @@ nsHTTPIndex::OnIndexAvailable(nsIRequest rv = Assert(entry, kNC_LastModified, val, true); } // filetype uint32_t type; rv = aIndex->GetType(&type); switch (type) { case nsIDirIndex::TYPE_UNKNOWN: - rv = mDirRDF->GetLiteral(MOZ_UTF16("UNKNOWN"), getter_AddRefs(lit)); + rv = mDirRDF->GetLiteral(u"UNKNOWN", getter_AddRefs(lit)); break; case nsIDirIndex::TYPE_DIRECTORY: - rv = mDirRDF->GetLiteral(MOZ_UTF16("DIRECTORY"), getter_AddRefs(lit)); + rv = mDirRDF->GetLiteral(u"DIRECTORY", getter_AddRefs(lit)); break; case nsIDirIndex::TYPE_FILE: - rv = mDirRDF->GetLiteral(MOZ_UTF16("FILE"), getter_AddRefs(lit)); + rv = mDirRDF->GetLiteral(u"FILE", getter_AddRefs(lit)); break; case nsIDirIndex::TYPE_SYMLINK: - rv = mDirRDF->GetLiteral(MOZ_UTF16("SYMLINK"), getter_AddRefs(lit)); + rv = mDirRDF->GetLiteral(u"SYMLINK", getter_AddRefs(lit)); break; } if (NS_FAILED(rv)) return rv; rv = Assert(entry, kNC_FileType, lit, true); if (NS_FAILED(rv)) return rv; } @@ -579,19 +579,19 @@ nsHTTPIndex::CommonInit() getter_AddRefs(kNC_LastModified)); mDirRDF->GetResource(NS_LITERAL_CSTRING(NC_NAMESPACE_URI "Content-Type"), getter_AddRefs(kNC_ContentType)); mDirRDF->GetResource(NS_LITERAL_CSTRING(NC_NAMESPACE_URI "File-Type"), getter_AddRefs(kNC_FileType)); mDirRDF->GetResource(NS_LITERAL_CSTRING(NC_NAMESPACE_URI "IsContainer"), getter_AddRefs(kNC_IsContainer)); - rv = mDirRDF->GetLiteral(MOZ_UTF16("true"), getter_AddRefs(kTrueLiteral)); + rv = mDirRDF->GetLiteral(u"true", getter_AddRefs(kTrueLiteral)); if (NS_FAILED(rv)) return(rv); - rv = mDirRDF->GetLiteral(MOZ_UTF16("false"), getter_AddRefs(kFalseLiteral)); + rv = mDirRDF->GetLiteral(u"false", getter_AddRefs(kFalseLiteral)); if (NS_FAILED(rv)) return(rv); rv = NS_NewISupportsArray(getter_AddRefs(mConnectionList)); if (NS_FAILED(rv)) return(rv); // note: don't register DS here return rv; }