Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cache non-percent margin and padding calc() on the style struct. (Bug 585715) r=bzbarsky a2.0=blocking:beta6+

Browse Source
This commit is contained in:
L. David Baron 2010-08-31 12:05:12 -04:00
parent b221c0b0c0
commit 19f53cddb6
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
layout/style/nsStyleStruct.cpp
View File

@ -72,10 +72,10 @@
PR_STATIC_ASSERT((((1 << nsStyleStructID_Length) - 1) &
~(NS_STYLE_INHERIT_MASK)) == 0);
inline PRBool IsFixedUnit(nsStyleUnit aUnit, PRBool aEnumOK)
inline PRBool IsFixedUnit(const nsStyleCoord& aCoord, PRBool aEnumOK)
{
return PRBool((aUnit == eStyleUnit_Coord) ||
(aEnumOK && (aUnit == eStyleUnit_Enumerated)));
return aCoord.ConvertsToLength() ||
(aEnumOK && aCoord.GetUnit() == eStyleUnit_Enumerated);
}
static PRBool EqualURIs(nsIURI *aURI1, nsIURI *aURI2)
@ -224,7 +224,7 @@ nsChangeHint nsStyleFont::CalcFontDifference(const nsFont& aFont1, const nsFont&
static PRBool IsFixedData(const nsStyleSides& aSides, PRBool aEnumOK)
{
NS_FOR_CSS_SIDES(side) {
if (!IsFixedUnit(aSides.GetUnit(side), aEnumOK))
if (!IsFixedUnit(aSides.Get(side), aEnumOK))
return PR_FALSE;
}
return PR_TRUE;
@ -234,22 +234,17 @@ static nscoord CalcCoord(const nsStyleCoord& aCoord,
const nscoord* aEnumTable,
PRInt32 aNumEnums)
{
switch (aCoord.GetUnit()) {
case eStyleUnit_Coord:
return aCoord.GetCoordValue();
case eStyleUnit_Enumerated:
if (nsnull != aEnumTable) {
PRInt32 value = aCoord.GetIntValue();
if ((0 <= value) && (value < aNumEnums)) {
return aEnumTable[aCoord.GetIntValue()];
}
}
break;
default:
NS_ERROR("bad unit type");
break;
if (aCoord.GetUnit() == eStyleUnit_Enumerated) {
NS_ABORT_IF_FALSE(aEnumTable, "must have enum table");
PRInt32 value = aCoord.GetIntValue();
if (0 <= value && value < aNumEnums) {
return aEnumTable[aCoord.GetIntValue()];
}
NS_NOTREACHED("unexpected enum value");
return 0;
}
return 0;
NS_ABORT_IF_FALSE(aCoord.ConvertsToLength(), "unexpected unit");
return nsRuleNode::ComputeCoordPercentCalc(aCoord, 0);
}
nsStyleMargin::nsStyleMargin() {
@ -284,8 +279,6 @@ nsStyleMargin::Destroy(nsPresContext* aContext) {
void nsStyleMargin::RecalcData()
{
// FIXME: We could cache calc() with percents here if we changed
// IsFixedData and CalcCoord.
if (IsFixedData(mMargin, PR_FALSE)) {
NS_FOR_CSS_SIDES(side) {
mCachedMargin.side(side) = CalcCoord(mMargin.Get(side), nsnull, 0);
@ -349,8 +342,6 @@ nsStylePadding::Destroy(nsPresContext* aContext) {
void nsStylePadding::RecalcData()
{
// FIXME: We could cache calc() with percents here if we changed
// IsFixedData and CalcCoord.
if (IsFixedData(mPadding, PR_FALSE)) {
NS_FOR_CSS_SIDES(side) {
mCachedPadding.side(side) = CalcCoord(mPadding.Get(side), nsnull, 0);
@ -593,7 +584,7 @@ nsStyleOutline::RecalcData(nsPresContext* aContext)
if (NS_STYLE_BORDER_STYLE_NONE == GetOutlineStyle()) {
mCachedOutlineWidth = 0;
mHasCachedOutline = PR_TRUE;
} else if (IsFixedUnit(mOutlineWidth.GetUnit(), PR_TRUE)) {
} else if (IsFixedUnit(mOutlineWidth, PR_TRUE)) {
mCachedOutlineWidth =
CalcCoord(mOutlineWidth, aContext->GetBorderWidthTable(), 3);
mCachedOutlineWidth =