Make canvas perf tests run less than 6 sec.

PerformanceTests/Canvas/upload-canvas-2d-to-texture.html

Index: PerformanceTests/Canvas/upload-canvas-2d-to-texture.html
diff --git a/PerformanceTests/Canvas/upload-canvas-2d-to-texture.html b/PerformanceTests/Canvas/upload-canvas-2d-to-texture.html
index b54712fbb5d11990fa270bad78b3d5b0715c0769..f7d55ab9552a3c94adefe4e035edeaa63a1c9099 100644
--- a/PerformanceTests/Canvas/upload-canvas-2d-to-texture.html
+++ b/PerformanceTests/Canvas/upload-canvas-2d-to-texture.html
@@ -10,9 +10,9 @@ 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");
-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(width, height) {
     canvas2D.width = width;
@@ -36,23 +36,25 @@ function uploadCanvas2DToWebGLTexture() {
         gl.bindTexture(gl.TEXTURE_2D, tex);
 
         var start = PerfTestRunner.now();
-        for (var i = 0; i < MEASURE_DRAW_TIMES; i++) {
-            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, canvas2D);
+        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++) {
+                gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, canvas2D);
+            }
+            count++;
         }
-        gl.readPixels(0, 0, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array(4));
+        gl.finish();

[Ken Russell (switch to Gerrit), 2014/03/17 06:03:24]

The earlier implementation using readPixels was better. There's no strong
guarantee in WebGL that calling finish() will stall the calling context because
there's no user-visible side effect.

+        var elapsedTime = PerfTestRunner.now() - start;
         gl.deleteTexture(tex);
-        count++;
 
-        var elapsedTime = PerfTestRunner.now() - start;
-        PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * 1000 / elapsedTime);
+        PerfTestRunner.measureValueAsync(MEASURE_DRAW_TIMES * count * 1000 / elapsedTime);
     } else
         PerfTestRunner.measureValueAsync(0);
-    if (count < MAX_COUNT)
-        requestAnimationFrame(uploadCanvas2DToWebGLTexture);
+
+    requestAnimationFrame(uploadCanvas2DToWebGLTexture);
 }
 
 function onCompletedRun() {
-    count = MAX_COUNT;
 }
 
 window.onload = function () {