wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't use fieldset pref widths as min widths, since pref widths can be unconstrained. Incidentally makes it possible for text to legends to wrap if the page wants it to. Bug 404123 and bug 354502, r+sr=dbaron, a=beltzner.

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2008-03-14 13:48:23 -07:00
parent 2c3963ae51
commit 7b83e29004
11 changed files with 114 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/forms/crashtests/404123-1.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
</head>
<body>
<fieldset>
<legend style="padding: 0pt 100%;"></legend>
</fieldset>
</body>
</html>

1
layout/forms/crashtests/crashtests.list
View File

@ -20,3 +20,4 @@ load 388374-1.xhtml
load 388374-2.html
load 393656-1.xhtml
load 393656-2.xhtml
load 404123-1.html

109
layout/forms/nsFieldSetFrame.cpp
View File

@ -73,9 +73,8 @@ public:
nsIFrame* aChildList);
NS_HIDDEN_(nscoord)
GetLegendPrefWidth(nsIRenderingContext* aRenderingContext);
NS_HIDDEN_(nscoord)
GetContentMinWidth(nsIRenderingContext* aRenderingContext);
GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType);
virtual nscoord GetMinWidth(nsIRenderingContext* aRenderingContext);
virtual nscoord GetPrefWidth(nsIRenderingContext* aRenderingContext);
virtual nsSize ComputeSize(nsIRenderingContext *aRenderingContext,
@ -334,47 +333,27 @@ nsFieldSetFrame::PaintBorderBackground(nsIRenderingContext& aRenderingContext,
}
}
// XXXbz This duplicates code in nsGkAtoms (near IntrinsicForContainer)
static nscoord GetCoord(const nsStyleCoord& aCoord, nscoord aIfNotCoord)
{
return aCoord.GetUnit() == eStyleUnit_Coord
? aCoord.GetCoordValue()
: aIfNotCoord;
}
nscoord
nsFieldSetFrame::GetLegendPrefWidth(nsIRenderingContext* aRenderingContext)
nsFieldSetFrame::GetIntrinsicWidth(nsIRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType aType)
{
NS_ASSERTION(mLegendFrame, "Don't call me if there is no legend frame!");
nscoord legendWidth = 0;
nscoord contentWidth = 0;
if (mLegendFrame) {
legendWidth =
nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mLegendFrame,
aType);
}
// We don't want to use nsLayoutUtils::IntrinsicForContainer,
// because legends ignore their CSS-specified width.
nscoord result = mLegendFrame->GetPrefWidth(aRenderingContext);
const nsStylePadding *stylePadding = mLegendFrame->GetStylePadding();
result += GetCoord(stylePadding->mPadding.GetLeft(), 0);
result += GetCoord(stylePadding->mPadding.GetRight(), 0);
const nsStyleBorder *styleBorder = mLegendFrame->GetStyleBorder();
result += styleBorder->GetBorderWidth(NS_SIDE_LEFT);
result += styleBorder->GetBorderWidth(NS_SIDE_RIGHT);
const nsStyleMargin *styleMargin = mLegendFrame->GetStyleMargin();
result += GetCoord(styleMargin->mMargin.GetLeft(), 0);
result += GetCoord(styleMargin->mMargin.GetRight(), 0);
return result;
if (mContentFrame) {
contentWidth =
nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mContentFrame,
aType);
}
return PR_MAX(legendWidth, contentWidth);
}
nscoord
nsFieldSetFrame::GetContentMinWidth(nsIRenderingContext* aRenderingContext)
{
NS_ASSERTION(mContentFrame, "Don't call me if there is no legend frame!");
return nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mContentFrame,
nsLayoutUtils::MIN_WIDTH);
}
nscoord
nsFieldSetFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
@ -382,17 +361,7 @@ nsFieldSetFrame::GetMinWidth(nsIRenderingContext* aRenderingContext)
nscoord result = 0;
DISPLAY_MIN_WIDTH(this, result);
nscoord legendPrefWidth = 0;
nscoord contentMinWidth = 0;
if (mLegendFrame) {
legendPrefWidth = GetLegendPrefWidth(aRenderingContext);
}
if (mContentFrame) {
contentMinWidth = GetContentMinWidth(aRenderingContext);
}
result = PR_MAX(legendPrefWidth, contentMinWidth);
result = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::MIN_WIDTH);
return result;
}
@ -402,19 +371,7 @@ nsFieldSetFrame::GetPrefWidth(nsIRenderingContext* aRenderingContext)
nscoord result = 0;
DISPLAY_PREF_WIDTH(this, result);
nscoord legendPrefWidth = 0;
nscoord contentPrefWidth = 0;
if (mLegendFrame) {
legendPrefWidth = GetLegendPrefWidth(aRenderingContext);
}
if (mContentFrame) {
contentPrefWidth =
nsLayoutUtils::IntrinsicForContainer(aRenderingContext, mContentFrame,
nsLayoutUtils::PREF_WIDTH);
}
result = PR_MAX(legendPrefWidth, contentPrefWidth);
result = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::PREF_WIDTH);
return result;
}
@ -467,7 +424,16 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
nsSize availSize(aReflowState.ComputedWidth(), aReflowState.availableHeight);
NS_ASSERTION(!mContentFrame ||
GetContentMinWidth(aReflowState.rendContext) <= availSize.width,
nsLayoutUtils::IntrinsicForContainer(aReflowState.rendContext,
mContentFrame,
nsLayoutUtils::MIN_WIDTH) <=
availSize.width,
"Bogus availSize.width; should be bigger");
NS_ASSERTION(!mLegendFrame ||
nsLayoutUtils::IntrinsicForContainer(aReflowState.rendContext,
mLegendFrame,
nsLayoutUtils::MIN_WIDTH) <=
availSize.width,
"Bogus availSize.width; should be bigger");
// get our border and padding
@ -483,18 +449,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
const nsStyleMargin* marginStyle = mLegendFrame->GetStyleMargin();
marginStyle->GetMargin(legendMargin);
// Give the legend all the space it wants.
nsSize legendAvailSize(GetLegendPrefWidth(aReflowState.rendContext),
NS_INTRINSICSIZE);
nsHTMLReflowState legendReflowState(aPresContext, aReflowState,
mLegendFrame,
legendAvailSize);
// always give the legend as much size as it wants
legendReflowState.
SetComputedWidth(mLegendFrame->GetPrefWidth(aReflowState.rendContext));
legendReflowState.SetComputedHeight(NS_INTRINSICSIZE);
mLegendFrame, availSize);
nsHTMLReflowMetrics legendDesiredSize;
@ -529,9 +485,6 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
availSize.height -= mLegendSpace;
availSize.height = PR_MAX(availSize.height, 0);
}
NS_ASSERTION(availSize.width >= mLegendRect.width,
"Bogus availSize.width. Should be bigger");
FinishReflowChild(mLegendFrame, aPresContext, &legendReflowState,
legendDesiredSize, 0, 0, NS_FRAME_NO_MOVE_FRAME);

