Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 338554 - Honor -moz-box-sizing on table cells in standards mode (we ignore it in quirks mode). r=dbaron

Browse Source
This commit is contained in:
Tal Aloni 2012-07-12 19:28:52 -04:00
parent 5ddaf65e65
commit 36815deeaa
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/reftests/bugs/494667-2-ref.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE HTML>
<html>
<body>
<div style="width:212px; height:204px; background:lime;"></div>
<div style="width:204px; height:204px; background:lime;"></div>
</body>
</html>

29
layout/tables/BasicTableLayoutStrategy.cpp
View File

@ -94,8 +94,6 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
float prefPercent = 0.0f;
bool hasSpecifiedWidth = false;
// XXXldb Should we consider -moz-box-sizing?
const nsStylePosition *stylePos = aFrame->GetStylePosition();
const nsStyleCoord &width = stylePos->mWidth;
nsStyleUnit unit = width.GetUnit();
@ -198,7 +196,32 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
nsIFrame::IntrinsicWidthOffsetData offsets =
aFrame->IntrinsicWidthOffsets(aRenderingContext);
// XXX Should we ignore percentage padding?
nscoord add = offsets.hPadding + offsets.hBorder;
// In quirks mode, table cell width should be content-box,
// but height should be border box.
// Because of this historic anomaly, we do not use quirk.css.
// (We can't specify one value of box-sizing for width and another
// for height).
// For this reason, we also do not use box-sizing for just one of
// them, as this may be confusing.
nscoord add = 0;
if (aFrame->PresContext()->CompatibilityMode() == eCompatibility_NavQuirks) {
add = offsets.hPadding + offsets.hBorder;
}
else
{
switch (stylePos->mBoxSizing) {
case NS_STYLE_BOX_SIZING_CONTENT:
add = offsets.hPadding + offsets.hBorder;
break;
case NS_STYLE_BOX_SIZING_PADDING:
add = offsets.hBorder;
break;
default:
// NS_STYLE_BOX_SIZING_BORDER
break;
}
}
minCoord += add;
prefCoord = NSCoordSaturatingAdd(prefCoord, add);
}