| Index: Source/core/css/BasicShapeFunctions.cpp
|
| diff --git a/Source/core/css/BasicShapeFunctions.cpp b/Source/core/css/BasicShapeFunctions.cpp
|
| index 5eb0551bca491aae11e08e580c8b8fe7ec4a278a..1c6f3be915397f79c267b8cccfa62b137fb87445 100644
|
| --- a/Source/core/css/BasicShapeFunctions.cpp
|
| +++ b/Source/core/css/BasicShapeFunctions.cpp
|
| @@ -133,7 +133,7 @@ static Length convertToLength(const StyleResolverState& state, NullableCSSValue
|
| {
|
| if (!value)
|
| return Length(0, Fixed);
|
| - return toCSSPrimitiveValue(*value).convertToLength(state.cssToLengthConversionData());
|
| + return toCSSPrimitiveValue(value).convertToLength(state.cssToLengthConversionData());
|
| }
|
|
|
| static LengthSize convertToLengthSize(const StyleResolverState& state, NullableCSSValue value)
|
| @@ -141,7 +141,7 @@ static LengthSize convertToLengthSize(const StyleResolverState& state, NullableC
|
| if (!value)
|
| return LengthSize(Length(0, Fixed), Length(0, Fixed));
|
|
|
| - Pair* pair = toCSSPrimitiveValue(*value).getPairValue();
|
| + Pair* pair = toCSSPrimitiveValue(value).getPairValue();
|
| return LengthSize(convertToLength(state, pair->first()), convertToLength(state, pair->second()));
|
| }
|
|
|
| @@ -153,10 +153,10 @@ static BasicShapeCenterCoordinate convertToCenterCoordinate(const StyleResolverS
|
| CSSValueID keyword = CSSValueTop;
|
| if (!value) {
|
| keyword = CSSValueCenter;
|
| - } else if (toCSSPrimitiveValue(*value).isValueID()) {
|
| - keyword = toCSSPrimitiveValue(*value).getValueID();
|
| - } else if (Pair* pair = toCSSPrimitiveValue(*value).getPairValue()) {
|
| - keyword = toCSSPrimitiveValue(*pair->first()).getValueID();
|
| + } else if (toCSSPrimitiveValue(value).isValueID()) {
|
| + keyword = toCSSPrimitiveValue(value).getValueID();
|
| + } else if (Pair* pair = toCSSPrimitiveValue(value).getPairValue()) {
|
| + keyword = pair->first().getValueID();
|
| offset = convertToLength(state, pair->second());
|
| } else {
|
| offset = convertToLength(state, value);
|
| @@ -189,8 +189,8 @@ static BasicShapeRadius cssValueToBasicShapeRadius(const StyleResolverState& sta
|
| if (!radius)
|
| return BasicShapeRadius(BasicShapeRadius::ClosestSide);
|
|
|
| - if (toCSSPrimitiveValue(*radius).isValueID()) {
|
| - switch (toCSSPrimitiveValue(*radius).getValueID()) {
|
| + if (toCSSPrimitiveValue(radius).isValueID()) {
|
| + switch (toCSSPrimitiveValue(radius).getValueID()) {
|
| case CSSValueClosestSide:
|
| return BasicShapeRadius(BasicShapeRadius::ClosestSide);
|
| case CSSValueFarthestSide:
|
|
|