Index: Source/core/rendering/style/BasicShapes.h |
diff --git a/Source/core/rendering/style/BasicShapes.h b/Source/core/rendering/style/BasicShapes.h |
index 109f8fee9eabf031ac28a01524d597913ebef260..10e4f9e49f0dea15ea10c49fee0b29e43a77ea2f 100644 |
--- a/Source/core/rendering/style/BasicShapes.h |
+++ b/Source/core/rendering/style/BasicShapes.h |
@@ -141,6 +141,12 @@ public: |
Keyword keyword() const { return m_keyword; } |
const Length& length() const { return m_length; } |
+ bool canBlend(const BasicShapeCenterCoordinate& other) const |
leviw_travelin_and_unemployed
2014/01/07 19:41:34
I do love how much this makes me think of willitbl
|
+ { |
+ // FIXME determine how to interpolate between keywords. See issue 330248. |
+ return m_keyword == None && other.keyword() == None; |
+ } |
+ |
BasicShapeCenterCoordinate blend(const BasicShapeCenterCoordinate& other, double progress) const |
{ |
if (m_keyword != None || other.keyword() != None) |
@@ -170,6 +176,12 @@ public: |
const Length& value() const { return m_value; } |
Type type() const { return m_type; } |
+ bool canBlend(const BasicShapeRadius& other) const |
+ { |
+ // FIXME determine how to interpolate between keywords. See issue 330248. |
+ return m_type == Value && other.type() == Value; |
+ } |
+ |
BasicShapeRadius blend(const BasicShapeRadius& other, double progress) const |
{ |
if (m_type != Value || other.type() != Value) |
@@ -192,6 +204,7 @@ public: |
const BasicShapeCenterCoordinate& centerY() const { return m_centerY; } |
const BasicShapeRadius& radius() const { return m_radius; } |
+ float floatValueForRadiusInBox(float boxWidth, float boxHeight) const; |
void setCenterX(BasicShapeCenterCoordinate centerX) { m_centerX = centerX; } |
void setCenterY(BasicShapeCenterCoordinate centerY) { m_centerY = centerY; } |
void setRadius(BasicShapeRadius radius) { m_radius = radius; } |