summaryrefslogtreecommitdiffstats
path: root/ui/views/touchui
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:12:08 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 20:12:08 +0000
commit6fae79736f73e541b0ec3951adb1c4f83ba7428e (patch)
tree7c1ec5d8037e86e59812b907a74209967b292256 /ui/views/touchui
parent9134cce6dc08d7e5962c228ecc1c5a1244e233ae (diff)
downloadchromium_src-6fae79736f73e541b0ec3951adb1c4f83ba7428e.zip
chromium_src-6fae79736f73e541b0ec3951adb1c4f83ba7428e.tar.gz
chromium_src-6fae79736f73e541b0ec3951adb1c4f83ba7428e.tar.bz2
Replaced sk_canvas()->drawPath() with DrawPath()
Replaced sk_canvas()->drawColor() with DrawColor() Removed any instances of #include "third_party/skia/include/core/SkCanvas.h" Replaced DrawPath in touch_selection_controller_impl with DrawCircle call manually Bug=114665 Test=Compiles Review URL: http://codereview.chromium.org/10025011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/touchui')
-rw-r--r--ui/views/touchui/touch_selection_controller_impl.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 0bc9231..b5d5d2d 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -70,14 +70,7 @@ void PaintCircle(const Circle& circle, gfx::Canvas* canvas) {
paint.setAntiAlias(true);
paint.setStyle(SkPaint::kFill_Style);
paint.setColor(circle.color);
- SkPath path;
- gfx::Rect bounds(circle.center.x() - circle.radius,
- circle.center.y() - circle.radius,
- circle.radius * 2,
- circle.radius * 2);
- SkScalar radius = SkIntToScalar(circle.radius);
- path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
- canvas->sk_canvas()->drawPath(path, paint);
+ canvas->DrawCircle(circle.center, circle.radius, paint);
}
// The points may not match exactly, since the selection range computation may
@@ -274,7 +267,7 @@ class TouchSelectionControllerImpl::TouchContextMenuView
canvas->DrawRect(GetLocalBounds(), paint);
#else
- canvas->sk_canvas()->drawColor(SkColorSetRGB(210, 225, 246),
+ canvas->DrawColor(SkColorSetRGB(210, 225, 246),
SkXfermode::kSrc_Mode);
#endif
}