Remove most remaining references to IntRect and FloatRect.

cc/overdraw_metrics.h

 // 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.
 
 #ifndef CCOverdrawMetrics_h
 #define CCOverdrawMetrics_h
 
 #include "base/memory/scoped_ptr.h"
 
+namespace gfx {
+class Rect;
+}
+
 namespace WebKit {
 class WebTransformationMatrix;
 }
 
 namespace cc {
-class IntRect;
 class LayerTreeHost;
 class LayerTreeHostImpl;
 
 // FIXME: compute overdraw metrics only occasionally, not every frame.
 class OverdrawMetrics {
 public:
     static scoped_ptr<OverdrawMetrics> create(bool recordMetricsForFrame) { return make_scoped_ptr(new OverdrawMetrics(recordMetricsForFrame)); }
 
     // These methods are used for saving metrics during update/commit.
 
     // Record pixels painted by WebKit into the texture updater, but does not mean the pixels were rasterized in main memory.
-    void didPaint(const IntRect& paintedRect);
+    void didPaint(const gfx::Rect& paintedRect);
     // Records that an invalid tile was culled and did not need to be painted/uploaded, and did not contribute to other tiles needing to be painted.
     void didCullTilesForUpload(int count);
     // Records pixels that were uploaded to texture memory.
-    void didUpload(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& uploadRect, const IntRect& opaqueRect);
+    void didUpload(const WebKit::WebTransformationMatrix& transformToTarget, const gfx::Rect& uploadRect, const gfx::Rect& opaqueRect);
     // Record contents texture(s) behind present using the given number of bytes.
     void didUseContentsTextureMemoryBytes(size_t contentsTextureUseBytes);
     // Record RenderSurfaceImpl texture(s) being present using the given number of bytes.
     void didUseRenderSurfaceTextureMemoryBytes(size_t renderSurfaceUseBytes);
 
     // These methods are used for saving metrics during draw.
 
     // Record pixels that were not drawn to screen.
-    void didCullForDrawing(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& beforeCullRect, const IntRect& afterCullRect);
+    void didCullForDrawing(const WebKit::WebTransformationMatrix& transformToTarget, const gfx::Rect& beforeCullRect, const gfx::Rect& afterCullRect);
     // Record pixels that were drawn to screen.
-    void didDraw(const WebKit::WebTransformationMatrix& transformToTarget, const IntRect& afterCullRect, const IntRect& opaqueRect);
+    void didDraw(const WebKit::WebTransformationMatrix& transformToTarget, const gfx::Rect& afterCullRect, const gfx::Rect& opaqueRect);
 
     void recordMetrics(const LayerTreeHost*) const;
     void recordMetrics(const LayerTreeHostImpl*) const;
 
     // Accessors for tests.
     float pixelsDrawnOpaque() const { return m_pixelsDrawnOpaque; }
     float pixelsDrawnTranslucent() const { return m_pixelsDrawnTranslucent; }
     float pixelsCulledForDrawing() const { return m_pixelsCulledForDrawing; }
     float pixelsPainted() const { return m_pixelsPainted; }
     float pixelsUploadedOpaque() const { return m_pixelsUploadedOpaque; }
@@ skipping 35 matching lines @@
     float m_pixelsDrawnOpaque;
     // Count of pixels that are possibly translucent, and cannot occlude.
     float m_pixelsDrawnTranslucent;
     // Count of pixels not drawn as they are occluded by somthing opaque.
     float m_pixelsCulledForDrawing;
 };
 
 } // namespace cc
 
 #endif