Remove most remaining references to IntRect and FloatRect.

cc/scrollbar_layer_impl.cc

 // Copyright 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 "config.h"
 
 #include "cc/scrollbar_layer_impl.h"
 
 #include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/texture_draw_quad.h"
+#include "ui/gfx/rect_conversions.h"
 
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 
 namespace cc {
 
 scoped_ptr<ScrollbarLayerImpl> ScrollbarLayerImpl::create(int id)
 {
     return make_scoped_ptr(new ScrollbarLayerImpl(id));
 }
@@ skipping 42 matching lines @@
     scrollbar->getTickmarks(m_tickmarks);
 
     m_geometry->update(scrollbar);
 }
 
 static gfx::RectF toUVRect(const gfx::Rect& r, const gfx::Rect& bounds)
 {
     return gfx::ScaleRect(r, 1.0 / bounds.width(), 1.0 / bounds.height());
 }
 
-IntRect ScrollbarLayerImpl::scrollbarLayerRectToContentRect(const WebRect& layerRect) const
+gfx::Rect ScrollbarLayerImpl::scrollbarLayerRectToContentRect(const gfx::Rect& layerRect) const
 {
     // Don't intersect with the bounds as in layerRectToContentRect() because
     // layerRect here might be in coordinates of the containing layer.
-    FloatRect contentRect(layerRect.x, layerRect.y, layerRect.width, layerRect.height);
-    contentRect.scale(contentsScaleX(), contentsScaleY());
-    return enclosingIntRect(contentRect);
+    gfx::RectF contentRect = gfx::ScaleRect(layerRect, contentsScaleX(), contentsScaleY());
+    return gfx::ToEnclosingRect(contentRect);
 }
 
 void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
 {
     bool premultipledAlpha = false;
     bool flipped = false;
     gfx::RectF uvRect(0, 0, 1, 1);
     gfx::Rect boundsRect(gfx::Point(), bounds());
     gfx::Rect contentBoundsRect(gfx::Point(), contentBounds());
 
@@ skipping 110 matching lines @@
 {
     return m_owner->m_isCustomScrollbar;
 }
 
 const char* ScrollbarLayerImpl::layerTypeAsString() const
 {
     return "ScrollbarLayer";
 }
 
 }