SkRect to gfx::Rect type conversions.

ui/views/controls/tree/tree_view_views.cc

 // Copyright (c) 2012 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 "ui/views/controls/tree/tree_view_views.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/native_theme/native_theme.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view_controller.h"
 
 using ui::TreeModel;
 using ui::TreeModelNode;
 
@@ skipping 481 matching lines @@
 }
 
 void TreeView::OnPaint(gfx::Canvas* canvas) {
   // Don't invoke View::OnPaint so that we can render our own focus border.
   OnPaintBackground(canvas);
 
   int min_y, max_y;
   {
     SkRect sk_clip_rect;
     if (canvas->sk_canvas()->getClipBounds(&sk_clip_rect)) {
-      gfx::Rect clip_rect = gfx::SkRectToRect(sk_clip_rect);
+      gfx::Rect clip_rect = gfx::ToFlooredRectDeprecated(
+          gfx::SkRectToRectF(sk_clip_rect));

[sky, 2012/11/01 16:10:24]

Why does this need to use RectF and then floor it? Same comment for
table_view_views.

[danakj, 2012/11/01 17:38:27]

This is trying to paint everything touched by the clip, so ToEnclosingRect
sounds right, to paint pixels that are party inside the clip.

[danakj, 2012/11/01 17:48:28]

The clip rect given by skia is a float rect, but we're using integer rects in
ui/ which is why there is conversion happening here. It used to be implicit, so
easily forgotten. SkRect is float, SkIRect is integers.

[danakj, 2012/11/01 17:50:18]

I guess my question is why we use getClipBounds() instead of
getClipDeviceBounds(), which would then give us pixel (integer) results. I am
curious if that was intentional.

       min_y = clip_rect.y();
       max_y = clip_rect.bottom();
     } else {
       gfx::Rect vis_bounds = GetVisibleBounds();
       min_y = vis_bounds.y();
       max_y = vis_bounds.bottom();
     }
   }
 
   int min_row = std::max(0, (min_y - kVerticalInset) / row_height_);
@@ skipping 371 matching lines @@
   if (!is_expanded_)
     return max_width;
   for (int i = 0; i < child_count(); ++i) {
     max_width = std::max(max_width,
                          GetChild(i)->GetMaxWidth(indent, depth + 1));
   }
   return max_width;
 }
 
 }  // namespace views