Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / tools / perf / benchmarks / blink_perf.py

diff --git a/src/tools/perf/benchmarks/blink_perf.py b/src/tools/perf/benchmarks/blink_perf.py
index ae38e48..479986d 100644 (file)
--- a/src/tools/perf/benchmarks/blink_perf.py
+++ b/src/tools/perf/benchmarks/blink_perf.py
@@ -4,10 +4,11 @@
 
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
-from telemetry.page import page_measurement
 from telemetry.page import page_set
+from telemetry.page import page_test
+from telemetry.value import list_of_scalar_values
 
 
 def _CreatePageSetFromPath(path):
@@ -54,7 +55,7 @@ def _CreatePageSetFromPath(path):
   return ps
 
 
-class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
+class _BlinkPerfMeasurement(page_test.PageTest):
   """Tuns a blink performance test and reports the results."""
   def __init__(self):
     super(_BlinkPerfMeasurement, self).__init__('')
@@ -62,20 +63,17 @@ class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
                            'blink_perf.js'), 'r') as f:
       self._blink_perf_js = f.read()
 
-  @property
-  def results_are_the_same_on_every_page(self):
-    return False
-
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = self._blink_perf_js
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs([
         '--js-flags=--expose_gc',
-        '--enable-experimental-web-platform-features'
+        '--enable-experimental-web-platform-features',
+        '--disable-gesture-requirement-for-media-playback'
     ])
 
-  def MeasurePage(self, page, tab, results):
+  def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression('testRunner.isDone', 600)
 
     log = tab.EvaluateJavaScript('document.getElementById("log").innerHTML')
@@ -87,13 +85,15 @@ class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
       values = [float(v.replace(',', '')) for v in parts[1:-1]]
       units = parts[-1]
       metric = page.display_name.split('.')[0].replace('/', '_')
-      results.Add(metric, units, values)
+      results.AddValue(list_of_scalar_values.ListOfScalarValues(
+          results.current_page, metric, units, values))
+
       break
 
     print log
 
 
-class BlinkPerfAll(test.Test):
+class BlinkPerfAll(benchmark.Benchmark):
   tag = 'all'
   test = _BlinkPerfMeasurement
 
@@ -102,7 +102,9 @@ class BlinkPerfAll(test.Test):
         'third_party', 'WebKit', 'PerformanceTests')
     return _CreatePageSetFromPath(path)
 
-class BlinkPerfAnimation(test.Test):
+
+@benchmark.Disabled
+class BlinkPerfAnimation(benchmark.Benchmark):
   tag = 'animation'
   test = _BlinkPerfMeasurement