Modified: trunk/Source/WebCore/platform/graphics/Path.cpp (87954 => 87955)
--- trunk/Source/WebCore/platform/graphics/Path.cpp 2011-06-02 21:41:42 UTC (rev 87954)
+++ trunk/Source/WebCore/platform/graphics/Path.cpp 2011-06-02 21:43:40 UTC (rev 87955)
@@ -35,9 +35,6 @@
#include <math.h>
#include <wtf/MathExtras.h>
-// Approximation of control point positions on a bezier to simulate a quarter of a circle.
-static const float gCircleControlPoint = 0.448f;
-
namespace WebCore {
#if !PLATFORM(OPENVG) && !PLATFORM(QT)
@@ -95,6 +92,11 @@
}
#endif
+void Path::addRoundedRect(const RoundedIntRect& r)
+{
+ addRoundedRect(r.rect(), r.radii().topLeft(), r.radii().topRight(), r.radii().bottomLeft(), r.radii().bottomRight());
+}
+
void Path::addRoundedRect(const FloatRect& rect, const FloatSize& roundingRadii)
{
if (rect.isEmpty())
@@ -113,29 +115,7 @@
if (radius.height() > halfSize.height())
radius.setHeight(halfSize.height());
- moveTo(FloatPoint(rect.x() + radius.width(), rect.y()));
-
- if (radius.width() < halfSize.width())
- addLineTo(FloatPoint(rect.x() + rect.width() - roundingRadii.width(), rect.y()));
-
- addBezierCurveTo(FloatPoint(rect.x() + rect.width() - radius.width() * gCircleControlPoint, rect.y()), FloatPoint(rect.x() + rect.width(), rect.y() + radius.height() * gCircleControlPoint), FloatPoint(rect.x() + rect.width(), rect.y() + radius.height()));
-
- if (radius.height() < halfSize.height())
- addLineTo(FloatPoint(rect.x() + rect.width(), rect.y() + rect.height() - radius.height()));
-
- addBezierCurveTo(FloatPoint(rect.x() + rect.width(), rect.y() + rect.height() - radius.height() * gCircleControlPoint), FloatPoint(rect.x() + rect.width() - radius.width() * gCircleControlPoint, rect.y() + rect.height()), FloatPoint(rect.x() + rect.width() - radius.width(), rect.y() + rect.height()));
-
- if (radius.width() < halfSize.width())
- addLineTo(FloatPoint(rect.x() + radius.width(), rect.y() + rect.height()));
-
- addBezierCurveTo(FloatPoint(rect.x() + radius.width() * gCircleControlPoint, rect.y() + rect.height()), FloatPoint(rect.x(), rect.y() + rect.height() - radius.height() * gCircleControlPoint), FloatPoint(rect.x(), rect.y() + rect.height() - radius.height()));
-
- if (radius.height() < halfSize.height())
- addLineTo(FloatPoint(rect.x(), rect.y() + radius.height()));
-
- addBezierCurveTo(FloatPoint(rect.x(), rect.y() + radius.height() * gCircleControlPoint), FloatPoint(rect.x() + radius.width() * gCircleControlPoint, rect.y()), FloatPoint(rect.x() + radius.width(), rect.y()));
-
- closeSubpath();
+ addBeziersForRoundedRect(rect, radius, radius, radius, radius);
}
void Path::addRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
@@ -152,20 +132,29 @@
return;
}
+ addBeziersForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
+}
+
+// Approximation of control point positions on a bezier to simulate a quarter of a circle.
+// This is 1-kappa, where kappa = 4 * (sqrt(2) - 1) / 3
+static const float gCircleControlPoint = 0.447715f;
+
+void Path::addBeziersForRoundedRect(const FloatRect& rect, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius)
+{
moveTo(FloatPoint(rect.x() + topLeftRadius.width(), rect.y()));
- addLineTo(FloatPoint(rect.x() + rect.width() - topRightRadius.width(), rect.y()));
- addBezierCurveTo(FloatPoint(rect.x() + rect.width() - topRightRadius.width() * gCircleControlPoint, rect.y()),
- FloatPoint(rect.x() + rect.width(), rect.y() + topRightRadius.height() * gCircleControlPoint),
- FloatPoint(rect.x() + rect.width(), rect.y() + topRightRadius.height()));
- addLineTo(FloatPoint(rect.x() + rect.width(), rect.y() + rect.height() - bottomRightRadius.height()));
- addBezierCurveTo(FloatPoint(rect.x() + rect.width(), rect.y() + rect.height() - bottomRightRadius.height() * gCircleControlPoint),
- FloatPoint(rect.x() + rect.width() - bottomRightRadius.width() * gCircleControlPoint, rect.y() + rect.height()),
- FloatPoint(rect.x() + rect.width() - bottomRightRadius.width(), rect.y() + rect.height()));
- addLineTo(FloatPoint(rect.x() + bottomLeftRadius.width(), rect.y() + rect.height()));
- addBezierCurveTo(FloatPoint(rect.x() + bottomLeftRadius.width() * gCircleControlPoint, rect.y() + rect.height()),
- FloatPoint(rect.x(), rect.y() + rect.height() - bottomLeftRadius.height() * gCircleControlPoint),
- FloatPoint(rect.x(), rect.y() + rect.height() - bottomLeftRadius.height()));
+ addLineTo(FloatPoint(rect.maxX() - topRightRadius.width(), rect.y()));
+ addBezierCurveTo(FloatPoint(rect.maxX() - topRightRadius.width() * gCircleControlPoint, rect.y()),
+ FloatPoint(rect.maxX(), rect.y() + topRightRadius.height() * gCircleControlPoint),
+ FloatPoint(rect.maxX(), rect.y() + topRightRadius.height()));
+ addLineTo(FloatPoint(rect.maxX(), rect.maxY() - bottomRightRadius.height()));
+ addBezierCurveTo(FloatPoint(rect.maxX(), rect.maxY() - bottomRightRadius.height() * gCircleControlPoint),
+ FloatPoint(rect.maxX() - bottomRightRadius.width() * gCircleControlPoint, rect.maxY()),
+ FloatPoint(rect.maxX() - bottomRightRadius.width(), rect.maxY()));
+ addLineTo(FloatPoint(rect.x() + bottomLeftRadius.width(), rect.maxY()));
+ addBezierCurveTo(FloatPoint(rect.x() + bottomLeftRadius.width() * gCircleControlPoint, rect.maxY()),
+ FloatPoint(rect.x(), rect.maxY() - bottomLeftRadius.height() * gCircleControlPoint),
+ FloatPoint(rect.x(), rect.maxY() - bottomLeftRadius.height()));
addLineTo(FloatPoint(rect.x(), rect.y() + topLeftRadius.height()));
addBezierCurveTo(FloatPoint(rect.x(), rect.y() + topLeftRadius.height() * gCircleControlPoint),
FloatPoint(rect.x() + topLeftRadius.width() * gCircleControlPoint, rect.y()),
@@ -174,9 +163,4 @@
closeSubpath();
}
-void Path::addRoundedRect(const RoundedIntRect& r)
-{
- addRoundedRect(r.rect(), r.radii().topLeft(), r.radii().topRight(), r.radii().bottomLeft(), r.radii().bottomRight());
}
-
-}
