Implement parsing of the new ellipse shape syntax.

Source/core/rendering/style/BasicShapes.h

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 29 matching lines @@
 
 class FloatRect;
 class Path;
 
 class BasicShape : public RefCounted<BasicShape> {
 public:
     virtual ~BasicShape() { }
 
     enum Type {
         BasicShapeRectangleType = 1,
-        BasicShapeCircleType = 2,
-        BasicShapeEllipseType = 3,
-        BasicShapePolygonType = 4,
-        BasicShapeInsetRectangleType = 5
+        DeprecatedBasicShapeCircleType = 2,
+        DeprecatedBasicShapeEllipseType = 3,
+        BasicShapeEllipseType = 4,
+        BasicShapePolygonType = 5,
+        BasicShapeInsetRectangleType = 6,
+        BasicShapeCircleType = 7

[bemjb, 2013/12/07 00:05:32]

Do you want to remove these explicit numbers in this patch?

     };
 
     bool canBlend(const BasicShape*) const;
 
     virtual void path(Path&, const FloatRect&) = 0;
     virtual WindRule windRule() const { return RULE_NONZERO; }
     virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const = 0;
 
     virtual Type type() const = 0;
 protected:
@@ skipping 34 matching lines @@
     BasicShapeRectangle() { }
 
     Length m_y;
     Length m_x;
     Length m_width;
     Length m_height;
     Length m_cornerRadiusX;
     Length m_cornerRadiusY;
 };
 
