Pass RenderStyle / RenderObject by reference in more places

Pass RenderStyle / RenderObject by reference in more places

Pass RenderStyle / RenderObject by reference in more places instead of by pointer,
when it cannot be null. This makes the code look safer and gets rid of unnecessary
null checks.

R=adamk

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=161644

[Inactive, 2013-11-08 16:04:27]

On 2013/11/04 16:28:09, Chris Dumez wrote:

ping review?

[dglazkov, 2013-11-08 17:45:09]

lgtm

[commit-bot: I haz the power, 2013-11-08 19:49:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/57643004/1

[commit-bot: I haz the power, 2013-11-08 19:49:37]

Failed to apply patch for Source/core/css/CSSComputedStyleDeclaration.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/css/CSSComputedStyleDeclaration.cpp
  Hunk #1 FAILED at 461.
  1 out of 57 hunks FAILED -- saving rejects to file
Source/core/css/CSSComputedStyleDeclaration.cpp.rej

Patch:       Source/core/css/CSSComputedStyleDeclaration.cpp
Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp
b/Source/core/css/CSSComputedStyleDeclaration.cpp
index
708de220aae6ce962794c098d1eeae3b709b2c27..95a49ef52e1d7f2b17d1380dc95996f9ab566195
100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -461,7 +461,7 @@ static PassRefPtr<CSSBorderImageSliceValue>
valueForNinePieceImageSlice(const Ni
     return
CSSBorderImageSliceValue::create(cssValuePool().createValue(quad.release()),
image.fill());
 }
 
-static PassRefPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const
LengthBox& box, const RenderStyle* style)
+static PassRefPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const
LengthBox& box, const RenderStyle& style)
 {
     // Create the slices.
     RefPtr<CSSPrimitiveValue> top;
@@ -526,7 +526,7 @@ static PassRefPtr<CSSValue>
valueForNinePieceImageRepeat(const NinePieceImage& i
     return cssValuePool().createValue(Pair::create(horizontalRepeat.release(),
verticalRepeat.release(), Pair::DropIdenticalValues));
 }
 
-static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image,
const RenderStyle* style)
+static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image,
const RenderStyle& style)
 {
     if (!image.hasImage())
         return cssValuePool().createIdentifierValue(CSSValueNone);
@@ -551,24 +551,24 @@ static PassRefPtr<CSSValue> valueForNinePieceImage(const
NinePieceImage& image,
     return createBorderImageValue(imageValue.release(), imageSlices.release(),
borderSlices.release(), outset.release(), repeat.release());
 }
 
-inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double
value, const RenderStyle* style)
+inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double
value, const RenderStyle& style)
 {
     return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style),
CSSPrimitiveValue::CSS_PX);
 }
 
-inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double
value, const RenderStyle* style)
+inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double
value, const RenderStyle& style)
 {
-    return cssValuePool().createValue(value / style->effectiveZoom(),
CSSPrimitiveValue::CSS_NUMBER);
+    return cssValuePool().createValue(value / style.effectiveZoom(),
CSSPrimitiveValue::CSS_NUMBER);
 }
 
-static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValueForLength(const
Length& length, const RenderStyle* style)
+static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValueForLength(const
Length& length, const RenderStyle& style)
 {
     if (length.isFixed())
         return zoomAdjustedPixelValue(length.value(), style);
     return cssValuePool().createValue(length, style);
 }
 
