Commit 4acccd43 authored by rwlbuis@webkit.org's avatar rwlbuis@webkit.org

Fix build break after r160007.

* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160009 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2e854ac0
2013-12-03 Rob Buis <rob.buis@samsung.com>
Fix build break after r160007.
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
2013-12-03 Rob Buis <rob.buis@samsung.com>
[css shapes] layout for new ellipse syntax
......@@ -65,11 +65,10 @@ bool BasicShape::canBlend(const BasicShape* other) const
const BasicShapeEllipse* thisEllipse = static_cast<const BasicShapeEllipse*>(this);
const BasicShapeEllipse* otherEllipse = static_cast<const BasicShapeEllipse*>(other);
if (!thisEllipse->radiusX().canBlend(otherEllipse->radiusX())
|| !thisEllipse->radiusY().canBlend(otherEllipse->radiusY())
|| !thisEllipse->centerX().canBlend(otherEllipse->centerX())
|| !thisEllipse->centerY().canBlend(otherEllipse->centerY()))
return false;
return (thisEllipse->radiusX().canBlend(otherEllipse->radiusX())
&& thisEllipse->radiusY().canBlend(otherEllipse->radiusY())
&& thisEllipse->centerX().canBlend(otherEllipse->centerX())
&& thisEllipse->centerY().canBlend(otherEllipse->centerY()));
}
void BasicShapeRectangle::path(Path& path, const FloatRect& boundingBox)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment