Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6392)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 8405002: ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: save some vertical space, interactive_ui_tests are fixed by Peter's fix Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/wrench_menu.cc
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index ec77ab0acba105b13d55d42aa51d01e0f08becad..e3fbcfa0ffa45b5822ff5f6d77dde9bc96573937 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -143,46 +143,49 @@ class MenuButtonBackground : public views::Background {
int h = view->height();
switch (TypeAdjustedForRTL()) {
case LEFT_BUTTON:
- canvas->FillRectInt(background_color(state), 1, 1, w, h - 2);
- canvas->FillRectInt(border_color(state), 2, 0, w, 1);
- canvas->FillRectInt(border_color(state), 1, 1, 1, 1);
- canvas->FillRectInt(border_color(state), 0, 2, 1, h - 4);
- canvas->FillRectInt(border_color(state), 1, h - 2, 1, 1);
- canvas->FillRectInt(border_color(state), 2, h - 1, w, 1);
+ canvas->FillRect(background_color(state), gfx::Rect(1, 1, w, h - 2));
+ canvas->FillRect(border_color(state), gfx::Rect(2, 0, w, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(1, 1, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(0, 2, 1, h - 4));
+ canvas->FillRect(border_color(state), gfx::Rect(1, h - 2, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(2, h - 1, w, 1));
break;
case CENTER_BUTTON: {
- canvas->FillRectInt(background_color(state), 1, 1, w - 2, h - 2);
+ canvas->FillRect(background_color(state),
+ gfx::Rect(1, 1, w - 2, h - 2));
SkColor left_color = state != CustomButton::BS_NORMAL ?
border_color(state) : border_color(left_button_->state());
- canvas->FillRectInt(left_color, 0, 0, 1, h);
- canvas->FillRectInt(border_color(state), 1, 0, w - 2, 1);
- canvas->FillRectInt(border_color(state), 1, h - 1, w - 2, 1);
+ canvas->FillRect(left_color, gfx::Rect(0, 0, 1, h));
+ canvas->FillRect(border_color(state), gfx::Rect(1, 0, w - 2, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(1, h - 1, w - 2, 1));
SkColor right_color = state != CustomButton::BS_NORMAL ?
border_color(state) : border_color(right_button_->state());
- canvas->FillRectInt(right_color, w - 1, 0, 1, h);
+ canvas->FillRect(right_color, gfx::Rect(w - 1, 0, 1, h));
break;
}
case RIGHT_BUTTON:
- canvas->FillRectInt(background_color(state), 0, 1, w - 1, h - 2);
- canvas->FillRectInt(border_color(state), 0, 0, w - 2, 1);
- canvas->FillRectInt(border_color(state), w - 2, 1, 1, 1);
- canvas->FillRectInt(border_color(state), w - 1, 2, 1, h - 4);
- canvas->FillRectInt(border_color(state), w - 2, h - 2, 1, 1);
- canvas->FillRectInt(border_color(state), 0, h - 1, w - 2, 1);
+ canvas->FillRect(background_color(state),
+ gfx::Rect(0, 1, w - 1, h - 2));
+ canvas->FillRect(border_color(state), gfx::Rect(0, 0, w - 2, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 2, 1, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 1, 2, 1, h - 4));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 2, h - 2, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(0, h - 1, w - 2, 1));
break;
case SINGLE_BUTTON:
- canvas->FillRectInt(background_color(state), 1, 1, w - 2, h - 2);
- canvas->FillRectInt(border_color(state), 2, 0, w - 4, 1);
- canvas->FillRectInt(border_color(state), 1, 1, 1, 1);
- canvas->FillRectInt(border_color(state), 0, 2, 1, h - 4);
- canvas->FillRectInt(border_color(state), 1, h - 2, 1, 1);
- canvas->FillRectInt(border_color(state), 2, h - 1, w - 4, 1);
- canvas->FillRectInt(border_color(state), w - 2, 1, 1, 1);
- canvas->FillRectInt(border_color(state), w - 1, 2, 1, h - 4);
- canvas->FillRectInt(border_color(state), w - 2, h - 2, 1, 1);
+ canvas->FillRect(background_color(state),
+ gfx::Rect(1, 1, w - 2, h - 2));
+ canvas->FillRect(border_color(state), gfx::Rect(2, 0, w - 4, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(1, 1, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(0, 2, 1, h - 4));
+ canvas->FillRect(border_color(state), gfx::Rect(1, h - 2, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(2, h - 1, w - 4, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 2, 1, 1, 1));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 1, 2, 1, h - 4));
+ canvas->FillRect(border_color(state), gfx::Rect(w - 2, h - 2, 1, 1));
break;
default:
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698