| Index: Source/core/css/BasicShapeFunctions.cpp
|
| diff --git a/Source/core/css/BasicShapeFunctions.cpp b/Source/core/css/BasicShapeFunctions.cpp
|
| index b4e25064f128431bc4bacc21be72357df9a93c2c..9c552efa5eb0029d6d38c87c9563fe1b4c54f9b9 100644
|
| --- a/Source/core/css/BasicShapeFunctions.cpp
|
| +++ b/Source/core/css/BasicShapeFunctions.cpp
|
| @@ -36,11 +36,11 @@
|
| #include "core/css/Pair.h"
|
| #include "core/css/resolver/StyleResolverState.h"
|
| #include "core/layout/style/BasicShapes.h"
|
| -#include "core/layout/style/LayoutStyle.h"
|
| +#include "core/layout/style/ComputedStyle.h"
|
|
|
| namespace blink {
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSValuePool& pool, const LayoutStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)
|
| +static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSValuePool& pool, const ComputedStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)
|
| {
|
| if (center.direction() == BasicShapeCenterCoordinate::TopLeft)
|
| return pool.createValue(center.length(), style);
|
| @@ -50,7 +50,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSVal
|
| return pool.createValue(Pair::create(pool.createIdentifierValue(keyword), pool.createValue(center.length(), style), Pair::DropIdenticalValues));
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> basicShapeRadiusToCSSValue(CSSValuePool& pool, const LayoutStyle& style, const BasicShapeRadius& radius)
|
| +static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> basicShapeRadiusToCSSValue(CSSValuePool& pool, const ComputedStyle& style, const BasicShapeRadius& radius)
|
| {
|
| switch (radius.type()) {
|
| case BasicShapeRadius::Value:
|
| @@ -65,7 +65,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> basicShapeRadiusToCSSValue(CSSV
|
| return nullptr;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> valueForBasicShape(const LayoutStyle& style, const BasicShape* basicShape)
|
| +PassRefPtrWillBeRawPtr<CSSValue> valueForBasicShape(const ComputedStyle& style, const BasicShape* basicShape)
|
| {
|
| CSSValuePool& pool = cssValuePool();
|
|
|
|
|