corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 904985, part 2: Use char16_t for NS_LITERAL_STRING, r=glandium, dbaron.

Browse Source
This commit is contained in:
Joshua Cranmer
2013-09-17 22:43:12 -05:00
parent 42084349d1
commit b01f076a0c
9 changed files with 20 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xpcom/ds/nsAtomTable.cpp
View File

@@ -557,7 +557,6 @@ RegisterStaticAtoms(const nsStaticAtom* aAtoms, uint32_t aAtomCount)
}
for (uint32_t i=0; i<aAtomCount; i++) {
#ifdef NS_STATIC_ATOM_USE_WIDE_STRINGS
NS_ASSERTION(nsCRT::IsAscii((PRUnichar*)aAtoms[i].mStringBuffer->Data()),
"Static atoms must be ASCII!");
@@ -591,22 +590,6 @@ RegisterStaticAtoms(const nsStaticAtom* aAtoms, uint32_t aAtomCount)
gStaticAtomTable->Put(nsAtomString(atom), atom);
}
}
#else // NS_STATIC_ATOM_USE_WIDE_STRINGS
NS_ASSERTION(nsCRT::IsAscii((char*)aAtoms[i].mStringBuffer->Data()),
"Static atoms must be ASCII!");
uint32_t stringLen = aAtoms[i].mStringBuffer->StorageSize() - 1;
NS_ConvertASCIItoUTF16 str((char*)aAtoms[i].mStringBuffer->Data(),
stringLen);
nsIAtom* atom = NS_NewPermanentAtom(str);
*aAtoms[i].mAtom = atom;
if (!gStaticAtomTableSealed) {
gStaticAtomTable->Put(str, atom);
}
#endif
}
return NS_OK;
}