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

Bug 1060090 part 2: Spin out "ComputePositionValue", and rename its helper "ComputeBackgroundPositionCoord" to "ComputePositionCoord". r=heycam

Browse Source
This commit is contained in:
Daniel Holbert 2014-09-09 11:40:15 -07:00
parent 59ad3579ad
commit 62d445107c
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
layout/style/nsRuleNode.cpp
View File

@ -5937,18 +5937,17 @@ struct BackgroundItemComputer<nsCSSValueList, nsStyleImage>
}
};
/* Helper function for
* BackgroundItemComputer<nsCSSValue, nsStyleBackground::Position>
* It computes a single PositionCoord from an nsCSSValue object
* (contained in a list).
/* Helper function for ComputePositionValue.
* This function computes a single PositionCoord from two nsCSSValue objects,
* which represent an edge and an offset from that edge.
*/
typedef nsStyleBackground::Position::PositionCoord PositionCoord;
static void
ComputeBackgroundPositionCoord(nsStyleContext* aStyleContext,
const nsCSSValue& aEdge,
const nsCSSValue& aOffset,
PositionCoord* aResult,
bool& aCanStoreInRuleTree)
ComputePositionCoord(nsStyleContext* aStyleContext,
const nsCSSValue& aEdge,
const nsCSSValue& aOffset,
PositionCoord* aResult,
bool& aCanStoreInRuleTree)
{
if (eCSSUnit_Percent == aOffset.GetUnit()) {
aResult->mLength = 0;
@ -5992,6 +5991,40 @@ ComputeBackgroundPositionCoord(nsStyleContext* aStyleContext,
}
}
/* Helper function to convert a CSS <position> specified value into its
* computed-style form. */
static void
ComputePositionValue(nsStyleContext* aStyleContext,
const nsCSSValue& aValue,
nsStyleBackground::Position& aComputedValue,
bool& aCanStoreInRuleTree)
{
NS_ASSERTION(aValue.GetUnit() == eCSSUnit_Array,
"unexpected unit for CSS <position> value");
nsRefPtr<nsCSSValue::Array> positionArray = aValue.GetArrayValue();
const nsCSSValue &xEdge = positionArray->Item(0);
const nsCSSValue &xOffset = positionArray->Item(1);
const nsCSSValue &yEdge = positionArray->Item(2);
const nsCSSValue &yOffset = positionArray->Item(3);
NS_ASSERTION((eCSSUnit_Enumerated == xEdge.GetUnit() ||
eCSSUnit_Null == xEdge.GetUnit()) &&
(eCSSUnit_Enumerated == yEdge.GetUnit() ||
eCSSUnit_Null == yEdge.GetUnit()) &&
eCSSUnit_Enumerated != xOffset.GetUnit() &&
eCSSUnit_Enumerated != yOffset.GetUnit(),
"Invalid background position");
ComputePositionCoord(aStyleContext, xEdge, xOffset,
&aComputedValue.mXPosition,
aCanStoreInRuleTree);
ComputePositionCoord(aStyleContext, yEdge, yOffset,
&aComputedValue.mYPosition,
aCanStoreInRuleTree);
}
template <>
struct BackgroundItemComputer<nsCSSValueList, nsStyleBackground::Position>
{
@ -6000,30 +6033,8 @@ struct BackgroundItemComputer<nsCSSValueList, nsStyleBackground::Position>
nsStyleBackground::Position& aComputedValue,
bool& aCanStoreInRuleTree)
{
NS_ASSERTION(aSpecifiedValue->mValue.GetUnit() == eCSSUnit_Array, "bg-position not an array");
nsRefPtr<nsCSSValue::Array> bgPositionArray =
aSpecifiedValue->mValue.GetArrayValue();
const nsCSSValue &xEdge = bgPositionArray->Item(0);
const nsCSSValue &xOffset = bgPositionArray->Item(1);
const nsCSSValue &yEdge = bgPositionArray->Item(2);
const nsCSSValue &yOffset = bgPositionArray->Item(3);
NS_ASSERTION((eCSSUnit_Enumerated == xEdge.GetUnit() ||
eCSSUnit_Null == xEdge.GetUnit()) &&
(eCSSUnit_Enumerated == yEdge.GetUnit() ||
eCSSUnit_Null == yEdge.GetUnit()) &&
eCSSUnit_Enumerated != xOffset.GetUnit() &&
eCSSUnit_Enumerated != yOffset.GetUnit(),
"Invalid background position");
ComputeBackgroundPositionCoord(aStyleContext, xEdge, xOffset,
&aComputedValue.mXPosition,
aCanStoreInRuleTree);
ComputeBackgroundPositionCoord(aStyleContext, yEdge, yOffset,
&aComputedValue.mYPosition,
aCanStoreInRuleTree);
ComputePositionValue(aStyleContext, aSpecifiedValue->mValue,
aComputedValue, aCanStoreInRuleTree);
}
};