[Telemetry]: Add HTML5 Capabilities and Canvas tests to Peacekeeper benchmark suite.

Review URL: https://codereview.chromium.org/68203007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234696 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 84 insertions, 1 deletions

diff --git a/tools/perf/benchmarks/peacekeeper.py b/tools/perf/benchmarks/peacekeeper.py
index 31da6cf..88a3338 100644
--- a/tools/perf/benchmarks/peacekeeper.py
+++ b/tools/perf/benchmarks/peacekeeper.py
@@ -38,7 +38,6 @@ class PeaceKeeperMeasurement(page_measurement.PageMeasurement):
             test_frame.contentWindow.onbeforeunload = {};
             if ((msg.indexOf("Submit ok.")) != -1) {
               _done = true;
-              var __data = {};
               __results["test"] = benchmark.testObjectName;
               __results["score"] = benchmark.test.result;
               if (typeof(benchmark.test.unit) != "undefined") {
@@ -200,3 +199,59 @@ class PeaceKeeperTextParsing(PeaceKeeperBenchmark):
                 'stringValidateForm'
                ]
 
+
+class PeaceKeeperHTML5Canvas(PeaceKeeperBenchmark):
+  """PeaceKeeper HTML5 Canvas benchmark suite.
+
+  These tests use HTML5 Canvas, which is a web technology for drawing and
+  manipulating graphics without external plug-ins.
+  1. experimentalRipple01: Simulates a 'water ripple' effect by using HTML 5
+    Canvas. It measures the browser's ability to draw individual pixels.
+  2. experimentalRipple02: Same test as 'experimentalRipple01', but with a
+    larger canvas and thus a heavier workload.
+  """
+
+  tag = 'experimental'
+  test_param = ['experimentalRipple01',
+                'experimentalRipple02'
+               ]
+
+
+class PeaceKeeperHTML5Capabilities(PeaceKeeperBenchmark):
+  """PeaceKeeper HTML5 Capabilities benchmark suite.
+
+  These tests checks browser HTML5 capabilities support for WebGL, Video
+  foramts, simple 2D sprite based games and web worker.
+  This benchmark only tests HTML5 capability and thus is not calculate into the
+  overall score.
+  1. HTML5 - WebGL: WebGL allows full blown 3D graphics to be rendered in a
+    browser without the need for any external plug-ins.
+    a) webglSphere
+  2. HTML5 - Video: hese tests find out which HTML5 video formats are supposed
+    by your browser. Peacekeeper only checks if your browser is able to play a
+    specific format, no other valuation is done.
+    a) videoCodecH264
+    b) videoCodecTheora
+    c) videoCodecWebM
+    d) videoPosterSupport
+  3.HTML5 - Web Worker: These tests use HTML5 Web Worker, which allows
+    JavaScript to multhread - ie. the ability to perform multiple actions
+    concurrently.
+    a) workerContrast01
+    b) workerContrast02
+  4. HTML5 - Game: This test simulates a simple 2D, sprite-based game.
+    The test itself is the real game, and what is shown is a recorded play.
+    a) gamingSpitfire
+  """
+
+  tag = 'html5'
+  test_param = ['webglSphere',
+                'gamingSpitfire',
+                'videoCodecH264',
+                'videoCodecTheora',
+                'videoCodecWebM',
+                'videoPosterSupport',
+                'workerContrast01',
+                'workerContrast02'
+                ]
+
diff --git a/tools/perf/page_sets/data/peacekeeper_experimental.json b/tools/perf/page_sets/data/peacekeeper_experimental.json
new file mode 100644
index 0000000..4f1d7e4
--- /dev/null
+++ b/tools/perf/page_sets/data/peacekeeper_experimental.json
@@ -0,0 +1,10 @@
+{
+    "page_set": "../peacekeeper_experimental.json", 
+    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
+    "archives": {
+        "peacekeeper_experimental_000.wpr": [
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=experimental&forceTestName=experimentalRipple01", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=experimental&forceTestName=experimentalRipple02"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/tools/perf/page_sets/data/peacekeeper_experimental_000.wpr.sha1 b/tools/perf/page_sets/data/peacekeeper_experimental_000.wpr.sha1
new file mode 100644
index 0000000..7e269ef
--- /dev/null
+++ b/tools/perf/page_sets/data/peacekeeper_experimental_000.wpr.sha1
@@ -0,0 +1 @@
+0cfc1e1c495352a9aa8a15c8614b37aeaea099ae
\ No newline at end of file
diff --git a/tools/perf/page_sets/data/peacekeeper_html5.json b/tools/perf/page_sets/data/peacekeeper_html5.json
new file mode 100644
index 0000000..51dc16d
--- /dev/null
+++ b/tools/perf/page_sets/data/peacekeeper_html5.json
@@ -0,0 +1,16 @@
+{
+    "page_set": "../peacekeeper_html5.json", 
+    "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", 
+    "archives": {
+        "peacekeeper_html5_000.wpr": [
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=webglSphere", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=gamingSpitfire", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=videoCodecH264", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=videoCodecTheora", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=videoCodecWebM", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=videoPosterSupport", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=workerContrast01", 
+            "http://peacekeeper.futuremark.com/run.action?debug=true&repeat=false&forceSuiteName=html5&forceTestName=workerContrast02"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/tools/perf/page_sets/data/peacekeeper_html5_000.wpr.sha1 b/tools/perf/page_sets/data/peacekeeper_html5_000.wpr.sha1
new file mode 100644
index 0000000..cbe291b2
--- /dev/null
+++ b/tools/perf/page_sets/data/peacekeeper_html5_000.wpr.sha1
@@ -0,0 +1 @@
+292a6a06c6e3c11b6b09be98a3add6c9f7edaf37
\ No newline at end of file