Bug 1460764 - patch 1 - Avoid undefined behavior in gfxFontStyle::Hash() when sizeAdjust is -1.0f. r=jwatt

This commit is contained in:
Jonathan Kew 2018-05-15 14:59:26 +01:00
parent 526ed0b391
commit 54a3761450

View File

@ -4213,13 +4213,8 @@ gfxFontStyle::Hash() const
{
return mozilla::HashGeneric(systemFont, style.ForHash(),
stretch.ForHash(), weight.ForHash(),
size, sizeAdjust,
size, int32_t(sizeAdjust * 1000.0f),
nsRefPtrHashKey<nsAtom>::HashKey(language));
/* XXX
return (style + (systemFont << 7) + (weight.ForHash() << 8) +
uint32_t(size*1000) + int32_t(sizeAdjust*1000)) ^
nsRefPtrHashKey<nsAtom>::HashKey(language);
*/
}
void