| Index: PerformanceTests/Canvas/draw-static-canvas-2d-to-hw-accelerated-canvas-2d.html
|
| diff --git a/PerformanceTests/Canvas/draw-static-canvas-2d-to-hw-accelerated-canvas-2d.html b/PerformanceTests/Canvas/draw-static-canvas-2d-to-hw-accelerated-canvas-2d.html
|
| index 7e4e057c090227ae97ec6d345329876b82eb1ab2..eb8d9673d7e0c2cd58e2d03ddaedf315577c3998 100644
|
| --- a/PerformanceTests/Canvas/draw-static-canvas-2d-to-hw-accelerated-canvas-2d.html
|
| +++ b/PerformanceTests/Canvas/draw-static-canvas-2d-to-hw-accelerated-canvas-2d.html
|
| @@ -7,9 +7,9 @@ var sourceCanvas2D = document.createElement("canvas");
|
| var sourceCtx2D = sourceCanvas2D.getContext("2d");
|
| var destCanvas2D = document.createElement("canvas");
|
| var destCtx2D = destCanvas2D.getContext("2d");
|
| -var MEASURE_DRAW_TIMES = 1000;
|
| -var MAX_COUNT = 60000;
|
| -var count = 0;
|
| +var MEASURE_DRAW_TIMES = 50;
|
| +var MAX_MEASURE_DRAW_TIMES = 1000;
|
| +var MAX_MEASURE_TIME_PER_FRAME = 1000; // 1 sec
|
|
|
| function setSize(sourceWidth, sourceHeight, destWidth, destHeight) {
|
| sourceCanvas2D.width = sourceWidth;
|
| @@ -29,23 +29,25 @@ function fillCanvas(ctx2d, canvas2d) {
|
|
|
| function drawCanvas2DToCanvas2D() {
|
| var start = PerfTestRunner.now();
|
| - for (var i = 0; i < MEASURE_DRAW_TIMES; i++) {
|
| - // draw static Canvas
|
| - destCtx2D.drawImage(sourceCanvas2D, 0, 0);
|
| + var count = 0;
|
| + while ((PerfTestRunner.now() - start <= MAX_MEASURE_TIME_PER_FRAME) && (count * MEASURE_DRAW_TIMES < MAX_MEASURE_DRAW_TIMES)) {
|
| + for (var i = 0; i < MEASURE_DRAW_TIMES; i++) {
|
| + // draw static Canvas
|
| + destCtx2D.drawImage(sourceCanvas2D, 0, 0);
|
| + }
|
| + count++;
|
| }
|
| // Calling getImageData() is just to flush out the content when
|
| // accelerated 2D canvas is in use. The cost of reading 1x1 pixels is low.
|
| destCtx2D.getImageData(0, 0, 1, 1);
|
| - count++;
|
|
|
| var elapsedTime = PerfTestRunner.now() - start;
|
| - PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * 1000 / elapsedTime);
|
| - if (count < MAX_COUNT)
|
| - requestAnimationFrame(drawCanvas2DToCanvas2D);
|
| + PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * count * 1000 / elapsedTime);
|
| +
|
| + requestAnimationFrame(drawCanvas2DToCanvas2D);
|
| }
|
|
|
| function onCompletedRun() {
|
| - count = MAX_COUNT;
|
| }
|
|
|
| window.onload = function () {
|
|
|