ui/gfx: Convert Canvas::DrawFocusRect() to use gfx::Rect.

BUG=100898
R=pkasting@chromium.org

Review URL: http://codereview.chromium.org/8359029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107050 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 29 insertions, 30 deletions

diff --git a/chrome/browser/chromeos/drop_shadow_label.cc b/chrome/browser/chromeos/drop_shadow_label.cc
index 5be5e93..8ea602c 100644
--- a/chrome/browser/chromeos/drop_shadow_label.cc
+++ b/chrome/browser/chromeos/drop_shadow_label.cc
@@ -54,8 +54,7 @@ void DropShadowLabel::PaintText(gfx::Canvas* canvas,
     gfx::Rect focus_bounds = text_bounds;
     focus_bounds.Inset(-Label::kFocusBorderPadding,
                        -Label::kFocusBorderPadding);
-    canvas->DrawFocusRect(focus_bounds.x(), focus_bounds.y(),
-                          focus_bounds.width(), focus_bounds.height());
+    canvas->DrawFocusRect(focus_bounds);
   }
 }
 
diff --git a/chrome/browser/chromeos/views/dropdown_button.cc b/chrome/browser/chromeos/views/dropdown_button.cc
index f29e0c3..1019484 100644
--- a/chrome/browser/chromeos/views/dropdown_button.cc
+++ b/chrome/browser/chromeos/views/dropdown_button.cc
@@ -71,10 +71,11 @@ DropDownButton::~DropDownButton() {
 }
 
 void DropDownButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (IsFocusable() || IsAccessibilityFocusableInRootView()))
