[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mjs at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 385e744485088c4ad7972296acbc49305d61c17b
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 05:32:03 2010 +0000

    Tweak canvas perf demo.
    
    * demos/canvas-perf/canvas.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56037 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 31e8adc..b8a06f3 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-15  Maciej Stachowiak  <mjs at apple.com>
+
+        Tweak canvas perf demo.
+
+        * demos/canvas-perf/canvas.html:
+
 2010-03-14  Maciej Stachowiak  <mjs at apple.com>
 
         Added canvas perf demo for whatwg.
diff --git a/WebKitSite/demos/canvas-perf/canvas.html b/WebKitSite/demos/canvas-perf/canvas.html
index bddf43d..39823f4 100644
--- a/WebKitSite/demos/canvas-perf/canvas.html
+++ b/WebKitSite/demos/canvas-perf/canvas.html
@@ -21,9 +21,15 @@ function doTest() {
 
     original.getContext("2d").drawImage(image, 0, 0);
 
+    var copyContext = copy.getContext("2d");
+    var originalContext = original.getContext("2d");
+    var scaledUpContext = scaledUp.getContext("2d");
+    var scaledDownContext = scaledDown.getContext("2d");
+    var rotatedContext = rotated.getContext("2d");
+
     var startDate = new Date();
     
-    var copyContext = copy.getContext("2d");
+    copyContext.globalCompositeOperation = "copy";
     for (var i = 0; i < 2; ++i) {
         copyContext.drawImage(original, 0, 0);
     }
@@ -33,7 +39,6 @@ function doTest() {
 
     startDate = new Date();
     
-    var originalContext = copy.getContext("2d");
     for (var i = 0; i < 2; ++i) {
         var imageData = originalContext.getImageData(0, 0, 3264, 2448);
         copyContext.putImageData(imageData, 0, 0);
@@ -44,7 +49,7 @@ function doTest() {
 
     startDate = new Date();
     
-    var scaledUpContext = scaledUp.getContext("2d");
+    scaledUpContext.globalCompositeOperation = "copy";
     for (var i = 0; i < 2; ++i) {
         scaledUpContext.drawImage(original, 0, 0, 6528, 4896);
     }
@@ -53,7 +58,7 @@ function doTest() {
     output.innerHTML += "Copy with 2x scale: " + (time/2) + "ms<br>";
 
     startDate = new Date();
-    var scaledDownContext = scaledDown.getContext("2d");
+    scaledDownContext.globalCompositeOperation = "copy";
     for (var i = 0; i < 2; ++i) {
         scaledDownContext.drawImage(original, 0, 0, 1632, 1224);
     }
@@ -62,7 +67,7 @@ function doTest() {
     output.innerHTML += "Copy with 0.5x scale: " + (time/2) + "ms<br>";
 
     startDate = new Date();
-    var rotatedContext = rotated.getContext("2d");
+    rotatedContext.globalCompositeOperation = "copy";
     rotatedContext.rotate(Math.PI / 2);
 
     for (var i = 0; i < 2; ++i) {

-- 
WebKit Debian packaging