Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index 64b94f1fa26724e3fac4792de00010f301e6aaee..df4b2313f8b2e465e57ed5e243a90feace7e26b9 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -397,10 +397,10 @@ static CSSValueID valueForRepeatRule(int rule) |
static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSlice(const NinePieceImage& image) |
{ |
// Create the slices. |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> top; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> right; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> left; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr; |
if (image.imageSlices().top().isPercent()) |
top = cssValuePool().createValue(image.imageSlices().top().value(), CSSPrimitiveValue::CSS_PERCENTAGE); |
@@ -450,10 +450,10 @@ static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSl |
static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const BorderImageLengthBox& box, const RenderStyle& style) |
{ |
// Create the slices. |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> top; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> right; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> left; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr; |
if (box.top().isNumber()) |
top = cssValuePool().createValue(box.top().number(), CSSPrimitiveValue::CSS_NUMBER); |
@@ -501,8 +501,8 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(cons |
static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImageRepeat(const NinePieceImage& image) |
{ |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> horizontalRepeat; |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> verticalRepeat; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> horizontalRepeat = nullptr; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> verticalRepeat = nullptr; |
horizontalRepeat = cssValuePool().createIdentifierValue(valueForRepeatRule(image.horizontalRule())); |
if (image.horizontalRule() == image.verticalRule()) |
@@ -518,7 +518,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImage(const NinePieceIm |
return cssValuePool().createIdentifierValue(CSSValueNone); |
// Image first. |
- RefPtrWillBeRawPtr<CSSValue> imageValue; |
+ RefPtrWillBeRawPtr<CSSValue> imageValue = nullptr; |
if (image.image()) |
imageValue = image.image()->cssValue(); |
@@ -559,13 +559,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForReflection(const StyleReflection |
if (!reflection) |
return cssValuePool().createIdentifierValue(CSSValueNone); |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> offset; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> offset = nullptr; |
if (reflection->offset().isPercent()) |
offset = cssValuePool().createValue(reflection->offset().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); |
else |
offset = zoomAdjustedPixelValue(reflection->offset().value(), style); |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> direction; |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> direction = nullptr; |
switch (reflection->direction()) { |
case ReflectionBelow: |
direction = cssValuePool().createIdentifierValue(CSSValueBelow); |
@@ -718,7 +718,7 @@ static LayoutRect sizingBox(RenderObject* renderer) |
static PassRefPtrWillBeRawPtr<CSSTransformValue> valueForMatrixTransform(const TransformationMatrix& transform, const RenderStyle& style) |
{ |
- RefPtrWillBeRawPtr<CSSTransformValue> transformValue; |
+ RefPtrWillBeRawPtr<CSSTransformValue> transformValue = nullptr; |
if (transform.isAffine()) { |
transformValue = CSSTransformValue::create(CSSTransformValue::MatrixTransformOperation); |
@@ -781,7 +781,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::valueForFilter(con |
RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); |
- RefPtrWillBeRawPtr<CSSFilterValue> filterValue; |
+ RefPtrWillBeRawPtr<CSSFilterValue> filterValue = nullptr; |
Vector<RefPtr<FilterOperation> >::const_iterator end = style.filter().operations().end(); |
for (Vector<RefPtr<FilterOperation> >::const_iterator it = style.filter().operations().begin(); it != end; ++it) { |
@@ -937,7 +937,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridPosition(const GridPosition& |
} |
static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSSAnimationData* animation) |
{ |
- RefPtrWillBeRawPtr<CSSValue> propertyValue; |
+ RefPtrWillBeRawPtr<CSSValue> propertyValue = nullptr; |
if (animation->animationMode() == CSSAnimationData::AnimateNone) |
propertyValue = cssValuePool().createIdentifierValue(CSSValueNone); |
else if (animation->animationMode() == CSSAnimationData::AnimateAll) |
@@ -1196,8 +1196,8 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::valueForShadowData |
RefPtrWillBeRawPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(shadow.x(), style); |
RefPtrWillBeRawPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(shadow.y(), style); |
RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(shadow.blur(), style); |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixelValue(shadow.spread(), style) : PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(); |
- RefPtrWillBeRawPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtrWillBeRawPtr<CSSPrimitiveValue>() : cssValuePool().createIdentifierValue(CSSValueInset); |
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixelValue(shadow.spread(), style) : PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr); |
haraken
2014/03/24 13:52:54
PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr)
Mads Ager (chromium)
2014/03/24 14:27:30
Unfortunately, no. Both branches in a conditional
|
+ RefPtrWillBeRawPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr) : cssValuePool().createIdentifierValue(CSSValueInset); |
haraken
2014/03/24 13:52:54
PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr)
Mads Ager (chromium)
2014/03/24 14:27:30
Ditto.
|
RefPtrWillBeRawPtr<CSSPrimitiveValue> color = currentColorOrValidColor(style, shadow.color()); |
return CSSShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), shadowStyle.release(), color.release()); |
} |
@@ -1852,7 +1852,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu |
case CSSPropertyTabSize: |
return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValue::CSS_NUMBER); |
case CSSPropertyCursor: { |
- RefPtrWillBeRawPtr<CSSValueList> list; |
+ RefPtrWillBeRawPtr<CSSValueList> list = nullptr; |
CursorList* cursors = style->cursors(); |
if (cursors && cursors->size() > 0) { |
list = CSSValueList::createCommaSeparated(); |