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

limit the nowrap + width hack to quirks mode bug 277232 r/sr=bzbarsky

Browse Source
This commit is contained in:
bmlk@gmx.de
2005-03-06 18:33:12 +00:00
parent 5dcd0f036c
commit 6a770321c5
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
layout/tables/nsTableCellFrame.cpp
View File

@@ -222,17 +222,14 @@ void nsTableCellFrame::SetPass1MaxElementWidth(nscoord aMaxWidth,
nscoord aMaxElementWidth)
{
nscoord maxElemWidth = aMaxElementWidth;
// check for fixed width and not nowrap and not pre
const nsStylePosition* stylePosition = GetStylePosition();
const nsStyleText* styleText = GetStyleText();
if (stylePosition->mWidth.GetUnit() == eStyleUnit_Coord &&
styleText->mWhiteSpace != NS_STYLE_WHITESPACE_NOWRAP &&
styleText->mWhiteSpace != NS_STYLE_WHITESPACE_PRE) {
// has fixed width, check the content for nowrap
if (GetContent()->HasAttr(kNameSpaceID_None, nsHTMLAtoms::nowrap)) {
// content has nowrap (is not mapped to style be cause it has width)
// set the max element size to the value of the fixed width (NAV/IE quirk)
maxElemWidth = NS_MAX(maxElemWidth, stylePosition->mWidth.GetCoordValue());
if (eCompatibility_NavQuirks == GetPresContext()->CompatibilityMode()) {
// check for fixed width and not nowrap and not pre
const nsStylePosition* stylePosition = GetStylePosition();
if (stylePosition->mWidth.GetUnit() == eStyleUnit_Coord) {
if (GetContent()->HasAttr(kNameSpaceID_None, nsHTMLAtoms::nowrap)) {
// set the max element size to the value of the fixed width (NAV/IE quirk)
maxElemWidth = NS_MAX(maxElemWidth, stylePosition->mWidth.GetCoordValue());
}
}
}
mPass1MaxElementWidth = maxElemWidth;