summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--DEPS3
-rw-r--r--chrome/test/data/perf/rendering/throughput/canvas_single_image/index.html81
3 files changed, 4 insertions, 81 deletions
diff --git a/.gitignore b/.gitignore
index 8e450d8..37151d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ v8.log
/chrome/test/data/firefox3_searchplugins
/chrome/test/data/layout_tests
/chrome/test/data/osdd
+/chrome/test/data/perf/canvas_bench
/chrome/test/data/perf/frame_rate/content
/chrome/test/data/perf/frame_rate/private
/chrome/test/data/perf/private/
diff --git a/DEPS b/DEPS
index ca6d17c..947c27d 100644
--- a/DEPS
+++ b/DEPS
@@ -164,6 +164,9 @@ deps = {
"src/tools/page_cycler/acid3":
"/trunk/deps/page_cycler/acid3@102714",
+ "src/chrome/test/data/perf/canvas_bench":
+ "/trunk/deps/canvas_bench@122605",
+
"src/chrome/test/data/perf/frame_rate/content":
"/trunk/deps/frame_rate/content@93671",
diff --git a/chrome/test/data/perf/rendering/throughput/canvas_single_image/index.html b/chrome/test/data/perf/rendering/throughput/canvas_single_image/index.html
deleted file mode 100644
index c191723..0000000
--- a/chrome/test/data/perf/rendering/throughput/canvas_single_image/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<title>Canvas - Single Image</title>
-<style>
- #sprite {
- visibility: hidden;
- }
-</style>
-<script type="text/javascript">
-window.onload = init;
-
-var kNumSprites = 2500;
-var kSpriteSpeed = 2;
-
-var raf;
-var canvas;
-var context;
-var sprite;
-var xMax;
-var yMax;
-
-function init() {
- canvas = document.getElementById('canvas');
- context = canvas.getContext('2d');
-
- initSprites();
-
- raf = window.requestAnimationFrame ||
- window.webkitRequestAnimationFrame ||
- window.mozRequestAnimationFrame ||
- window.oRequestAnimationFrame ||
- window.msRequestAnimationFrame;
- tick();
-};
-
-function initSprites() {
- var spriteEl = document.getElementById('sprite');
- xMax = canvas.width - spriteEl.width;
- yMax = canvas.height - spriteEl.height;
-
- sprite = new Array();
- for (var i = 0; i < kNumSprites; ++i) {
- sprite[i] = { img: spriteEl,
- x: Math.random() * xMax,
- y: Math.random() * yMax,
- dx: kSpriteSpeed * (Math.random() < .5 ? -1 : 1),
- dy: kSpriteSpeed * (Math.random() < .5 ? -1 : 1) };
- }
-};
-
-function drawSprites() {
- for (var i = 0; i < kNumSprites; ++i) {
- sprite[i].x += sprite[i].dx;
- if ((sprite[i].x > xMax) || (sprite[i].x < 0))
- sprite[i].dx *= -1;
-
- sprite[i].y += sprite[i].dy;
- if ((sprite[i].y > yMax) || (sprite[i].y < 0))
- sprite[i].dy *= -1;
-
- context.drawImage(sprite[i].img, sprite[i].x, sprite[i].y);
- };
-};
-
-function tick() {
- draw();
- raf(tick, canvas);
-};
-
-function draw() {
- context.clearRect(0, 0, canvas.width, canvas.height);
- drawSprites();
-};
-</script>
-</head>
-
-<body>
- <canvas id="canvas" width="800" height = "600">
- <img id="sprite" src="http://farm3.staticflickr.com/2578/4176075327_b710931ef5_s.jpg" width="75" height="75">
-</body>
-</html>