Use the new tracing based measurement for blink_perf.paint

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 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.
 
 import os
 
 from core import path_util
 from core import perf_benchmark
 
+from page_sets import webgl_supported_shared_state
+
 from telemetry import benchmark
 from telemetry import page as page_module
 from telemetry.page import legacy_page_test
 from telemetry.page import shared_page_state
 from telemetry import story
 from telemetry.timeline import bounds
 from telemetry.timeline import model as model_module
 from telemetry.timeline import tracing_config
 
 from telemetry.value import list_of_scalar_values
-from telemetry.value import scalar
 from telemetry.value import trace
 
 
-from measurements import timeline_controller
-from page_sets import webgl_supported_shared_state
-
-
 BLINK_PERF_BASE_DIR = os.path.join(path_util.GetChromiumSrcDir(),
                                    'third_party', 'WebKit', 'PerformanceTests')
 SKIPPED_FILE = os.path.join(BLINK_PERF_BASE_DIR, 'Skipped')
 
 
 def CreateStorySetFromPath(path, skipped_file,
                            shared_page_state_class=(
                                shared_page_state.SharedPageState)):
   assert os.path.exists(path)
 
@@ skipping 197 matching lines @@
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           results.current_page, metric, units, values))
 
       break
 
     print log
 
     self.PrintAndCollectTraceEventMetrics(trace_cpu_time_metrics, results)
 
 
-# TODO(wangxianzhu): Convert the paint benchmarks to use the new blink_perf
-# tracing once it's ready.
-class _BlinkPerfPaintMeasurement(_BlinkPerfMeasurement):
-  """Also collects prePaint and paint timing from traces."""
-
-  def __init__(self):
-    super(_BlinkPerfPaintMeasurement, self).__init__()
-    self._controller = None
-
-  def WillNavigateToPage(self, page, tab):
-    super(_BlinkPerfPaintMeasurement, self).WillNavigateToPage(page, tab)
-    self._controller = timeline_controller.TimelineController()
-    self._controller.trace_categories = 'blink,blink.console'
-    self._controller.SetUp(page, tab)
-    self._controller.Start(tab)
-
-  def DidRunPage(self, platform):
-    if self._controller:
-      self._controller.CleanUp(platform)
-
-  def ValidateAndMeasurePage(self, page, tab, results):
-    super(_BlinkPerfPaintMeasurement, self).ValidateAndMeasurePage(
-        page, tab, results)
-    self._controller.Stop(tab, results)
-    renderer = self._controller.model.GetRendererThreadFromTabId(tab.id)
-    # The marker marks the beginning and ending of the measured runs.
-    marker = next(event for event in renderer.async_slices
-                  if event.name == 'blink_perf'
-                  and event.category == 'blink.console')
-    assert marker
-
-    for event in renderer.all_slices:
-      if event.start < marker.start or event.end > marker.end:
-        continue
-      if event.name == 'FrameView::prePaint':
-        results.AddValue(
-            scalar.ScalarValue(page, 'prePaint', 'ms', event.duration))
-      if event.name == 'FrameView::paintTree':
-        results.AddValue(
-            scalar.ScalarValue(page, 'paint', 'ms', event.duration))
-
-
 class _BlinkPerfBenchmark(perf_benchmark.PerfBenchmark):
 
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.' + cls.tag
 
   def CreateStorySet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, self.subdir)
@@ skipping 73 matching lines @@
   tag = 'layout'
   subdir = 'Layout'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/551950
 
 
 @benchmark.Owner(emails=['wangxianzhu@chromium.org'])
 class BlinkPerfPaint(_BlinkPerfBenchmark):
-  test = _BlinkPerfPaintMeasurement
   tag = 'paint'
   subdir = 'Paint'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/574483
 
 
 @benchmark.Disabled('win')  # crbug.com/488493
 @benchmark.Owner(emails=['yukishiino@chromium.org',
@@ skipping 11 matching lines @@
 
 
 @benchmark.Owner(emails=['hayato@chromium.org'])
 class BlinkPerfShadowDOM(_BlinkPerfBenchmark):
   tag = 'shadow_dom'
   subdir = 'ShadowDOM'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/702319
     return possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'