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

chrome/browser/ui/views/tabs/base_tab.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 "chrome/browser/ui/views/tabs/base_tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 70 matching lines @@
                     int image_offset,
                     int icon_width,
                     int icon_height,
                     const gfx::Rect& bounds,
                     bool filter) {
   // Center the image within bounds.
   int dst_x = bounds.x() - (icon_width - bounds.width()) / 2;
   int dst_y = bounds.y() - (icon_height - bounds.height()) / 2;
   // NOTE: the clipping is a work around for 69528, it shouldn't be necessary.
   canvas->Save();
-  canvas->ClipRectInt(dst_x, dst_y, icon_width, icon_height);
+  canvas->ClipRectInt(gfx::Rect(dst_x, dst_y, icon_width, icon_height));
   canvas->DrawBitmapInt(image,
                         image_offset, 0, icon_width, icon_height,
                         dst_x, dst_y, icon_width, icon_height,
                         filter);
   canvas->Restore();
 }
 
 }  // namespace
 
 // static
@@ skipping 335 matching lines @@
     SkBitmap frames(*tp->GetBitmapNamed(
         (data().network_state == TabRendererData::NETWORK_STATE_WAITING) ?
         IDR_THROBBER_WAITING : IDR_THROBBER));
 
     int icon_size = frames.height();
     int image_offset = loading_animation_frame_ * icon_size;
     DrawIconCenter(canvas, frames, image_offset,
                    icon_size, icon_size, bounds, false);
   } else {
     canvas->Save();
-    canvas->ClipRectInt(0, 0, width(), height());
+    canvas->ClipRectInt(gfx::Rect(0, 0, width(), height()));

[Peter Kasting, 2011/10/25 20:24:47]

Nit: I think you can pass GetLocalBounds() here.

[tfarina, 2011/10/25 23:52:41]

Done.

     if (should_display_crashed_favicon_) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       SkBitmap crashed_favicon(*rb.GetBitmapNamed(IDR_SAD_FAVICON));
       bounds.set_y(bounds.y() + favicon_hiding_offset_);
       DrawIconCenter(canvas, crashed_favicon, 0,
                      crashed_favicon.width(),
                      crashed_favicon.height(), bounds, true);
     } else {
       if (!data().favicon.isNull()) {
         // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
@@ skipping 113 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }