Use proper histogram macros for Renderer4 histograms.

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 "cc/overdraw_metrics.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"
@@ skipping 126 matching lines @@
 {
     // This gives approximately 10x the percentage of pixels to fill the viewport once.
     float normalization = 1000.f / (layerTreeHost->deviceViewportSize().width() * layerTreeHost->deviceViewportSize().height());
     // This gives approximately 100x the percentage of tiles to fill the viewport once, if all tiles were 256x256.
     float tileNormalization = 10000.f / (layerTreeHost->deviceViewportSize().width() / 256.f * layerTreeHost->deviceViewportSize().height() / 256.f);
     // This gives approximately 10x the percentage of bytes to fill the viewport once, assuming 4 bytes per pixel.
     float byteNormalization = normalization / 4;
 
     switch (metricsType) {
     case DrawingToScreen: {
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountOpaque_Draw", static_cast<int>(normalization * m_pixelsDrawnOpaque), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountTranslucent_Draw", static_cast<int>(normalization * m_pixelsDrawnTranslucent), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountCulled_Draw", static_cast<int>(normalization * m_pixelsCulledForDrawing), 100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountOpaque_Draw",
+            static_cast<int>(normalization * m_pixelsDrawnOpaque),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountTranslucent_Draw",
+            static_cast<int>(normalization * m_pixelsDrawnTranslucent),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountCulled_Draw",
+            static_cast<int>(normalization * m_pixelsCulledForDrawing),
+            100, 1000000, 50);
 
         TRACE_COUNTER_ID1("cc", "DrawPixelsCulled", layerTreeHost, m_pixelsCulledForDrawing);
         TRACE_EVENT2("cc", "OverdrawMetrics", "PixelsDrawnOpaque", m_pixelsDrawnOpaque, "PixelsDrawnTranslucent", m_pixelsDrawnTranslucent);
         break;
     }
     case UpdateAndCommit: {
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountPainted", static_cast<int>(normalization * m_pixelsPainted), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountOpaque_Upload", static_cast<int>(normalization * m_pixelsUploadedOpaque), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountTranslucent_Upload", static_cast<int>(normalization * m_pixelsUploadedTranslucent), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.tileCountCulled_Upload", static_cast<int>(tileNormalization * m_tilesCulledForUpload), 100, 10000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.renderSurfaceTextureBytes_ViewportScaled", static_cast<int>(byteNormalization * m_renderSurfaceTextureUseBytes), 10, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.renderSurfaceTextureBytes_Unscaled", static_cast<int>(m_renderSurfaceTextureUseBytes / 1000), 1000, 100000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.contentsTextureBytes_ViewportScaled", static_cast<int>(byteNormalization * m_contentsTextureUseBytes), 10, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.contentsTextureBytes_Unscaled", static_cast<int>(m_contentsTextureUseBytes / 1000), 1000, 100000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountPainted",
+            static_cast<int>(normalization * m_pixelsPainted),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountOpaque_Upload",
+            static_cast<int>(normalization * m_pixelsUploadedOpaque),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountTranslucent_Upload",
+            static_cast<int>(normalization * m_pixelsUploadedTranslucent),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.tileCountCulled_Upload",
+            static_cast<int>(tileNormalization * m_tilesCulledForUpload),
+            100, 10000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.renderSurfaceTextureBytes_ViewportScaled",
+            static_cast<int>(
+                byteNormalization * m_renderSurfaceTextureUseBytes),
+            10, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.renderSurfaceTextureBytes_Unscaled",
+            static_cast<int>(m_renderSurfaceTextureUseBytes / 1000),
+            1000, 100000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.contentsTextureBytes_ViewportScaled",
+            static_cast<int>(byteNormalization * m_contentsTextureUseBytes),
+            10, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.contentsTextureBytes_Unscaled",
+            static_cast<int>(m_contentsTextureUseBytes / 1000),
+            1000, 100000000, 50);
 
         {
             TRACE_COUNTER_ID1("cc", "UploadTilesCulled", layerTreeHost, m_tilesCulledForUpload);
             TRACE_EVENT2("cc", "OverdrawMetrics", "PixelsUploadedOpaque", m_pixelsUploadedOpaque, "PixelsUploadedTranslucent", m_pixelsUploadedTranslucent);
         }
         {
             // This must be in a different scope than the TRACE_EVENT2 above.
             TRACE_EVENT1("cc", "OverdrawPaintMetrics", "PixelsPainted", m_pixelsPainted);
         }
         {
             // 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