-static PassRefPtr<CSSValue> valueForReflection(const StyleReflection*
reflection, const RenderStyle* style)
+static PassRefPtr<CSSValue> valueForReflection(const StyleReflection*
reflection, const RenderStyle& style)
 {
     if (!reflection)
         return cssValuePool().createIdentifierValue(CSSValueNone);
@@ -598,7 +598,7 @@ static PassRefPtr<CSSValue> valueForReflection(const
StyleReflection* reflection
     return CSSReflectValue::create(direction.release(), offset.release(),
valueForNinePieceImage(reflection->mask(), style));
 }
 
-static PassRefPtr<CSSValueList> createPositionListForLayer(CSSPropertyID
propertyID, const FillLayer* layer, const RenderStyle* style)
+static PassRefPtr<CSSValueList> createPositionListForLayer(CSSPropertyID
propertyID, const FillLayer* layer, const RenderStyle& style)
 {
     ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPosition ||
propertyID == CSSPropertyWebkitMaskPosition);
     RefPtr<CSSValueList> positionList = CSSValueList::createSpaceSeparated();
@@ -609,24 +609,21 @@ static PassRefPtr<CSSValueList>
createPositionListForLayer(CSSPropertyID propert
     return positionList.release();
 }
 
-static PassRefPtr<CSSValue> valueForPositionOffset(RenderStyle* style,
CSSPropertyID propertyID, const RenderObject* renderer, RenderView* renderView)
+static PassRefPtr<CSSValue> valueForPositionOffset(RenderStyle& style,
CSSPropertyID propertyID, const RenderObject* renderer, RenderView* renderView)
 {
-    if (!style)
-        return 0;
-
     Length l;
     switch (propertyID) {
         case CSSPropertyLeft:
-            l = style->left();
+            l = style.left();
             break;
         case CSSPropertyRight:
-            l = style->right();
+            l = style.right();
             break;
         case CSSPropertyTop:
-            l = style->top();
+            l = style.top();
             break;
         case CSSPropertyBottom:
-            l = style->bottom();
+            l = style.bottom();
             break;
         default:
             return 0;
@@ -650,15 +647,15 @@ static PassRefPtr<CSSValue>
valueForPositionOffset(RenderStyle* style, CSSProper
     return zoomAdjustedPixelValueForLength(l, style);
 }
 
-PassRefPtr<CSSPrimitiveValue>
CSSComputedStyleDeclaration::currentColorOrValidColor(const RenderStyle* style,
const Color& color) const
+PassRefPtr<CSSPrimitiveValue>
CSSComputedStyleDeclaration::currentColorOrValidColor(const RenderStyle& style,
const Color& color) const
 {
     // This function does NOT look at visited information, so that computed
style doesn't expose that.
     if (!color.isValid())
-        return cssValuePool().createColorValue(style->color().rgb());
+        return cssValuePool().createColorValue(style.color().rgb());
     return cssValuePool().createColorValue(color.rgb());
 }
 
-static PassRefPtr<CSSValueList> valuesForBorderRadiusCorner(LengthSize radius,
const RenderStyle* style)
+static PassRefPtr<CSSValueList> valuesForBorderRadiusCorner(LengthSize radius,
const RenderStyle& style)
 {
     RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
     if (radius.width().type() == Percent)
@@ -672,7 +669,7 @@ static PassRefPtr<CSSValueList>
valuesForBorderRadiusCorner(LengthSize radius, c
     return list.release();
 }
 
-static PassRefPtr<CSSValue> valueForBorderRadiusCorner(LengthSize radius, const
RenderStyle* style)
+static PassRefPtr<CSSValue> valueForBorderRadiusCorner(LengthSize radius, const
RenderStyle& style)
 {
     RefPtr<CSSValueList> list = valuesForBorderRadiusCorner(radius, style);
     if (list->item(0)->equals(*list->item(1)))
@@ -680,22 +677,22 @@ static PassRefPtr<CSSValue>
valueForBorderRadiusCorner(LengthSize radius, const
     return list.release();
 }
 
-static PassRefPtr<CSSValueList> valueForBorderRadiusShorthand(const
RenderStyle* style)
+static PassRefPtr<CSSValueList> valueForBorderRadiusShorthand(const
RenderStyle& style)
 {
     RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
 
-    bool showHorizontalBottomLeft = style->borderTopRightRadius().width() !=
style->borderBottomLeftRadius().width();
-    bool showHorizontalBottomRight = showHorizontalBottomLeft ||
(style->borderBottomRightRadius().width() !=
style->borderTopLeftRadius().width());
-    bool showHorizontalTopRight = showHorizontalBottomRight ||
(style->borderTopRightRadius().width() != style->borderTopLeftRadius().width());
+    bool showHorizontalBottomLeft = style.borderTopRightRadius().width() !=
style.borderBottomLeftRadius().width();
+    bool showHorizontalBottomRight = showHorizontalBottomLeft ||
(style.borderBottomRightRadius().width() !=
style.borderTopLeftRadius().width());
+    bool showHorizontalTopRight = showHorizontalBottomRight ||
(style.borderTopRightRadius().width() != style.borderTopLeftRadius().width());
 
-    bool showVerticalBottomLeft = style->borderTopRightRadius().height() !=
style->borderBottomLeftRadius().height();
-    bool showVerticalBottomRight = showVerticalBottomLeft ||
(style->borderBottomRightRadius().height() !=
style->borderTopLeftRadius().height());
-    bool showVerticalTopRight = showVerticalBottomRight ||
(style->borderTopRightRadius().height() !=
style->borderTopLeftRadius().height());
+    bool showVerticalBottomLeft = style.borderTopRightRadius().height() !=
style.borderBottomLeftRadius().height();
+    bool showVerticalBottomRight = showVerticalBottomLeft ||
(style.borderBottomRightRadius().height() !=
style.borderTopLeftRadius().height());
+    bool showVerticalTopRight = showVerticalBottomRight ||
(style.borderTopRightRadius().height() != style.borderTopLeftRadius().height());
 
-    RefPtr<CSSValueList> topLeftRadius =
valuesForBorderRadiusCorner(style->borderTopLeftRadius(), style);
-    RefPtr<CSSValueList> topRightRadius =
valuesForBorderRadiusCorner(style->borderTopRightRadius(), style);
-    RefPtr<CSSValueList> bottomRightRadius =
valuesForBorderRadiusCorner(style->borderBottomRightRadius(), style);
-    RefPtr<CSSValueList> bottomLeftRadius =
valuesForBorderRadiusCorner(style->borderBottomLeftRadius(), style);
+    RefPtr<CSSValueList> topLeftRadius =
valuesForBorderRadiusCorner(style.borderTopLeftRadius(), style);
+    RefPtr<CSSValueList> topRightRadius =
valuesForBorderRadiusCorner(style.borderTopRightRadius(), style);
+    RefPtr<CSSValueList> bottomRightRadius =
valuesForBorderRadiusCorner(style.borderBottomRightRadius(), style);
+    RefPtr<CSSValueList> bottomLeftRadius =
valuesForBorderRadiusCorner(style.borderBottomLeftRadius(), style);
 
     RefPtr<CSSValueList> horizontalRadii =
CSSValueList::createSpaceSeparated();
     horizontalRadii->append(topLeftRadius->item(0));
@@ -732,7 +729,7 @@ static LayoutRect sizingBox(RenderObject* rendere…
(message too large)

[commit-bot: I haz the power, 2013-11-08 20:02:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/57643004/90001

[commit-bot: I haz the power, 2013-11-08 20:58:21]

Change committed as 161644