Chromium Code Reviews| Index: Source/core/rendering/shapes/Shape.cpp |
| diff --git a/Source/core/rendering/shapes/Shape.cpp b/Source/core/rendering/shapes/Shape.cpp |
| index 12d43da8e6a13dd210a6d5e008c7f6690a22643d..ba7fff116da6a8e948f409825deb9a6ac3ee3b43 100644 |
| --- a/Source/core/rendering/shapes/Shape.cpp |
| +++ b/Source/core/rendering/shapes/Shape.cpp |
| @@ -130,8 +130,8 @@ PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutS |
| break; |
| } |
| - case BasicShape::BasicShapeCircleType: { |
| - const BasicShapeCircle* circle = static_cast<const BasicShapeCircle*>(basicShape); |
| + case BasicShape::DeprecatedBasicShapeCircleType: { |
| + const DeprecatedBasicShapeCircle* circle = static_cast<const DeprecatedBasicShapeCircle*>(basicShape); |
| float centerX = floatValueForLength(circle->centerX(), boxWidth); |
| float centerY = floatValueForLength(circle->centerY(), boxHeight); |
| // This method of computing the radius is as defined in SVG |
| @@ -145,8 +145,14 @@ PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutS |
| break; |
| } |
| - case BasicShape::BasicShapeEllipseType: { |
| - const BasicShapeEllipse* ellipse = static_cast<const BasicShapeEllipse*>(basicShape); |
| + case BasicShape::BasicShapeCircleType: { |
| + // FIXME implement layout. bug 124619 |
|
bemjb
2013/12/07 00:05:32
This is the webkit bug number, Either remove the n
|
| + shape = createRectangleShape(FloatRect(0, 0, boxWidth, boxHeight), FloatSize(0, 0)); |
| + break; |
| + } |
| + |
| + case BasicShape::DeprecatedBasicShapeEllipseType: { |
| + const DeprecatedBasicShapeEllipse* ellipse = static_cast<const DeprecatedBasicShapeEllipse*>(basicShape); |
| float centerX = floatValueForLength(ellipse->centerX(), boxWidth); |
| float centerY = floatValueForLength(ellipse->centerY(), boxHeight); |
| float radiusX = floatValueForLength(ellipse->radiusX(), boxWidth); |
| @@ -158,6 +164,12 @@ PassOwnPtr<Shape> Shape::createShape(const BasicShape* basicShape, const LayoutS |
| break; |
| } |
| + case BasicShape::BasicShapeEllipseType: { |
| + // FIXME implement layout. bug 124619 |
|
bemjb
2013/12/07 00:05:32
Ditto.
|
| + shape = createRectangleShape(FloatRect(0, 0, boxWidth, boxHeight), FloatSize(0, 0)); |
| + break; |
| + } |
| + |
| case BasicShape::BasicShapePolygonType: { |
| const BasicShapePolygon* polygon = static_cast<const BasicShapePolygon*>(basicShape); |
| const Vector<Length>& values = polygon->values(); |