Upstream version 7.36.149.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 d735198..2e17ca9 100644 (file)
--- a/src/tools/perf/benchmarks/blink_perf.py
+++ b/src/tools/perf/benchmarks/blink_perf.py
@@ -13,16 +13,16 @@ from telemetry.page import page_set
 def _CreatePageSetFromPath(path):
   assert os.path.exists(path)
 
-  page_set_dict = {'pages': []}
+  page_urls = []
+  serving_dirs = set()
 
   def _AddPage(path):
     if not path.endswith('.html'):
       return
     if '../' in open(path, 'r').read():
       # If the page looks like it references its parent dir, include it.
-      page_set_dict['serving_dirs'] = [os.path.dirname(os.path.dirname(path))]
-    page_set_dict['pages'].append({'url':
-                                   'file://' + path.replace('\\', '/')})
+      serving_dirs.add(os.path.dirname(os.path.dirname(path)))
+    page_urls.append('file://' + path.replace('\\', '/'))
 
   def _AddDir(dir_path, skipped):
     for candidate_path in os.listdir(dir_path):
@@ -48,7 +48,10 @@ def _CreatePageSetFromPath(path):
     _AddDir(path, skipped)
   else:
     _AddPage(path)
-  return page_set.PageSet.FromDict(page_set_dict, os.getcwd() + os.sep)
+  ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs)
+  for url in page_urls:
+    ps.AddPageWithDefaultRunNavigate(url)
+  return ps
 
 
 class _BlinkPerfMeasurement(page_measurement.PageMeasurement):
@@ -107,15 +110,3 @@ class BlinkPerfAnimation(test.Test):
     path = os.path.join(util.GetChromiumSrcDir(),
         'third_party', 'WebKit', 'PerformanceTests', 'Animation')
     return _CreatePageSetFromPath(path)
-
-class BlinkPerfWebAnimations(test.Test):
-  tag = 'web_animations'
-  test = _BlinkPerfMeasurement
-
-  def CreatePageSet(self, options):
-    path = os.path.join(util.GetChromiumSrcDir(),
-        'third_party', 'WebKit', 'PerformanceTests', 'Animation')
-    return _CreatePageSetFromPath(path)
-
-  def CustomizeBrowserOptions(self, options):
-    options.AppendExtraBrowserArgs('--enable-web-animations-css')