10
layout/reftests/bugs/404123-1-ref.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<body>
<fieldset style="display: inline">
<legend>This is legend text</legend>
This is other text
</fieldset>
</body>
</html>

9
layout/reftests/bugs/404123-1.html Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<body style="width: 0">
<fieldset>
<legend>This is legend text</legend>
This is other text
</fieldset>
</body>
</html>

10
layout/reftests/bugs/404123-2-ref.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<body>
<fieldset style="display: inline">
<legend>Legend<br>textstuffandall</legend>
Text
</fieldset>
</body>
</html>

9
layout/reftests/bugs/404123-2.html Normal file
View File

@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<body style="width: 0">
<fieldset>
<legend style="white-space: normal">Legend textstuffandall</legend>
Text
</fieldset>
</body>
</html>

10
layout/reftests/bugs/404123-3-ref.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<body>
<fieldset>
<legend style="border: 1px solid black;">
<span style="display: inline-block; height:100px; width: 100px"></span>
</legend>
</fieldset>
</body>
</html>

12
layout/reftests/bugs/404123-3.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<body>
<fieldset>
<legend style="width: 300px; min-width: 400px; max-width: 50px;
height: 300px; min-height: 400px; max-height: 50px;
border: 1px solid black;">
<span style="display: inline-block; height:100px; width: 100px"></span>
</legend>
</fieldset>
</body>
</html>

3
layout/reftests/bugs/reftest.list
View File

@ -679,6 +679,9 @@ random == 403134-1.html 403134-1-ref.html # bug 405377
== 404030-1.html 404030-1-ref.html
!= 404030-1-notref.html 404030-1.html
!= 404030-1-notref2.html 404030-1.html
== 404123-1.html 404123-1-ref.html
== 404123-2.html 404123-2-ref.html
== 404123-3.html 404123-3-ref.html
== 404180-1.html 404180-1-ref.html
== 404301-1.html 404301-1-ref.html
== 404309-1a.html 404309-1-ref.html

7
layout/style/forms.css
View File

@ -55,6 +55,13 @@ legend {
border: none;
position: static ! important;
float: none ! important;
width: auto ! important;
min-width: 0 ! important;
max-width: none ! important;
height: auto ! important;
min-height: 0 ! important;
max-height: none ! important;
white-space: nowrap;
}
fieldset {