Use gfx:: Geometry types for the resource provider and layer updater classes.

cc/scrollbar_layer.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.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 62 matching lines @@
     return this;
 }
 
 class ScrollbarBackgroundPainter : public LayerPainter {
 public:
     static scoped_ptr<ScrollbarBackgroundPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart)
     {
         return make_scoped_ptr(new ScrollbarBackgroundPainter(scrollbar, painter, geometry, trackPart));
     }
 
-    virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect&) OVERRIDE
+    virtual void paint(SkCanvas* skCanvas, const gfx::Rect& contentRect, gfx::RectF&) OVERRIDE
     {
         WebKit::WebCanvas* canvas = skCanvas;
         // The following is a simplification of ScrollbarThemeComposite::paint.
-        WebKit::WebRect contentWebRect(contentRect.x(), contentRect.y(), contentRect.width(), contentRect.height());
-        m_painter.paintScrollbarBackground(canvas, contentWebRect);
+        m_painter.paintScrollbarBackground(canvas, contentRect);
 
         if (m_geometry->hasButtons(m_scrollbar)) {
             WebRect backButtonStartPaintRect = m_geometry->backButtonStartRect(m_scrollbar);
             m_painter.paintBackButtonStart(canvas, backButtonStartPaintRect);
 
             WebRect backButtonEndPaintRect = m_geometry->backButtonEndRect(m_scrollbar);
             m_painter.paintBackButtonEnd(canvas, backButtonEndPaintRect);
 
             WebRect forwardButtonStartPaintRect = m_geometry->forwardButtonStartRect(m_scrollbar);
             m_painter.paintForwardButtonStart(canvas, forwardButtonStartPaintRect);
@@ skipping 42 matching lines @@
     return IntSize(lroundf(bounds().width() * contentsScale()), lroundf(bounds().height() * contentsScale()));
 }
 
 class ScrollbarThumbPainter : public LayerPainter {
 public:
     static scoped_ptr<ScrollbarThumbPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
     {
         return make_scoped_ptr(new ScrollbarThumbPainter(scrollbar, painter, geometry));
     }
 
-    virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect& opaque) OVERRIDE
+    virtual void paint(SkCanvas* skCanvas, const gfx::Rect& contentRect, gfx::RectF& opaque) OVERRIDE
     {
         WebKit::WebCanvas* canvas = skCanvas;
 
         // Consider the thumb to be at the origin when painting.
         WebRect thumbRect = m_geometry->thumbRect(m_scrollbar);
         thumbRect.x = 0;
         thumbRect.y = 0;
         m_painter.paintThumb(canvas, thumbRect);
     }
 
@@ skipping 57 matching lines @@
         return;
 
     // We should always have enough memory for UI.
     DCHECK(texture->texture()->canAcquireBackingTexture());
     if (!texture->texture()->canAcquireBackingTexture())
         return;
 
     // Paint and upload the entire part.
     float widthScale = static_cast<float>(contentBounds().width()) / bounds().width();
     float heightScale = static_cast<float>(contentBounds().height()) / bounds().height();
-    IntRect paintedOpaqueRect;
+    gfx::Rect paintedOpaqueRect;
     painter->prepareToUpdate(rect, rect.size(), widthScale, heightScale, paintedOpaqueRect, stats);
     if (!painter->pixelsDidChange() && texture->texture()->haveBackingTexture()) {
         TRACE_EVENT_INSTANT0("cc","ScrollbarLayer::updatePart no texture upload needed");
         return;
     }
 
-    IntSize destOffset(0, 0);
+    gfx::Vector2d destOffset(0, 0);
     texture->update(queue, rect, destOffset, false, stats);
 }
 
 
 void ScrollbarLayer::setTexturePriorities(const PriorityCalculator&)
 {
     if (contentBounds().isEmpty())
         return;
 
     createUpdaterIfNeeded();
@@ skipping 28 matching lines @@
         updatePart(m_foreTrackUpdater.get(), m_foreTrack.get(), contentRect, queue, stats);
 
     // Consider the thumb to be at the origin when painting.
     WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
     IntRect originThumbRect = layerRectToContentRect(WebKit::WebRect(0, 0, thumbRect.width, thumbRect.height));
     if (!originThumbRect.isEmpty())
         updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
 }
 
 }