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 1063775, part 1: Remove unnecessary null-checks after 'new' in StyleAnimationValue.cpp. r=dbaron

Browse Source
This commit is contained in:
Daniel Holbert 2014-09-17 22:04:17 -07:00
parent a4037a80b0
commit af71d08be4
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
layout/style/StyleAnimationValue.cpp
View File

@ -1162,9 +1162,6 @@ AddShadowItems(double aCoeff1, const nsCSSValue &aValue1,
resultArray->Item(5) = inset1;
nsCSSValueList *resultItem = new nsCSSValueList;
if (!resultItem) {
return false;
}
resultItem->mValue.SetArrayValue(resultArray, eCSSUnit_Array);
*aResultTail = resultItem;
aResultTail = &resultItem->mNext;
@ -2235,9 +2232,6 @@ StyleAnimationValue::AddWeighted(nsCSSProperty aProperty,
}
nsCSSValueList *item = new nsCSSValueList;
if (!item) {
return false;
}
*resultTail = item;
resultTail = &item->mNext;
@ -2415,9 +2409,6 @@ StyleAnimationValue::AddWeighted(nsCSSProperty aProperty,
nsCSSValueList **resultTail = getter_Transfers(result);
while (position1 && position2) {
nsCSSValueList *item = new nsCSSValueList;
if (!item) {
return false;
}
*resultTail = item;
resultTail = &item->mNext;
@ -2444,9 +2435,6 @@ StyleAnimationValue::AddWeighted(nsCSSProperty aProperty,
nsCSSValuePairList **resultTail = getter_Transfers(result);
do {
nsCSSValuePairList *item = new nsCSSValuePairList;
if (!item) {
return false;
}
*resultTail = item;
resultTail = &item->mNext;
@ -3035,9 +3023,6 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
const nsStyleTableBorder *styleTableBorder =
static_cast<const nsStyleTableBorder*>(styleStruct);
nsAutoPtr<nsCSSValuePair> pair(new nsCSSValuePair);
if (!pair) {
return false;
}
nscoordToCSSValue(styleTableBorder->mBorderSpacingX, pair->mXValue);
nscoordToCSSValue(styleTableBorder->mBorderSpacingY, pair->mYValue);
aComputedValue.SetAndAdoptCSSValuePairValue(pair.forget(),
@ -3049,8 +3034,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
const nsStyleDisplay *styleDisplay =
static_cast<const nsStyleDisplay*>(styleStruct);
nsAutoPtr<nsCSSValueTriplet> triplet(new nsCSSValueTriplet);
if (!triplet ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[0],
if (!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[0],
triplet->mXValue) ||
!StyleCoordToCSSValue(styleDisplay->mTransformOrigin[1],
triplet->mYValue) ||
@ -3067,8 +3051,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
const nsStyleDisplay *styleDisplay =
static_cast<const nsStyleDisplay*>(styleStruct);
nsAutoPtr<nsCSSValuePair> pair(new nsCSSValuePair);
if (!pair ||
!StyleCoordToCSSValue(styleDisplay->mPerspectiveOrigin[0],
if (!StyleCoordToCSSValue(styleDisplay->mPerspectiveOrigin[0],
pair->mXValue) ||
!StyleCoordToCSSValue(styleDisplay->mPerspectiveOrigin[1],
pair->mYValue)) {
@ -3092,9 +3075,6 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
for (uint32_t i = 0, i_end = svg->mStrokeDasharrayLength;
i != i_end; ++i) {
nsCSSValueList *item = new nsCSSValueList;
if (!item) {
return false;
}
*resultTail = item;
resultTail = &item->mNext;
@ -3123,9 +3103,6 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
}
} else {
result = new nsCSSValueList;
if (!result) {
return false;
}
result->mValue.SetNoneValue();
}
aComputedValue.SetAndAdoptCSSValueListValue(result.forget(),
@ -3450,8 +3427,7 @@ StyleAnimationValue::ExtractComputedValue(nsCSSProperty aProperty,
const nsStyleCoord &vert =
corners->Get(NS_FULL_TO_HALF_CORNER(fullCorner, true));
nsAutoPtr<nsCSSValuePair> pair(new nsCSSValuePair);
if (!pair ||
!StyleCoordToCSSValue(horiz, pair->mXValue) ||
if (!StyleCoordToCSSValue(horiz, pair->mXValue) ||
!StyleCoordToCSSValue(vert, pair->mYValue)) {
return false;
}
@ -3619,32 +3595,20 @@ StyleAnimationValue::operator=(const StyleAnimationValue& aOther)
"This clause is for handling nsCSSValue-backed units");
NS_ABORT_IF_FALSE(aOther.mValue.mCSSValue, "values may not be null");
mValue.mCSSValue = new nsCSSValue(*aOther.mValue.mCSSValue);
if (!mValue.mCSSValue) {
mUnit = eUnit_Null;
}
break;
case eUnit_CSSValuePair:
NS_ABORT_IF_FALSE(aOther.mValue.mCSSValuePair,
"value pairs may not be null");
mValue.mCSSValuePair = new nsCSSValuePair(*aOther.mValue.mCSSValuePair);
if (!mValue.mCSSValuePair) {
mUnit = eUnit_Null;
}
break;
case eUnit_CSSValueTriplet:
NS_ABORT_IF_FALSE(aOther.mValue.mCSSValueTriplet,
"value triplets may not be null");
mValue.mCSSValueTriplet = new nsCSSValueTriplet(*aOther.mValue.mCSSValueTriplet);
if (!mValue.mCSSValueTriplet) {
mUnit = eUnit_Null;
}
break;
case eUnit_CSSRect:
NS_ABORT_IF_FALSE(aOther.mValue.mCSSRect, "rects may not be null");
mValue.mCSSRect = new nsCSSRect(*aOther.mValue.mCSSRect);
if (!mValue.mCSSRect) {
mUnit = eUnit_Null;
}
break;
case eUnit_Filter:
case eUnit_Dasharray: