зеркало из https://github.com/mozilla/gecko-dev.git
Remove one incorrect assertion and temporarily comment out one that fires too often. Bug 377898, bug 377902, r+sr=roc
This commit is contained in:
Родитель
2b80f5518c
Коммит
73bc24845d
|
@ -569,8 +569,9 @@ gfxTextRun *
|
|||
gfxWindowsFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
|
||||
Parameters *aParams)
|
||||
{
|
||||
NS_ASSERTION(!(aParams->mFlags & TEXT_NEED_BOUNDING_BOX),
|
||||
"Glyph extents not yet supported");
|
||||
// XXX comment out the assertion for now since it fires too much
|
||||
// NS_ASSERTION(!(aParams->mFlags & TEXT_NEED_BOUNDING_BOX),
|
||||
// "Glyph extents not yet supported");
|
||||
|
||||
gfxTextRun *textRun = new gfxTextRun(aParams, aLength);
|
||||
if (!textRun)
|
||||
|
@ -596,8 +597,7 @@ gfxTextRun *
|
|||
gfxWindowsFontGroup::MakeTextRun(const PRUint8 *aString, PRUint32 aLength,
|
||||
Parameters *aParams)
|
||||
{
|
||||
NS_ASSERTION((aParams->mFlags & TEXT_IS_ASCII || aParams->mFlags & TEXT_IS_8BIT),
|
||||
"unknown text type");
|
||||
aParams->mFlags |= TEXT_IS_8BIT;
|
||||
gfxTextRun *textRun = new gfxTextRun(aParams, aLength);
|
||||
if (!textRun)
|
||||
return nsnull;
|
||||
|
|
Загрузка…
Ссылка в новой задаче