-    canvas->DrawFocusRect(kFocusFrameLeftOffset, kFocusFrameTopOffset,
-                          width() - kFocusFrameRightOffset,
-                          height() - kFocusFrameBottomOffset);
+  if (HasFocus() && (IsFocusable() || IsAccessibilityFocusableInRootView())) {
+    canvas->DrawFocusRect(gfx::Rect(kFocusFrameLeftOffset, kFocusFrameTopOffset,
+                                    width() - kFocusFrameRightOffset,
+                                    height() - kFocusFrameBottomOffset));
+  }
 }
 
 void DropDownButton::SetText(const string16& text) {
diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc
index 148776b..8044192 100644
--- a/chrome/browser/ui/views/download/download_shelf_view.cc
+++ b/chrome/browser/ui/views/download/download_shelf_view.cc
@@ -163,7 +163,8 @@ void DownloadShelfView::OnPaint(gfx::Canvas* canvas) {
   for (size_t i = 0; i < download_views_.size(); ++i) {
     if (download_views_[i]->HasFocus()) {
       gfx::Rect r = GetFocusRectBounds(download_views_[i]);
-      canvas->DrawFocusRect(r.x(), r.y(), r.width(), r.height() - 1);
+      r.Inset(0, 0, 0, 1);
+      canvas->DrawFocusRect(r);
       break;
     }
   }
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index aefe220..993e9ac 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -755,10 +755,11 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   if (show_focus_rect_ && HasFocus()) {
     gfx::Rect r = location_entry_view_->bounds();
 #if defined(OS_WIN)
-    canvas->DrawFocusRect(r.x() - 1, r.y() - 1, r.width() + 2, r.height() + 2);
+    r.Inset(-1,  -1);
 #else
-    canvas->DrawFocusRect(r.x() - 1, r.y(), r.width() + 2, r.height());
+    r.Inset(-1, 0);
 #endif
+    canvas->DrawFocusRect(r);
   }
 }
 
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_view.cc b/chrome/browser/ui/views/tabs/dragged_tab_view.cc
index 995a061..ce196a5 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_view.cc
@@ -183,9 +183,10 @@ void DraggedTabView::PaintDetachedView(gfx::Canvas* canvas) {
 
 void DraggedTabView::PaintFocusRect(gfx::Canvas* canvas) {
   gfx::Size ps = GetPreferredSize();
-  canvas->DrawFocusRect(0, 0,
-                        static_cast<int>(ps.width() * kScalingFactor),
-                        static_cast<int>(ps.height() * kScalingFactor));
+  canvas->DrawFocusRect(
+      gfx::Rect(0, 0,
+                static_cast<int>(ps.width() * kScalingFactor),
+                static_cast<int>(ps.height() * kScalingFactor)));
 }
 
 gfx::Size DraggedTabView::PreferredContainerSize() {
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 38ad3ac..221c11c 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -205,7 +205,7 @@ class UI_EXPORT Canvas {
                              int flags) = 0;
 
   // Draws a dotted gray rectangle used for focus purposes.
-  virtual void DrawFocusRect(int x, int y, int width, int height) = 0;
+  virtual void DrawFocusRect(const gfx::Rect& rect) = 0;
 
   // Tiles the image in the specified region.
   virtual void TileImageInt(const SkBitmap& bitmap,
diff --git a/ui/gfx/canvas_direct2d.cc b/ui/gfx/canvas_direct2d.cc
index e58f94c..53cd6a1 100644
--- a/ui/gfx/canvas_direct2d.cc
+++ b/ui/gfx/canvas_direct2d.cc
@@ -308,7 +308,7 @@ void CanvasDirect2D::DrawStringInt(const string16& text,
   NOTIMPLEMENTED();
 }
 
-void CanvasDirect2D::DrawFocusRect(int x, int y, int width, int height) {
+void CanvasDirect2D::DrawFocusRect(const gfx::Rect& rect) {
   NOTIMPLEMENTED();
 }
 
diff --git a/ui/gfx/canvas_direct2d.h b/ui/gfx/canvas_direct2d.h
index 35f9713..82710e9 100644
--- a/ui/gfx/canvas_direct2d.h
+++ b/ui/gfx/canvas_direct2d.h
@@ -70,7 +70,7 @@ class UI_EXPORT CanvasDirect2D : public Canvas {
                              const SkColor& color,
                              int x, int y, int w, int h,
                              int flags);
-  virtual void DrawFocusRect(int x, int y, int width, int height);
+  virtual void DrawFocusRect(const gfx::Rect& rect);
   virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
   virtual void TileImageInt(const SkBitmap& bitmap,
                             int src_x, int src_y,
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index c93dd09..4e481ef 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -181,7 +181,7 @@ void CanvasSkia::DrawLineInt(const SkColor& color,
                     SkIntToScalar(y2), paint);
 }
 
-void CanvasSkia::DrawFocusRect(int x, int y, int width, int height) {
+void CanvasSkia::DrawFocusRect(const gfx::Rect& rect) {
   // Create a 2D bitmap containing alternating on/off pixels - we do this
   // so that you never get two pixels of the same color around the edges
   // of the focus rect (this may mean that opposing edges of the rect may
@@ -206,8 +206,6 @@ void CanvasSkia::DrawFocusRect(int x, int y, int width, int height) {
     }
   }
 
-  // First the horizontal lines.
-
   // Make a shader for the bitmap with an origin of the box we'll draw. This
   // shader is refcounted and will have an initial refcount of 1.
   SkShader* shader = SkShader::CreateBitmapShader(
@@ -219,10 +217,10 @@ void CanvasSkia::DrawFocusRect(int x, int y, int width, int height) {
   paint.setShader(shader);
   shader->unref();
 
-  DrawRectInt(x, y, width, 1, paint);
-  DrawRectInt(x, y + height - 1, width, 1, paint);
-  DrawRectInt(x, y, 1, height, paint);
-  DrawRectInt(x + width - 1, y, 1, height, paint);
+  DrawRectInt(rect.x(), rect.y(), rect.width(), 1, paint);
+  DrawRectInt(rect.x(), rect.y() + rect.height() - 1, rect.width(), 1, paint);
+  DrawRectInt(rect.x(), rect.y(), 1, rect.height(), paint);
+  DrawRectInt(rect.x() + rect.width() - 1, rect.y(), 1, rect.height(), paint);
 }
 
 void CanvasSkia::DrawBitmapInt(const SkBitmap& bitmap, int x, int y) {
diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h
index b315af9..aa9ebe2 100644
--- a/ui/gfx/canvas_skia.h
+++ b/ui/gfx/canvas_skia.h
@@ -152,7 +152,7 @@ class UI_EXPORT CanvasSkia : public Canvas {
       const SkColor& color,
       const gfx::Rect& display_rect);
 #endif
-  virtual void DrawFocusRect(int x, int y, int width, int height);
+  virtual void DrawFocusRect(const gfx::Rect& rect);
   virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
   virtual void TileImageInt(const SkBitmap& bitmap,
                             int src_x, int src_y,
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index b60e802..da2b04c 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -66,8 +66,7 @@ void Checkbox::OnPaintFocusBorder(gfx::Canvas* canvas) {
     // Increate the bounding box by one on each side so that that focus border
     // does not draw on top of the letters.
     bounds.Inset(-1, -1, -1, -1);
-    canvas->DrawFocusRect(bounds.x(), bounds.y(), bounds.width(),
-                          bounds.height());
+    canvas->DrawFocusRect(bounds);
   }
 }
 
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 755196a..b9c7bcce 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -830,7 +830,7 @@ void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
     gfx::Rect rect(GetLocalBounds());
     rect.Inset(3, 3);
-    canvas->DrawFocusRect(rect.x(), rect.y(), rect.width(), rect.height());
+    canvas->DrawFocusRect(rect);
   }
 #else
   TextButton::OnPaintFocusBorder(canvas);
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 33fbcd4..16248d9 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -275,8 +275,7 @@ void Label::PaintText(gfx::Canvas* canvas,
   if (HasFocus() || paint_as_focused_) {
     gfx::Rect focus_bounds = text_bounds;
     focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
-    canvas->DrawFocusRect(focus_bounds.x(), focus_bounds.y(),
-                          focus_bounds.width(), focus_bounds.height());
+    canvas->DrawFocusRect(focus_bounds);
   }
 }
 
diff --git a/views/view.cc b/views/view.cc
index e4ffbe8..2d4a60d 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -299,7 +299,7 @@ gfx::Rect View::GetContentsBounds() const {
 }
 
 gfx::Rect View::GetLocalBounds() const {
-  return gfx::Rect(0, 0, width(), height());
+  return gfx::Rect(gfx::Point(), size());
 }
 
 gfx::Insets View::GetInsets() const {
@@ -1079,7 +1079,7 @@ void View::OnPaintBorder(gfx::Canvas* canvas) {
 
 void View::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus())
-    canvas->DrawFocusRect(0, 0, width(), height());
+    canvas->DrawFocusRect(GetLocalBounds());
 }
 
 // Accelerated Painting --------------------------------------------------------