OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Runs Canvasmark HTML5, Canvas 2D rendering and javascript benchmark. | 5 """Runs Canvasmark HTML5, Canvas 2D rendering and javascript benchmark. |
6 | 6 |
7 CanvasMark tests the HTML5 <canvas> rendering performance for commonly used | 7 CanvasMark tests the HTML5 <canvas> rendering performance for commonly used |
8 operations in HTML5 games: bitmaps, canvas drawing, alpha blending, polygon | 8 operations in HTML5 games: bitmaps, canvas drawing, alpha blending, polygon |
9 fills, shadows and text functions. | 9 fills, shadows and text functions. |
10 """ | 10 """ |
(...skipping 28 matching lines...) Expand all Loading... |
39 assert len(score_and_name) == 2, \ | 39 assert len(score_and_name) == 2, \ |
40 'Unexpected result format "%s"' % score_and_name | 40 'Unexpected result format "%s"' % score_and_name |
41 score = int(score_and_name[0]) | 41 score = int(score_and_name[0]) |
42 name = score_and_name[1][:-1] | 42 name = score_and_name[1][:-1] |
43 results.Add(name, 'score', score, data_type='unimportant') | 43 results.Add(name, 'score', score, data_type='unimportant') |
44 # Aggregate total score for all tests. | 44 # Aggregate total score for all tests. |
45 total += score | 45 total += score |
46 results.Add('Score', 'score', total) | 46 results.Add('Score', 'score', total) |
47 | 47 |
48 | 48 |
| 49 @benchmark.Disabled |
49 class CanvasMark(benchmark.Benchmark): | 50 class CanvasMark(benchmark.Benchmark): |
50 test = _CanvasMarkMeasurement | 51 test = _CanvasMarkMeasurement |
51 | 52 |
52 def CreatePageSet(self, options): | 53 def CreatePageSet(self, options): |
53 ps = page_set.PageSet( | 54 ps = page_set.PageSet( |
54 file_path=os.path.abspath(__file__), | 55 file_path=os.path.abspath(__file__), |
55 archive_data_file='../page_sets/data/canvasmark.json', | 56 archive_data_file='../page_sets/data/canvasmark.json', |
56 make_javascript_deterministic=False) | 57 make_javascript_deterministic=False) |
57 ps.AddPageWithDefaultRunNavigate( | 58 ps.AddPageWithDefaultRunNavigate( |
58 'http://www.kevs3d.co.uk/dev/canvasmark/?auto=true') | 59 'http://www.kevs3d.co.uk/dev/canvasmark/?auto=true') |
59 return ps | 60 return ps |
OLD | NEW |