Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 526875: Make nsSMILCSSValueType::Add accept just-initialized added values (which represent zero). r=roc

Browse Source
This commit is contained in:
Daniel Holbert 2009-11-11 13:41:43 -08:00
parent 7ba5be32ef
commit 3b5c30efe5
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/smil/crashtests/526875-1.svg Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg">
<animate attributeName="fill-opacity" by="-1"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 120 B

4
content/smil/crashtests/526875-2.svg Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg">
<animate attributeName="fill-opacity" by="1"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 119 B

2
content/smil/crashtests/crashtests.list
View File

@ -1,2 +1,4 @@
load 523188-1.svg
load 525099-1.svg
load 526875-1.svg
load 526875-2.svg

34
content/smil/nsSMILCSSValueType.cpp
View File

@ -182,9 +182,11 @@ nsSMILCSSValueType::Add(nsSMILValue& aDest, const nsSMILValue& aValueToAdd,
NS_ABORT_IF_FALSE(destWrapper && valueToAddWrapper,
"these pointers shouldn't be null");
const nsStyleAnimation::Value* realValueToAdd = &valueToAddWrapper->mCSSValue;
if (destWrapper->mPropID == eCSSProperty_UNKNOWN) {
NS_ABORT_IF_FALSE(destWrapper->mCSSValue.IsNull(),
"If property ID is unset, then the unit should be, too");
NS_ABORT_IF_FALSE(destWrapper->mCSSValue.IsNull() &&
!destWrapper->mPresContext,
"Partially-initialized ValueWrapper");
// We need to update destWrapper, since it's part of an outparam.
const nsStyleAnimation::Value* zeroVal =
GetZeroValueForUnit(valueToAddWrapper->mCSSValue.GetUnit());
@ -195,17 +197,23 @@ nsSMILCSSValueType::Add(nsSMILValue& aDest, const nsSMILValue& aValueToAdd,
destWrapper->mCSSValue = *zeroVal;
destWrapper->mPropID = valueToAddWrapper->mPropID;
destWrapper->mPresContext = valueToAddWrapper->mPresContext;
} else if (valueToAddWrapper->mPropID == eCSSProperty_UNKNOWN) {
NS_ABORT_IF_FALSE(valueToAddWrapper->mCSSValue.IsNull() &&
!valueToAddWrapper->mPresContext,
"Partially-initialized ValueWrapper");
realValueToAdd = GetZeroValueForUnit(destWrapper->mCSSValue.GetUnit());
if (!realValueToAdd) {
// No zero value for this unit --> doesn't support addition.
return NS_ERROR_FAILURE;
}
}
NS_ABORT_IF_FALSE(valueToAddWrapper->mPropID != eCSSProperty_UNKNOWN &&
!valueToAddWrapper->mCSSValue.IsNull(),
"Added amount should be a parsed value");
// Special case: font-size-adjust is explicitly non-additive
if (destWrapper->mPropID == eCSSProperty_font_size_adjust) {
return NS_ERROR_FAILURE;
}
return nsStyleAnimation::Add(destWrapper->mCSSValue,
valueToAddWrapper->mCSSValue, aCount) ?
*realValueToAdd, aCount) ?
NS_OK : NS_ERROR_FAILURE;
}
@ -225,8 +233,9 @@ nsSMILCSSValueType::ComputeDistance(const nsSMILValue& aFrom,
const nsStyleAnimation::Value* fromCSSValue;
if (fromWrapper->mPropID == eCSSProperty_UNKNOWN) {
NS_ABORT_IF_FALSE(fromWrapper->mCSSValue.IsNull(),
"If property ID is unset, then the unit should be, too");
NS_ABORT_IF_FALSE(fromWrapper->mCSSValue.IsNull() &&
!fromWrapper->mPresContext,
"Partially-initialized ValueWrapper");
fromCSSValue = GetZeroValueForUnit(toWrapper->mCSSValue.GetUnit());
if (!fromCSSValue) {
// No zero value for this unit --> doesn't support distance-computation.
@ -236,7 +245,7 @@ nsSMILCSSValueType::ComputeDistance(const nsSMILValue& aFrom,
fromCSSValue = &fromWrapper->mCSSValue;
}
NS_ABORT_IF_FALSE(toWrapper->mPropID != eCSSProperty_UNKNOWN &&
!toWrapper->mCSSValue.IsNull(),
!toWrapper->mCSSValue.IsNull() && toWrapper->mPresContext,
"ComputeDistance endpoint should be a parsed value");
return nsStyleAnimation::ComputeDistance(*fromCSSValue, toWrapper->mCSSValue,
@ -267,8 +276,9 @@ nsSMILCSSValueType::Interpolate(const nsSMILValue& aStartVal,
const nsStyleAnimation::Value* startCSSValue;
if (startWrapper->mPropID == eCSSProperty_UNKNOWN) {
NS_ABORT_IF_FALSE(startWrapper->mCSSValue.IsNull(),
"If property ID is unset, then the unit should be, too");
NS_ABORT_IF_FALSE(startWrapper->mCSSValue.IsNull() &&
!startWrapper->mPresContext,
"Partially-initialized ValueWrapper");
startCSSValue = GetZeroValueForUnit(endWrapper->mCSSValue.GetUnit());
if (!startCSSValue) {
// No zero value for this unit --> doesn't support interpolation.
@ -278,7 +288,7 @@ nsSMILCSSValueType::Interpolate(const nsSMILValue& aStartVal,
startCSSValue = &startWrapper->mCSSValue;
}
NS_ABORT_IF_FALSE(endWrapper->mPropID != eCSSProperty_UNKNOWN &&
!endWrapper->mCSSValue.IsNull(),
!endWrapper->mCSSValue.IsNull() && endWrapper->mPresContext,
"Interpolate endpoint should be a parsed value");
if (nsStyleAnimation::Interpolate(*startCSSValue,