Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: Source/core/rendering/style/BasicShapes.h

Issue 115253003: Layout support for new circle shape syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add misisng test change for animations/interpolation/shape-outside.html Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/shapes/Shape.cpp ('k') | Source/core/rendering/style/BasicShapes.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..0e8a52c2a205e7824569ad53b21491c767cc798d 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
+ {
+ // FIXME determine how to interpolate between keywords. See bug 125108.
Bem Jones-Bey (adobe) 2013/12/19 23:08:48 You could merge in the interpolation patch to this
+ 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 bug 125108.
Bem Jones-Bey (adobe) 2013/12/19 23:08:48 Ditto.
+ 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; }
« no previous file with comments | « Source/core/rendering/shapes/Shape.cpp ('k') | Source/core/rendering/style/BasicShapes.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698