+class BasicShapeCenterCoordinate {
+public:
+    enum Keyword {
+        None,
+        Top,
+        Right,
+        Bottom,
+        Left
+    };
+    BasicShapeCenterCoordinate() : m_keyword(None), m_length(Undefined) { }
+    explicit BasicShapeCenterCoordinate(Length length) : m_keyword(None), m_length(length) { }
+    BasicShapeCenterCoordinate(Keyword keyword, Length length) : m_keyword(keyword), m_length(length) { }
+    BasicShapeCenterCoordinate(const BasicShapeCenterCoordinate& other) : m_keyword(other.keyword()), m_length(other.length()) { }
+
+    Keyword keyword() const { return m_keyword; }
+    const Length& length() const { return m_length; }
+
+    BasicShapeCenterCoordinate blend(const BasicShapeCenterCoordinate& other, double progress) const
+    {
+        if (m_keyword != None || other.keyword() != None)
+            return BasicShapeCenterCoordinate(other);
+
+        return BasicShapeCenterCoordinate(m_length.blend(other.length(), progress, ValueRangeAll));
+    }
+
+private:
+    Keyword m_keyword;
+    Length m_length;
+};
+
+class BasicShapeRadius {
+public:
+    enum Type {
+        Value,
+        ClosestSide,
+        FarthestSide
+    };
+    BasicShapeRadius() : m_value(Undefined), m_type(ClosestSide) { }
+    explicit BasicShapeRadius(Length v) : m_value(v), m_type(Value) { }
+    explicit BasicShapeRadius(Type t) : m_value(Undefined), m_type(t) { }
+    BasicShapeRadius(const BasicShapeRadius& other) : m_value(other.value()), m_type(other.type()) { }
+
+    const Length& value() const { return m_value; }
+    Type type() const { return m_type; }
+
+    BasicShapeRadius blend(const BasicShapeRadius& other, double progress) const
+    {
+        if (m_type != Value || other.type() != Value)
+            return BasicShapeRadius(other);
+
+        return BasicShapeRadius(m_value.blend(other.value(), progress, ValueRangeAll));
+    }
+
+private:
+    Length m_value;
+    Type m_type;
+
+};
+
 class BasicShapeCircle : public BasicShape {
 public:
     static PassRefPtr<BasicShapeCircle> create() { return adoptRef(new BasicShapeCircle); }
 
+    const BasicShapeCenterCoordinate& centerX() const { return m_centerX; }
+    const BasicShapeCenterCoordinate& centerY() const { return m_centerY; }
+    const BasicShapeRadius& radius() const { return m_radius; }
+
+    void setCenterX(BasicShapeCenterCoordinate centerX) { m_centerX = centerX; }
+    void setCenterY(BasicShapeCenterCoordinate centerY) { m_centerY = centerY; }
+    void setRadius(BasicShapeRadius radius) { m_radius = radius; }
+
+    virtual void path(Path&, const FloatRect&) OVERRIDE;
+    virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const OVERRIDE;
+
+    virtual Type type() const { return BasicShapeCircleType; }
+private:
+    BasicShapeCircle() { }
+
+    BasicShapeCenterCoordinate m_centerX;
+    BasicShapeCenterCoordinate m_centerY;
+    BasicShapeRadius m_radius;
+};
+
+class DeprecatedBasicShapeCircle : public BasicShape {
+public:
+    static PassRefPtr<DeprecatedBasicShapeCircle> create() { return adoptRef(new DeprecatedBasicShapeCircle); }
+
     Length centerX() const { return m_centerX; }
     Length centerY() const { return m_centerY; }
     Length radius() const { return m_radius; }
 
     void setCenterX(Length centerX) { m_centerX = centerX; }
     void setCenterY(Length centerY) { m_centerY = centerY; }
     void setRadius(Length radius) { m_radius = radius; }
 
     virtual void path(Path&, const FloatRect&) OVERRIDE;
     virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const OVERRIDE;
 
-    virtual Type type() const { return BasicShapeCircleType; }
+    virtual Type type() const { return DeprecatedBasicShapeCircleType; }
 private:
-    BasicShapeCircle() { }
+    DeprecatedBasicShapeCircle() { }
 
     Length m_centerX;
     Length m_centerY;
     Length m_radius;
 };
 
 class BasicShapeEllipse : public BasicShape {
 public:
     static PassRefPtr<BasicShapeEllipse> create() { return adoptRef(new BasicShapeEllipse); }
 
+    const BasicShapeCenterCoordinate& centerX() const { return m_centerX; }
+    const BasicShapeCenterCoordinate& centerY() const { return m_centerY; }
+    const BasicShapeRadius& radiusX() const { return m_radiusX; }
+    const BasicShapeRadius& radiusY() const { return m_radiusY; }
+
+    void setCenterX(BasicShapeCenterCoordinate centerX) { m_centerX = centerX; }
+    void setCenterY(BasicShapeCenterCoordinate centerY) { m_centerY = centerY; }
+    void setRadiusX(BasicShapeRadius radiusX) { m_radiusX = radiusX; }
+    void setRadiusY(BasicShapeRadius radiusY) { m_radiusY = radiusY; }
+
+    virtual void path(Path&, const FloatRect&) OVERRIDE;
+    virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const OVERRIDE;
+
+    virtual Type type() const { return BasicShapeEllipseType; }
+private:
+    BasicShapeEllipse() { }
+
+    BasicShapeCenterCoordinate m_centerX;
+    BasicShapeCenterCoordinate m_centerY;
+    BasicShapeRadius m_radiusX;
+    BasicShapeRadius m_radiusY;
+};
+
+class DeprecatedBasicShapeEllipse : public BasicShape {
+public:
+    static PassRefPtr<DeprecatedBasicShapeEllipse> create() { return adoptRef(new DeprecatedBasicShapeEllipse); }
+
     Length centerX() const { return m_centerX; }
     Length centerY() const { return m_centerY; }
     Length radiusX() const { return m_radiusX; }
     Length radiusY() const { return m_radiusY; }
 
     void setCenterX(Length centerX) { m_centerX = centerX; }
     void setCenterY(Length centerY) { m_centerY = centerY; }
     void setRadiusX(Length radiusX) { m_radiusX = radiusX; }
     void setRadiusY(Length radiusY) { m_radiusY = radiusY; }
 
     virtual void path(Path&, const FloatRect&) OVERRIDE;
     virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const OVERRIDE;
 
-    virtual Type type() const { return BasicShapeEllipseType; }
+    virtual Type type() const { return DeprecatedBasicShapeEllipseType; }
 private:
-    BasicShapeEllipse() { }
+    DeprecatedBasicShapeEllipse() { }
 
     Length m_centerX;
     Length m_centerY;
     Length m_radiusX;
     Length m_radiusY;
 };
 
 class BasicShapePolygon : public BasicShape {
 public:
     static PassRefPtr<BasicShapePolygon> create() { return adoptRef(new BasicShapePolygon); }
@@ skipping 55 matching lines @@
 
     Length m_right;
     Length m_top;
     Length m_bottom;
     Length m_left;
     Length m_cornerRadiusX;
     Length m_cornerRadiusY;
 };
 }
 #endif