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

views/controls/combobox/native_combobox_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 284 matching lines @@
   path.lineTo(SkIntToScalar(tip_x - shift_x), SkIntToScalar(tip_y + shift_y));
   path.close();
   canvas->GetSkCanvas()->drawPath(path, paint);
 }
 
 
 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();
   int text_height = height() - insets.height();
   SkColor text_color = kTextColor;
 
   int index = GetSelectedItem();
   if (index < 0 || index > combobox_->model()->GetItemCount())
     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);
 
   // draw the double arrow
   gfx::Rect lb = GetLocalBounds();
   DrawArrow(canvas,
       lb.width() - (kComboboxArrowSize / 2) - kComboboxArrowOffset,
       lb.height() / 2 - kComboboxArrowSize,
       kComboboxArrowSize / 2,
@@ skipping 49 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views