| Index: ui/views/round_rect_painter.cc
|
| diff --git a/ui/views/round_rect_painter.cc b/ui/views/round_rect_painter.cc
|
| index 2492e924444d4e14880f391a6180d40f9ffada00..a8c77785246954bbc39d0ef983ee98dbc2bbf6e7 100644
|
| --- a/ui/views/round_rect_painter.cc
|
| +++ b/ui/views/round_rect_painter.cc
|
| @@ -10,10 +10,9 @@
|
|
|
| namespace views {
|
|
|
| -static const int kRadius = 2;
|
| -
|
| -RoundRectPainter::RoundRectPainter(SkColor border_color)
|
| - : border_color_(border_color) {
|
| +RoundRectPainter::RoundRectPainter(SkColor border_color, int corner_radius)
|
| + : border_color_(border_color),
|
| + corner_radius_(corner_radius) {
|
| }
|
|
|
| RoundRectPainter::~RoundRectPainter() {
|
| @@ -29,16 +28,17 @@ void RoundRectPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
|
| rect.Inset(0, 0, 1, 1);
|
| SkRect skia_rect = gfx::RectToSkRect(rect);
|
| skia_rect.offset(.5, .5);
|
| - canvas->sk_canvas()->drawRoundRect(skia_rect, SkIntToScalar(kRadius),
|
| - SkIntToScalar(kRadius), paint);
|
| + canvas->sk_canvas()->drawRoundRect(skia_rect, SkIntToScalar(corner_radius_),
|
| + SkIntToScalar(corner_radius_), paint);
|
| }
|
|
|
| // static
|
| void RoundRectPainter::CreateRoundRectPath(const gfx::Rect& bounds,
|
| - gfx::Path* path) {
|
| + gfx::Path* path,
|
| + int corner_radius) {
|
| SkRect rect = SkRect::MakeWH(SkIntToScalar(bounds.width()),
|
| SkIntToScalar(bounds.height()));
|
| - SkScalar radius = SkIntToScalar(kRadius);
|
| + SkScalar radius = SkIntToScalar(corner_radius);
|
| SkScalar radii[8] = {radius, radius, radius, radius,
|
| radius, radius, radius, radius};
|
| path->addRoundRect(rect, radii);
|
|
|