| author | Ehsan Akhgari <ehsan@mozilla.com> |
| Sat, 04 Jan 2014 10:02:17 -0500 | |
| changeset 172310 | 5a9badd6db004310b9d1aca5db25ef4c275a4362 |
| parent 172309 | 2cadd4910e5e9211a6597c70567cde9ef1c23303 |
| child 172311 | cf80c0d4f46e3526d5f80671626f27a984cf4eae |
| push id | 5166 |
| push user | lsblakk@mozilla.com |
| push date | Tue, 04 Feb 2014 01:47:54 +0000 |
| treeherder | mozilla-aurora@977eb2548b2d [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | roc |
| bugs | 927728 |
| milestone | 29.0a1 |
--- a/accessible/src/atk/nsMaiInterfaceText.cpp +++ b/accessible/src/atk/nsMaiInterfaceText.cpp @@ -182,17 +182,17 @@ getCharacterAtOffsetCB(AtkText* aText, g AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText)); if (!accWrap) return 0; HyperTextAccessible* text = accWrap->AsHyperText(); if (!text || !text->IsTextRole()) return 0; - // PRUnichar is unsigned short in Mozilla, gnuichar is guint32 in glib. + // char16_t is unsigned short in Mozilla, gnuichar is guint32 in glib. return static_cast<gunichar>(text->CharAt(aOffset)); } static gchar* getTextBeforeOffsetCB(AtkText *aText, gint aOffset, AtkTextBoundary aBoundaryType, gint *aStartOffset, gint *aEndOffset) {
--- a/accessible/src/base/DocManager.cpp +++ b/accessible/src/base/DocManager.cpp @@ -225,17 +225,17 @@ DocManager::OnLocationChange(nsIWebProgr { NS_NOTREACHED("notification excluded in AddProgressListener(...)"); return NS_OK; } NS_IMETHODIMP DocManager::OnStatusChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest, nsresult aStatus, - const PRUnichar* aMessage) + const char16_t* aMessage) { NS_NOTREACHED("notification excluded in AddProgressListener(...)"); return NS_OK; } NS_IMETHODIMP DocManager::OnSecurityChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest,
--- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -157,17 +157,17 @@ NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibi nsIObserver, nsISelectionListener) // from SelectionManager //////////////////////////////////////////////////////////////////////////////// // nsIObserver NS_IMETHODIMP nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic, - const PRUnichar *aData) + const char16_t *aData) { if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) Shutdown(); return NS_OK; } // nsIAccessibilityService @@ -1080,17 +1080,17 @@ nsAccessibilityService::Init() // Add observers. nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); if (!observerService) return false; observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false); - static const PRUnichar kInitIndicator[] = { '1', 0 }; + static const char16_t kInitIndicator[] = { '1', 0 }; observerService->NotifyObservers(nullptr, "a11y-init-or-shutdown", kInitIndicator); #ifdef A11Y_LOG logging::CheckEnv(); #endif gApplicationAccessible = new ApplicationAccessibleWrap(); NS_ADDREF(gApplicationAccessible); // will release in Shutdown() @@ -1118,17 +1118,17 @@ void nsAccessibilityService::Shutdown() { // Remove observers. nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService(); if (observerService) { observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID); - static const PRUnichar kShutdownIndicator[] = { '0', 0 }; + static const char16_t kShutdownIndicator[] = { '0', 0 }; observerService->NotifyObservers(nullptr, "a11y-init-or-shutdown", kShutdownIndicator); } // Stop accessible document loader. DocManager::Shutdown(); SelectionManager::Shutdown();
--- a/accessible/src/base/nsCoreUtils.h +++ b/accessible/src/base/nsCoreUtils.h @@ -302,17 +302,17 @@ public: * only. In contrast to nsWhitespaceTokenizer class it takes into account * non-breaking space (0xa0). */ static bool IsWhitespaceString(const nsSubstring& aString); /** * Returns true if the given character is whitespace symbol. */ - static bool IsWhitespace(PRUnichar aChar) + static bool IsWhitespace(char16_t aChar) { return aChar == ' ' || aChar == '\n' || aChar == '\r' || aChar == '\t' || aChar == 0xa0; } }; /**
--- a/accessible/src/base/nsTextEquivUtils.cpp +++ b/accessible/src/base/nsTextEquivUtils.cpp @@ -125,33 +125,33 @@ nsTextEquivUtils::AppendTextEquivFromTex // If this text is inside a block level frame (as opposed to span // level), we need to add spaces around that block's text, so we don't // get words jammed together in final name. const nsStyleDisplay* display = frame->StyleDisplay(); if (display->IsBlockOutsideStyle() || display->mDisplay == NS_STYLE_DISPLAY_TABLE_CELL) { isHTMLBlock = true; if (!aString->IsEmpty()) { - aString->Append(PRUnichar(' ')); + aString->Append(char16_t(' ')); } } } } if (aContent->TextLength() > 0) { nsIFrame *frame = aContent->GetPrimaryFrame(); if (frame) { nsresult rv = frame->GetRenderedText(aString); NS_ENSURE_SUCCESS(rv, rv); } else { // If aContent is an object that is display: none, we have no a frame. aContent->AppendTextTo(*aString); } if (isHTMLBlock && !aString->IsEmpty()) { - aString->Append(PRUnichar(' ')); + aString->Append(char16_t(' ')); } } return NS_OK; } if (aContent->IsHTML() && aContent->NodeInfo()->Equals(nsGkAtoms::br)) { @@ -329,22 +329,22 @@ bool nsTextEquivUtils::AppendString(nsAString *aString, const nsAString& aTextEquivalent) { if (aTextEquivalent.IsEmpty()) return false; // Insert spaces to insure that words from controls aren't jammed together. if (!aString->IsEmpty() && !nsCoreUtils::IsWhitespace(aString->Last())) - aString->Append(PRUnichar(' ')); + aString->Append(char16_t(' ')); aString->Append(aTextEquivalent); if (!nsCoreUtils::IsWhitespace(aString->Last())) - aString->Append(PRUnichar(' ')); + aString->Append(char16_t(' ')); return true; } uint32_t nsTextEquivUtils::GetRoleRule(role aRole) { #define ROLE(geckoRole, stringRole, atkRole, \
--- a/accessible/src/generic/DocAccessible.cpp +++ b/accessible/src/generic/DocAccessible.cpp @@ -791,17 +791,17 @@ DocAccessible::ScrollPositionDidChange(n mScrollPositionChangedTicks = 1; } //////////////////////////////////////////////////////////////////////////////// // nsIObserver NS_IMETHODIMP DocAccessible::Observe(nsISupports* aSubject, const char* aTopic, - const PRUnichar* aData) + const char16_t* aData) { if (!nsCRT::strcmp(aTopic,"obs_documentCreated")) { // State editable will now be set, readonly is now clear // Normally we only fire delayed events created from the node, not an // accessible object. See the AccStateChangeEvent constructor for details // about this exceptional case. nsRefPtr<AccEvent> event = new AccStateChangeEvent(this, states::EDITABLE, true);
--- a/accessible/src/generic/HyperTextAccessible.h +++ b/accessible/src/generic/HyperTextAccessible.h @@ -21,19 +21,19 @@ struct DOMPoint { DOMPoint(nsINode* aNode, int32_t aIdx) : node(aNode), idx(aIdx) { } nsINode* node; int32_t idx; }; // This character marks where in the text returned via nsIAccessibleText(), // that embedded object characters exist -const PRUnichar kEmbeddedObjectChar = 0xfffc; -const PRUnichar kImaginaryEmbeddedObjectChar = ' '; -const PRUnichar kForcedNewLineChar = '\n'; +const char16_t kEmbeddedObjectChar = 0xfffc; +const char16_t kImaginaryEmbeddedObjectChar = ' '; +const char16_t kForcedNewLineChar = '\n'; /** * Special Accessible that knows how contain both text and embedded objects */ class HyperTextAccessible : public AccessibleWrap, public xpcAccessibleHyperText { public: @@ -183,27 +183,27 @@ public: if (aStartOffset && aEndOffset) { *aStartOffset = aOffset; *aEndOffset = aOffset + aChar.Length(); } return true; } - PRUnichar CharAt(int32_t aOffset) + char16_t CharAt(int32_t aOffset) { nsAutoString charAtOffset; CharAt(aOffset, charAtOffset); return charAtOffset.CharAt(0); } /** * Return true if char at the given offset equals to given char. */ - bool IsCharAt(int32_t aOffset, PRUnichar aChar) + bool IsCharAt(int32_t aOffset, char16_t aChar) { return CharAt(aOffset) == aChar; } /** * Return true if terminal char is at the given offset. */ bool IsLineEndCharAt(int32_t aOffset) { return IsCharAt(aOffset, '\n'); }
--- a/accessible/src/html/HTMLElementAccessibles.cpp +++ b/accessible/src/html/HTMLElementAccessibles.cpp @@ -42,17 +42,17 @@ uint64_t HTMLBRAccessible::NativeState() { return states::READONLY; } ENameValueFlag HTMLBRAccessible::NativeName(nsString& aName) { - aName = static_cast<PRUnichar>('\n'); // Newline char + aName = static_cast<char16_t>('\n'); // Newline char return eNameOK; } //////////////////////////////////////////////////////////////////////////////// // HTMLLabelAccessible //////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS_INHERITED0(HTMLLabelAccessible, HyperTextAccessible)
--- a/accessible/src/xpcom/xpcAccessibleHyperText.cpp +++ b/accessible/src/xpcom/xpcAccessibleHyperText.cpp @@ -123,17 +123,17 @@ xpcAccessibleHyperText::GetTextAfterOffs return NS_ERROR_FAILURE; text->TextAfterOffset(aOffset, aBoundaryType, aStartOffset, aEndOffset, aText); return NS_OK; } NS_IMETHODIMP xpcAccessibleHyperText::GetCharacterAtOffset(int32_t aOffset, - PRUnichar* aCharacter) + char16_t* aCharacter) { NS_ENSURE_ARG_POINTER(aCharacter); *aCharacter = L'\0'; HyperTextAccessible* text = static_cast<HyperTextAccessible*>(this); if (text->IsDefunct()) return NS_ERROR_FAILURE;
--- a/b2g/app/nsBrowserApp.cpp +++ b/b2g/app/nsBrowserApp.cpp @@ -45,17 +45,17 @@ #include "mozilla/WindowsDllBlocklist.h" static void Output(const char *fmt, ... ) { va_list ap; va_start(ap, fmt); #if defined(XP_WIN) && !MOZ_WINCONSOLE - PRUnichar msg[2048]; + char16_t msg[2048]; _vsnwprintf(msg, sizeof(msg)/sizeof(msg[0]), NS_ConvertUTF8toUTF16(fmt).get(), ap); MessageBoxW(nullptr, msg, L"XULRunner", MB_OK | MB_ICONERROR); #else vfprintf(stderr, fmt, ap); #endif va_end(ap); }
--- a/browser/components/shell/src/nsMacShellService.cpp +++ b/browser/components/shell/src/nsMacShellService.cpp @@ -225,17 +225,17 @@ nsMacShellService::OnLocationChange(nsIW { return NS_OK; } NS_IMETHODIMP nsMacShellService::OnStatusChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest, nsresult aStatus, - const PRUnichar* aMessage) + const char16_t* aMessage) { return NS_OK; } NS_IMETHODIMP nsMacShellService::OnSecurityChange(nsIWebProgress* aWebProgress, nsIRequest* aRequest, uint32_t aState)
--- a/browser/components/shell/src/nsWindowsShellService.cpp +++ b/browser/components/shell/src/nsWindowsShellService.cpp @@ -471,17 +471,17 @@ nsWindowsShellService::IsDefaultBrowser( // application when setting Firefox as the default browser. *aIsDefaultBrowser = false; return NS_OK; } const nsString &flatValue = PromiseFlatString(valueData); res = ::RegSetValueExW(theKey, L"", 0, REG_SZ, (const BYTE *) flatValue.get(), - (flatValue.Length() + 1) * sizeof(PRUnichar)); + (flatValue.Length() + 1) * sizeof(char16_t)); // Close the key that was created. ::RegCloseKey(theKey); if (REG_FAILED(res)) { // If updating the open command fails try to update it using the helper // application when setting Firefox as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -517,33 +517,33 @@ nsWindowsShellService::IsDefaultBrowser( } ::ZeroMemory(currValue, sizeof(currValue)); DWORD len = sizeof currValue; res = ::RegQueryValueExW(theKey, L"", nullptr, nullptr, (LPBYTE)currValue, &len); // Close the key that was opened. ::RegCloseKey(theKey); - if (REG_FAILED(res) || PRUnichar('\0') != *currValue) { + if (REG_FAILED(res) || char16_t('\0') != *currValue) { // Key wasn't set or was set to something other than our registry entry. // Delete the key along with all of its childrean and then recreate it. const nsString &flatName = PromiseFlatString(keyName); ::SHDeleteKeyW(HKEY_CURRENT_USER, flatName.get()); res = ::RegCreateKeyExW(HKEY_CURRENT_USER, flatName.get(), 0, nullptr, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, nullptr, &theKey, nullptr); if (REG_FAILED(res)) { // If disabling DDE fails try to disable it using the helper // application when setting Firefox as the default browser. *aIsDefaultBrowser = false; return NS_OK; } res = ::RegSetValueExW(theKey, L"", 0, REG_SZ, (const BYTE *) L"", - sizeof(PRUnichar)); + sizeof(char16_t)); // Close the key that was created. ::RegCloseKey(theKey); if (REG_FAILED(res)) { // If disabling DDE fails try to disable it using the helper // application when setting Firefox as the default browser. *aIsDefaultBrowser = false; return NS_OK; } @@ -577,17 +577,17 @@ nsWindowsShellService::IsDefaultBrowser( return NS_OK; } NS_ConvertUTF8toUTF16 valueData(VAL_OPEN); valueData.Replace(offset, 9, appLongPath); const nsString &flatValue = PromiseFlatString(valueData); res = ::RegSetValueExW(theKey, L"", 0, REG_SZ, (const BYTE *) flatValue.get(), - (flatValue.Length() + 1) * sizeof(PRUnichar)); + (flatValue.Length() + 1) * sizeof(char16_t)); // Close the key that was created. ::RegCloseKey(theKey); // If updating the FTP protocol handlers shell open command fails try to // update it using the helper application when setting Firefox as the // default browser. if (REG_FAILED(res)) { *aIsDefaultBrowser = false; }
--- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -88,17 +88,17 @@ nsScriptSecurityManager::SubjectIsPrivil bool isSystem = false; return NS_SUCCEEDED(SubjectPrincipalIsSystem(&isSystem)) && isSystem; } /////////////////////////// // Convenience Functions // /////////////////////////// // Result of this function should not be freed. -static inline const PRUnichar * +static inline const char16_t * IDToString(JSContext *cx, jsid id_) { JS::RootedId id(cx, id_); if (JSID_IS_STRING(id)) return JS_GetInternedStringChars(JSID_TO_STRING(id)); JS::Rooted<JS::Value> idval(cx); if (!JS_IdToValue(cx, id, idval.address())) @@ -173,17 +173,17 @@ GetPrincipalDomainOrigin(nsIPrincipal* a return GetOriginFromURI(uri, aOrigin); } inline void SetPendingException(JSContext *cx, const char *aMsg) { JS_ReportError(cx, "%s", aMsg); } -inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg) +inline void SetPendingException(JSContext *cx, const char16_t *aMsg) { JS_ReportError(cx, "%hs", aMsg); } // Helper class to get stuff from the ClassInfo and not waste extra time with // virtual method calls for things it has already gotten class ClassInfoData { @@ -699,17 +699,17 @@ nsScriptSecurityManager::CheckPropertyAc if (domain) { GetOriginFromURI(domain, objectDomain); } } NS_ConvertUTF8toUTF16 objectOriginUnicode(objectOrigin); NS_ConvertUTF8toUTF16 objectDomainUnicode(objectDomain); nsXPIDLString errorMsg; - const PRUnichar *formatStrings[] = + const char16_t *formatStrings[] = { subjectOriginUnicode.get(), className.get(), IDToString(cx, property), objectOriginUnicode.get(), subjectDomainUnicode.get(), objectDomainUnicode.get() }; @@ -1173,17 +1173,17 @@ nsScriptSecurityManager::CheckLoadURIWit // error and treat unflagged handlers as URI_DANGEROUS_TO_LOAD. rv = NS_URIChainHasFlags(targetBaseURI, nsIProtocolHandler::URI_LOADABLE_BY_ANYONE, &hasFlags); NS_ENSURE_SUCCESS(rv, rv); if (!hasFlags) { nsXPIDLString message; NS_ConvertASCIItoUTF16 ucsTargetScheme(targetScheme); - const PRUnichar* formatStrings[] = { ucsTargetScheme.get() }; + const char16_t* formatStrings[] = { ucsTargetScheme.get() }; rv = sStrBundle-> FormatStringFromName(MOZ_UTF16("ProtocolFlagError"), formatStrings, ArrayLength(formatStrings), getter_Copies(message)); if (NS_SUCCEEDED(rv)) { nsCOMPtr<nsIConsoleService> console( do_GetService("@mozilla.org/consoleservice;1")); @@ -1212,17 +1212,17 @@ nsScriptSecurityManager::ReportError(JSC nsAutoCString targetSpec; rv = aTarget->GetAsciiSpec(targetSpec); NS_ENSURE_SUCCESS(rv, rv); // Localize the error message nsXPIDLString message; NS_ConvertASCIItoUTF16 ucsSourceSpec(sourceSpec); NS_ConvertASCIItoUTF16 ucsTargetSpec(targetSpec); - const PRUnichar *formatStrings[] = { ucsSourceSpec.get(), ucsTargetSpec.get() }; + const char16_t *formatStrings[] = { ucsSourceSpec.get(), ucsTargetSpec.get() }; rv = sStrBundle->FormatStringFromName(PromiseFlatString(messageTag).get(), formatStrings, ArrayLength(formatStrings), getter_Copies(message)); NS_ENSURE_SUCCESS(rv, rv); // If a JS context was passed in, set a JS exception. // Otherwise, print the error message directly to the JS console @@ -1547,17 +1547,17 @@ nsScriptSecurityManager::CanCreateWrappe nsAutoCString origin; nsresult rv2; nsIPrincipal* subjectPrincipal = doGetSubjectPrincipal(&rv2); if (NS_SUCCEEDED(rv2) && subjectPrincipal) { GetPrincipalDomainOrigin(subjectPrincipal, origin); } NS_ConvertUTF8toUTF16 originUnicode(origin); NS_ConvertUTF8toUTF16 className(objClassInfo.GetName()); - const PRUnichar* formatStrings[] = { + const char16_t* formatStrings[] = { className.get(), originUnicode.get() }; uint32_t length = ArrayLength(formatStrings); if (originUnicode.IsEmpty()) { --length; } else { strName.AppendLiteral("ForOrigin"); @@ -1738,17 +1738,17 @@ static const char* kObservedPrefs[] = { sJSEnabledPrefName, sFileOriginPolicyPrefName, nullptr }; NS_IMETHODIMP nsScriptSecurityManager::Observe(nsISupports* aObject, const char* aTopic, - const PRUnichar* aMessage) + const char16_t* aMessage) { nsresult rv = NS_OK; NS_ConvertUTF16toUTF8 messageStr(aMessage); const char *message = messageStr.get(); static const char jsPrefix[] = "javascript."; static const char securityPrefix[] = "security."; if ((PL_strncmp(message, jsPrefix, sizeof(jsPrefix)-1) == 0) ||
--- a/chrome/src/nsChromeRegistryChrome.cpp +++ b/chrome/src/nsChromeRegistryChrome.cpp @@ -322,17 +322,17 @@ nsChromeRegistryChrome::SelectLocaleFrom if (NS_FAILED(rv)) NS_ERROR("Couldn't select locale from pref!"); return rv; } NS_IMETHODIMP nsChromeRegistryChrome::Observe(nsISupports *aSubject, const char *aTopic, - const PRUnichar *someData) + const char16_t *someData) { nsresult rv = NS_OK; if (!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic)) { nsCOMPtr<nsIPrefBranch> prefs (do_QueryInterface(aSubject)); NS_ASSERTION(prefs, "Bad observer call!"); NS_ConvertUTF16toUTF8 pref(someData);
--- a/chrome/src/nsChromeRegistryChrome.h +++ b/chrome/src/nsChromeRegistryChrome.h @@ -31,17 +31,17 @@ class nsChromeRegistryChrome : public ns NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE; NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE; NS_IMETHOD IsLocaleRTL(const nsACString& package, bool *aResult) MOZ_OVERRIDE; NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, nsACString& aLocale) MOZ_OVERRIDE; NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, - const PRUnichar *someData) MOZ_OVERRIDE; + const char16_t *someData) MOZ_OVERRIDE; #ifdef MOZ_XUL NS_IMETHOD GetXULOverlays(nsIURI *aURI, nsISimpleEnumerator **_retval) MOZ_OVERRIDE; NS_IMETHOD GetStyleOverlays(nsIURI *aURI, nsISimpleEnumerator **_retval) MOZ_OVERRIDE; #endif
--- a/chrome/src/nsChromeRegistryContent.cpp +++ b/chrome/src/nsChromeRegistryContent.cpp @@ -217,17 +217,17 @@ nsChromeRegistryContent::GetSelectedLoca return NS_ERROR_NOT_AVAILABLE; } aLocale = mLocale; return NS_OK; } NS_IMETHODIMP nsChromeRegistryContent::Observe(nsISupports* aSubject, const char* aTopic, - const PRUnichar* aData) + const char16_t* aData) { CONTENT_NOT_IMPLEMENTED(); } NS_IMETHODIMP nsChromeRegistryContent::GetStyleOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResult) {
--- a/chrome/src/nsChromeRegistryContent.h +++ b/chrome/src/nsChromeRegistryContent.h @@ -23,17 +23,17 @@ class nsChromeRegistryContent : public n const InfallibleTArray<OverrideMapping>& aOverrides, const nsACString& aLocale); NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE; NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE; NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE; NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, - const PRUnichar* aData) MOZ_OVERRIDE; + const char16_t* aData) MOZ_OVERRIDE; NS_IMETHOD IsLocaleRTL(const nsACString& package, bool *aResult) MOZ_OVERRIDE; NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, nsACString& aLocale) MOZ_OVERRIDE; NS_IMETHOD GetStyleOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResult) MOZ_OVERRIDE; NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL, nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
--- a/content/base/public/DirectionalityUtils.h +++ b/content/base/public/DirectionalityUtils.h @@ -78,17 +78,17 @@ void WalkDescendantsSetDirAuto(mozilla:: */ void WalkDescendantsClearAncestorDirAuto(mozilla::dom::Element* aElement); /** * When the contents of a text node have changed, deal with any elements whose * directionality needs to change */ void SetDirectionFromChangedTextNode(nsIContent* aTextNode, uint32_t aOffset, - const PRUnichar* aBuffer, uint32_t aLength, + const char16_t* aBuffer, uint32_t aLength, bool aNotify); /** * When a text node is appended to an element, find any ancestors with dir=auto * whose directionality will be determined by the text node */ void SetDirectionFromNewTextNode(nsIContent* aTextNode);
--- a/content/base/public/FragmentOrElement.h +++ b/content/base/public/FragmentOrElement.h @@ -184,24 +184,24 @@ public: virtual void GetTextContentInternal(nsAString& aTextContent) MOZ_OVERRIDE; virtual void SetTextContentInternal(const nsAString& aTextContent, mozilla::ErrorResult& aError) MOZ_OVERRIDE; // nsIContent interface methods virtual already_AddRefed<nsINodeList> GetChildren(uint32_t aFilter) MOZ_OVERRIDE; virtual const nsTextFragment *GetText() MOZ_OVERRIDE; virtual uint32_t TextLength() const MOZ_OVERRIDE; - virtual nsresult SetText(const PRUnichar* aBuffer, uint32_t aLength, + virtual nsresult SetText(const char16_t* aBuffer, uint32_t aLength, bool aNotify) MOZ_OVERRIDE; // Need to implement this here too to avoid hiding. nsresult SetText(const nsAString& aStr, bool aNotify) { return SetText(aStr.BeginReading(), aStr.Length(), aNotify); } - virtual nsresult AppendText(const PRUnichar* aBuffer, uint32_t aLength, + virtual nsresult AppendText(const char16_t* aBuffer, uint32_t aLength, bool aNotify) MOZ_OVERRIDE; virtual bool TextIsOnlyWhitespace() MOZ_OVERRIDE; virtual void AppendTextTo(nsAString& aResult) MOZ_OVERRIDE; virtual nsIContent *GetBindingParent() const MOZ_OVERRIDE; virtual nsXBLBinding *GetXBLBinding() const MOZ_OVERRIDE; virtual void SetXBLBinding(nsXBLBinding* aBinding, nsBindingManager* aOldBindingManager = nullptr) MOZ_OVERRIDE; virtual ShadowRoot *GetShadowRoot() const MOZ_OVERRIDE;
--- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -314,26 +314,26 @@ public: * @return The reversed document position flags. * * @see nsIDOMNode */ static uint16_t ReverseDocumentPosition(uint16_t aDocumentPosition); static uint32_t CopyNewlineNormalizedUnicodeTo(const nsAString& aSource, uint32_t aSrcOffset, - PRUnichar* aDest, + char16_t* aDest, uint32_t aLength, bool& aLastCharCR); - static uint32_t CopyNewlineNormalizedUnicodeTo(nsReadingIterator<PRUnichar>& aSrcStart, const nsReadingIterator<PRUnichar>& aSrcEnd, nsAString& aDest); + static uint32_t CopyNewlineNormalizedUnicodeTo(nsReadingIterator<char16_t>& aSrcStart, const nsReadingIterator<char16_t>& aSrcEnd, nsAString& aDest); static const nsDependentSubstring TrimCharsInSet(const char* aSet, const nsAString& aValue); - template<bool IsWhitespace(PRUnichar)> + template<bool IsWhitespace(char16_t)> static const nsDependentSubstring TrimWhitespace(const nsAString& aStr, bool aTrimTrailing = true); /** * Returns true if aChar is of class Ps, Pi, Po, Pf, or Pe. */ static bool IsFirstLetterPunctuation(uint32_t aChar); static bool IsFirstLetterPunctuationAt(const nsTextFragment* aFrag, uint32_t aOffset); @@ -347,23 +347,23 @@ public: /* * Is the character an HTML whitespace character? * * We define whitespace using the list in HTML5 and css3-selectors: * U+0009, U+000A, U+000C, U+000D, U+0020 * * HTML 4.01 also lists U+200B (zero-width space). */ - static bool IsHTMLWhitespace(PRUnichar aChar); + static bool IsHTMLWhitespace(char16_t aChar); /* * Returns whether the character is an HTML whitespace (see IsHTMLWhitespace) * or a nbsp character (U+00A0). */ - static bool IsHTMLWhitespaceOrNBSP(PRUnichar aChar); + static bool IsHTMLWhitespaceOrNBSP(char16_t aChar); /** * Is the HTML local name a block element? */ static bool IsHTMLBlock(nsIAtom* aLocalName); /** * Is the HTML local name a void element? @@ -525,29 +525,29 @@ public: * @param aCharset empty if not found * @return boolean indicating whether a BOM was detected. */ static bool CheckForBOM(const unsigned char* aBuffer, uint32_t aLength, nsACString& aCharset); static nsresult CheckQName(const nsAString& aQualifiedName, bool aNamespaceAware = true, - const PRUnichar** aColon = nullptr);