Revert 166464 - Turn overdraw metrics on only when about:tracing is recording.

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 "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 15 matching lines @@
     , m_pixelsUploadedTranslucent(0)
     , m_tilesCulledForUpload(0)
     , m_contentsTextureUseBytes(0)
     , m_renderSurfaceTextureUseBytes(0)
     , m_pixelsDrawnOpaque(0)
     , m_pixelsDrawnTranslucent(0)
     , m_pixelsCulledForDrawing(0)
 {
 }
 
+static inline float wedgeProduct(const gfx::PointF& p1, const gfx::PointF& p2)
+{
+    return p1.x() * p2.y() - p1.y() * p2.x();
+}
+
+// Calculates area of an arbitrary convex polygon with up to 8 points.
+static inline float polygonArea(const gfx::PointF points[8], int numPoints)
+{
+    if (numPoints < 3)
+        return 0;
+
+    float area = 0;
+    for (int i = 0; i < numPoints; ++i)
+        area += wedgeProduct(points[i], points[(i+1)%numPoints]);
+    return fabs(0.5f * area);
+}
+
+// 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 gfx::QuadF& quad)
+{
+    gfx::PointF clippedQuad[8];
+    int numVerticesInClippedQuad = 0;
+    MathUtil::mapClippedQuad(transform, quad, clippedQuad, numVerticesInClippedQuad);
+    return polygonArea(clippedQuad, numVerticesInClippedQuad);
+}
+
 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 gfx::Rect& uploadRect, const gfx::Rect& opaqueRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
-    gfx::Rect uploadOpaqueRect = gfx::IntersectRects(opaqueRect, uploadRect);
-
-    float uploadArea = static_cast<float>(uploadRect.width()) * uploadRect.height();
-    float uploadOpaqueArea = static_cast<float>(uploadOpaqueRect.width()) * uploadOpaqueRect.height();
+    float uploadArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(uploadRect));
+    float uploadOpaqueArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(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 gfx::Rect& beforeCullRect, const gfx::Rect& afterCullRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
-    float beforeCullArea = static_cast<float>(beforeCullRect.width()) * beforeCullRect.height();
-    float afterCullArea = static_cast<float>(afterCullRect.width()) * afterCullRect.height();
+    float beforeCullArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(beforeCullRect));
+    float afterCullArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(afterCullRect));
 
     m_pixelsCulledForDrawing += beforeCullArea - afterCullArea;
 }
 
 void OverdrawMetrics::didDraw(const WebTransformationMatrix& transformToTarget, const gfx::Rect& afterCullRect, const gfx::Rect& opaqueRect)
 {
     if (!m_recordMetricsForFrame)
         return;
 
-    gfx::Rect afterCullOpaqueRect = gfx::IntersectRects(opaqueRect, afterCullRect);
-
-    float afterCullArea = static_cast<float>(afterCullRect.width()) * afterCullRect.height();
-    float afterCullOpaqueArea = static_cast<float>(afterCullOpaqueRect.width()) * afterCullOpaqueRect.height();
+    float afterCullArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(afterCullRect));
+    float afterCullOpaqueArea = areaOfMappedQuad(transformToTarget, gfx::QuadF(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