Make canvas perf tests run less than 6 sec.

PerformanceTests/Canvas/upload-webgl-to-texture.html

Index: PerformanceTests/Canvas/upload-webgl-to-texture.html
diff --git a/PerformanceTests/Canvas/upload-webgl-to-texture.html b/PerformanceTests/Canvas/upload-webgl-to-texture.html
index 984e01970ff690cd43c08843302ac683900dc016..f9420fee9cc37f9d060473ce823788f1a119400f 100644
--- a/PerformanceTests/Canvas/upload-webgl-to-texture.html
+++ b/PerformanceTests/Canvas/upload-webgl-to-texture.html
@@ -10,9 +10,9 @@ var destCanvas3D = document.createElement('canvas');
 var destCtx = destCanvas3D.getContext('experimental-webgl');
 if (!sourceCtx || !destCtx)
     PerfTestRunner.log("\nWebGL is not supported or enabled on this platform!\n");
-var MEASURE_DRAW_TIMES = 100;
-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) {
     sourceCanvas3D.width = width;
@@ -41,23 +41,25 @@ function uploadWebGLToWebGLTexture() {
 
         var start = PerfTestRunner.now();
 
-        for (var i = 0; i < MEASURE_DRAW_TIMES; i++) {
-            destCtx.texImage2D(destCtx.TEXTURE_2D, 0, destCtx.RGBA, destCtx.RGBA, destCtx.UNSIGNED_BYTE, sourceCanvas3D);
+        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++) {
+                destCtx.texImage2D(destCtx.TEXTURE_2D, 0, destCtx.RGBA, destCtx.RGBA, destCtx.UNSIGNED_BYTE, sourceCanvas3D);
+            }
+            count++;
         }
-        destCtx.readPixels(0, 0, 1, 1, sourceCtx.RGBA, sourceCtx.UNSIGNED_BYTE, new Uint8Array(4));
+        destCtx.finish();
+        var elapsedTime = PerfTestRunner.now() - start;
         destCtx.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(uploadWebGLToWebGLTexture);
+
+    requestAnimationFrame(uploadWebGLToWebGLTexture);
 }
 
 function onCompletedRun() {
-    count = MAX_COUNT;
 }
 
 window.onload = function () {