Chromium Code Reviews| Index: PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
| diff --git a/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html b/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
| index 2eb43ba997b9bfd6ef281794be963eef2eabcb5b..e42e7c812a9b5610bf3f6c350805ec33fb8c1caf 100644 |
| --- a/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
| +++ b/PerformanceTests/Canvas/draw-dynamic-webgl-to-hw-accelerated-canvas-2d.html |
| @@ -8,7 +8,7 @@ var ctx2D = canvas2D.getContext("2d"); |
| var canvas3D = document.createElement('canvas'); |
| var gl = canvas3D.getContext('experimental-webgl'); |
| if (!gl) |
| - PerfTestRunner.log("\nWebGL is not supported or enabled on this platform!\n"); |
| + PerfTestRunner.logFatalError("\nWebGL is not supported or enabled on this platform!\n"); |
|
dshwang
2014/03/17 17:16:03
If gl is N/A, the test stops here
|
| var MEASURE_DRAW_TIMES = 100; |
| var MAX_COUNT = 60000; |
| var count = 0; |
| @@ -34,22 +34,19 @@ function renderWebGL(gl) { |
| } |
| function drawWebGLToCanvas2D() { |
| - if (gl) { |
| - var start = PerfTestRunner.now(); |
| - for (var i = 0; i < MEASURE_DRAW_TIMES; i++) { |
| - renderWebGL(gl); |
| - // draw dynamic WebGL |
| - ctx2D.drawImage(canvas3D, 0, 0); |
| - } |
| - // Calling getImageData() is just to flush out the content when |
| - // accelerated 2D canvas is in use. The cost of reading 1x1 pixels is low. |
| - ctx2D.getImageData(0, 0, 1, 1); |
| - count++; |
| + var start = PerfTestRunner.now(); |
| + for (var i = 0; i < MEASURE_DRAW_TIMES; i++) { |
| + renderWebGL(gl); |
| + // draw dynamic WebGL |
| + ctx2D.drawImage(canvas3D, 0, 0); |
| + } |
| + // Calling getImageData() is just to flush out the content when |
| + // accelerated 2D canvas is in use. The cost of reading 1x1 pixels is low. |
| + ctx2D.getImageData(0, 0, 1, 1); |
| + count++; |
| - var elapsedTime = PerfTestRunner.now() - start; |
| - PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * 1000 / elapsedTime); |
| - } else |
| - PerfTestRunner.measureValueAsync(0); |
| + var elapsedTime = PerfTestRunner.now() - start; |
| + PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * 1000 / elapsedTime); |
| if (count < MAX_COUNT) |
| requestAnimationFrame(drawWebGLToCanvas2D); |
| } |