tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 8b88725d6326c6c7e9fa93ccecb525fbe0e224ea..5555b9b2a4e6755997b136de7d1c7873910db986 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -3434,6 +3434,26 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Blink.Canvas.DrawImage" units="microseconds">
+  <owner>junov@chromium.org</owner>
+  <summary>Time spent on 2D canvas drawImage API call.</summary>
+</histogram>
+
+<histogram name="Blink.Canvas.GetImageData" units="microseconds">
+  <owner>junov@chromium.org</owner>
+  <summary>Time spent on 2D canvas getImageData API call.</summary>
+</histogram>
+
+<histogram name="Blink.Canvas.PutImageData" units="microseconds">
+  <owner>junov@chromium.org</owner>
+  <summary>Time spent on 2D canvas putImageData API call.</summary>
+</histogram>
+
+<histogram name="Blink.Canvas.ToDataURL" units="microseconds">
+  <owner>junov@chromium.org</owner>
+  <summary>Time spent on 2D canvas toDataURL API call.</summary>
+</histogram>
+
 <histogram name="Blink.Compositing.UpdateTime" units="microseconds">
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -90944,6 +90964,51 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="WebRTC.Stun.BatchSuccessPercent.UnknownNAT"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="BlinkCanvasDrawImageTime" separator=".">
+  <suffix name="CanvasCPU"/>
+  <suffix name="CanvasDisplayList"/>
+  <suffix name="CanvasGPU"/>
+  <suffix name="ImageBitmapCPU"/>
+  <suffix name="ImageBitmapDisplayList"/>
+  <suffix name="ImageBitmapGPU"/>
+  <suffix name="OthersCPU"/>
+  <suffix name="OthersDisplayList"/>
+  <suffix name="OthersGPU"/>
+  <suffix name="SVGCPU"/>
+  <suffix name="SVGDisplayList"/>
+  <suffix name="SVGGPU"/>
+  <suffix name="VideoCPU"/>
+  <suffix name="VideoDisplayList"/>
+  <suffix name="VideoGPU"/>
+  <affected-histogram name="Blink.Canvas.DrawImage"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="BlinkCanvasGetImageDataTime" separator=".">
+  <suffix name="CPU"/>
+  <suffix name="DisplayList"/>
+  <suffix name="GPU"/>
+  <affected-histogram name="Blink.Canvas.GetImageData"/>
+</histogram_suffixes>
+
+<histogram_suffixes name="BlinkCanvasPutImageDataTime" separator=".">
+  <suffix name="CPU"/>
+  <suffix name="DisplayList"/>
+  <suffix name="GPU"/>
+  <affected-histogram name="Blink.Canvas.PutImageData"/>
+</histogram_suffixes>

[Ilya Sherman, 2016/05/25 00:20:04]

You could condense these down to just:

<histogram_suffixes name="BlinkCanvasDrawImageType" separator=".">
  <suffix name="Canvas"/>
  <suffix name="ImageBitmap"/>
  <suffix name="Others"/>
  <suffix name="SVG"/>
  <suffix name="Video"/>
  <affected-histogram name="Blink.Canvas.DrawImage"/>
</histogram_suffixes>

<histogram_suffixes name="BlinkCanvasDurationBySource" separator=".">
  <suffix name="CPU"/>
  <suffix name="DisplayList"/>
  <suffix name="GPU"/>
  <affected-histogram name="Blink.Canvas.DrawImage.Canvas"/>
  <affected-histogram name="Blink.Canvas.DrawImage.ImageBitmap"/>
  <affected-histogram name="Blink.Canvas.DrawImage.Others"/>
  <affected-histogram name="Blink.Canvas.DrawImage.SVG"/>
  <affected-histogram name="Blink.Canvas.DrawImage.Video"/>
  <affected-histogram name="Blink.Canvas.GetImageData"/>
  <affected-histogram name="Blink.Canvas.PutImageData"/>
</histogram_suffixes>

(Note that you'd need to name the DrawImage histograms with an extra dot, e.g.
"Blink.Canvas.DrawImage.Canvas.GPU" instead of
"Blink.Canvas.DrawImage.CanvasGPU".  But I think that's preferable anyway.)

[xidachen, 2016/05/25 01:35:05]

Thank you, this is much cleaner.

+
+<histogram_suffixes name="BlinkCanvasToDataURLTime" separator=".">
+  <suffix name="BMP"/>
+  <suffix name="GIF"/>
+  <suffix name="ICON"/>
+  <suffix name="JPEG"/>
+  <suffix name="PNG"/>
+  <suffix name="TIFF"/>
+  <suffix name="Unknown"/>
+  <suffix name="WEBP"/>
+  <affected-histogram name="Blink.Canvas.ToDataURL"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="BlinkGCReason">
   <suffix name="IdleGC" label="Idle GC"/>
   <suffix name="PreciseGC" label="Precise GC"/>