Remove most remaining references to IntRect and FloatRect.

cc/overdraw_metrics.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/overdraw_metrics.h"
 
 #include "FloatQuad.h"
-#include "IntRect.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
+#include "ui/gfx/rect.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
 
 namespace cc {
 
 OverdrawMetrics::OverdrawMetrics(bool recordMetricsForFrame)
     : m_recordMetricsForFrame(recordMetricsForFrame)
     , m_pixelsPainted(0)
     , m_pixelsUploadedOpaque(0)
@@ skipping 26 matching lines @@
 
 // Takes a given quad, maps it by the given transformation, and gives the area of the resulting polygon.
 static inline float areaOfMappedQuad(const WebTransformationMatrix& transform, const FloatQuad& quad)
 {
     gfx::PointF clippedQuad[8];
     int numVerticesInClippedQuad = 0;
     MathUtil::mapClippedQuad(transform, quad, clippedQuad, numVerticesInClippedQuad);
     return polygonArea(clippedQuad, numVerticesInClippedQuad);
 }
 
-void OverdrawMetrics::didPaint(const IntRect& paintedRect)
+void OverdrawMetrics::didPaint(const gfx::Rect& paintedRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     m_pixelsPainted += static_cast<float>(paintedRect.width()) * paintedRect.height();
 }
 
 void OverdrawMetrics::didCullTilesForUpload(int count)
 {
     if (m_recordMetricsForFrame)
         m_tilesCulledForUpload += count;
 }
 
-void OverdrawMetrics::didUpload(const WebTransformationMatrix& transformToTarget, const IntRect& uploadRect, const IntRect& opaqueRect)
+void OverdrawMetrics::didUpload(const WebTransformationMatrix& transformToTarget, const gfx::Rect& uploadRect, const gfx::Rect& opaqueRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     float uploadArea = areaOfMappedQuad(transformToTarget, FloatQuad(uploadRect));
-    float uploadOpaqueArea = areaOfMappedQuad(transformToTarget, FloatQuad(intersection(opaqueRect, uploadRect)));
+    float uploadOpaqueArea = areaOfMappedQuad(transformToTarget, FloatQuad(gfx::IntersectRects(opaqueRect, uploadRect)));
 
     m_pixelsUploadedOpaque += uploadOpaqueArea;
     m_pixelsUploadedTranslucent += uploadArea - uploadOpaqueArea;
 }
 
 void OverdrawMetrics::didUseContentsTextureMemoryBytes(size_t contentsTextureUseBytes)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     m_contentsTextureUseBytes += contentsTextureUseBytes;
 }
 
 void OverdrawMetrics::didUseRenderSurfaceTextureMemoryBytes(size_t renderSurfaceUseBytes)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     m_renderSurfaceTextureUseBytes += renderSurfaceUseBytes;
 }
 
-void OverdrawMetrics::didCullForDrawing(const WebTransformationMatrix& transformToTarget, const IntRect& beforeCullRect, const IntRect& afterCullRect)
+void OverdrawMetrics::didCullForDrawing(const WebTransformationMatrix& transformToTarget, const gfx::Rect& beforeCullRect, const gfx::Rect& afterCullRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     float beforeCullArea = areaOfMappedQuad(transformToTarget, FloatQuad(beforeCullRect));
     float afterCullArea = areaOfMappedQuad(transformToTarget, FloatQuad(afterCullRect));
 
     m_pixelsCulledForDrawing += beforeCullArea - afterCullArea;
 }
 
-void OverdrawMetrics::didDraw(const WebTransformationMatrix& transformToTarget, const IntRect& afterCullRect, const IntRect& opaqueRect)
+void OverdrawMetrics::didDraw(const WebTransformationMatrix& transformToTarget, const gfx::Rect& afterCullRect, const gfx::Rect& opaqueRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
     float afterCullArea = areaOfMappedQuad(transformToTarget, FloatQuad(afterCullRect));
-    float afterCullOpaqueArea = areaOfMappedQuad(transformToTarget, FloatQuad(intersection(opaqueRect, afterCullRect)));
+    float afterCullOpaqueArea = areaOfMappedQuad(transformToTarget, FloatQuad(gfx::IntersectRects(opaqueRect, afterCullRect)));
 
     m_pixelsDrawnOpaque += afterCullOpaqueArea;
     m_pixelsDrawnTranslucent += afterCullArea - afterCullOpaqueArea;
 }
 
 void OverdrawMetrics::recordMetrics(const LayerTreeHost* layerTreeHost) const
 {
     if (m_recordMetricsForFrame)
         recordMetricsInternal<LayerTreeHost>(UpdateAndCommit, layerTreeHost);
 }
@@ skipping 45 matching lines @@
         {
             // This must be in a different scope than the TRACE_EVENTs above.
             TRACE_EVENT2("cc", "OverdrawPaintMetrics", "ContentsTextureBytes", m_contentsTextureUseBytes, "RenderSurfaceTextureBytes", m_renderSurfaceTextureUseBytes);
         }
         break;
     }
     }
 }
 
 } // namespace cc