diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 01:47:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 01:47:36 +0000 |
| commit | 79ea54a64c38656426bea2b9199d51911b27cf2a (patch) | |
| tree | ae09c3ed69981e4b3739f81d7187e3d2810bb451 /views | |
| parent | d1a5e6c399b1176bb3295402b617b2517d9558cb (diff) | |
| download | chromium_src-79ea54a64c38656426bea2b9199d51911b27cf2a.zip chromium_src-79ea54a64c38656426bea2b9199d51911b27cf2a.tar.gz chromium_src-79ea54a64c38656426bea2b9199d51911b27cf2a.tar.bz2 | |
ui/gfx: Convert Canvas::ClipRectInt() to use gfx::Rect.
BUG=100898
R=pkasting@chromium.org
Review URL: http://codereview.chromium.org/8383028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/combobox/native_combobox_views.cc | 5 | ||||
| -rw-r--r-- | views/view.cc | 6 | ||||
| -rw-r--r-- | views/widget/native_widget_win.cc | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc index 44c6838..5a1176e 100644 --- a/views/controls/combobox/native_combobox_views.cc +++ b/views/controls/combobox/native_combobox_views.cc @@ -302,8 +302,7 @@ void NativeComboboxViews::PaintText(gfx::Canvas* canvas) { gfx::Insets insets = GetInsets(); canvas->Save(); - canvas->ClipRectInt(insets.left(), insets.top(), - width() - insets.width(), height() - insets.height()); + canvas->ClipRectInt(GetContentsBounds()); int x = insets.left(); int y = insets.top(); @@ -315,7 +314,7 @@ void NativeComboboxViews::PaintText(gfx::Canvas* canvas) { index = 0; string16 text = combobox_->model()->GetItemAt(index); - const gfx::Font &font = GetFont(); + const gfx::Font& font = GetFont(); int width = font.GetStringWidth(text); canvas->DrawStringInt(text, font, text_color, x, y, width, text_height); diff --git a/views/view.cc b/views/view.cc index 2d4a60d..1464067 100644 --- a/views/view.cc +++ b/views/view.cc @@ -677,9 +677,9 @@ void View::Paint(gfx::Canvas* canvas) { // Note that the X (or left) position we pass to ClipRectInt takes into // consideration whether or not the view uses a right-to-left layout so that // we paint our view in its mirrored position if need be. - if (!canvas->ClipRectInt(GetMirroredX(), y(), - width() - static_cast<int>(clip_x_), - height() - static_cast<int>(clip_y_))) { + if (!canvas->ClipRectInt(gfx::Rect(GetMirroredX(), y(), + width() - static_cast<int>(clip_x_), + height() - static_cast<int>(clip_y_)))) { return; } // Non-empty clip, translate the graphics such that 0,0 corresponds to diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc index 60dae84..b6f1a3f 100644 --- a/views/widget/native_widget_win.cc +++ b/views/widget/native_widget_win.cc @@ -2322,10 +2322,7 @@ void NativeWidgetWin::RedrawLayeredWindowContents() { // We need to clip to the dirty rect ourselves. layered_window_contents_->sk_canvas()->save(SkCanvas::kClip_SaveFlag); - layered_window_contents_->ClipRectInt(invalid_rect_.x(), - invalid_rect_.y(), - invalid_rect_.width(), - invalid_rect_.height()); + layered_window_contents_->ClipRectInt(invalid_rect_); GetWidget()->GetRootView()->Paint(layered_window_contents_.get()); layered_window_contents_->sk_canvas()->restore(); |