diff options
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/combobox/native_combobox_views.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_image_util.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc index 5a1176e..724da9e 100644 --- a/views/controls/combobox/native_combobox_views.cc +++ b/views/controls/combobox/native_combobox_views.cc @@ -302,7 +302,7 @@ void NativeComboboxViews::PaintText(gfx::Canvas* canvas) { gfx::Insets insets = GetInsets(); canvas->Save(); - canvas->ClipRectInt(GetContentsBounds()); + canvas->ClipRect(GetContentsBounds()); int x = insets.left(); int y = insets.top(); diff --git a/views/controls/menu/menu_image_util.cc b/views/controls/menu/menu_image_util.cc index e9b4b81..883ced58 100644 --- a/views/controls/menu/menu_image_util.cc +++ b/views/controls/menu/menu_image_util.cc @@ -9,6 +9,7 @@ #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/gfx/point.h" namespace { @@ -29,7 +30,7 @@ const SkColor kIndicatorStroke = SkColorSetRGB(0, 0, 0); SkBitmap* CreateRadioButtonImage(bool selected) { // + 2 (1px on each side) to cover rounding error. gfx::CanvasSkia canvas(kIndicatorSize + 2, kIndicatorSize + 2, false); - canvas.TranslateInt(1, 1); + canvas.Translate(gfx::Point(1, 1)); SkPoint gradient_points[3]; gradient_points[0].set(SkIntToScalar(0), SkIntToScalar(0)); |