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

Wed Mar 17 18:39:33 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 3ac681eed642845ed2730413115fbeebd813ee5b
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 06:19:32 2010 +0000

    Added canvas perf demo for whatwg.
    
    * demos/canvas-perf: Added.
    * demos/canvas-perf/canvas.html: Added.
    * demos/canvas-perf/kraken.jpg: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 226ade3..31e8adc 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Added canvas perf demo for whatwg.
+
+        * demos/canvas-perf: Added.
+        * demos/canvas-perf/canvas.html: Added.
+        * demos/canvas-perf/kraken.jpg: Added.
+
 2010-03-09  Adam Roben  <aroben at apple.com>
 
         Add a link to the Contributors Meeting registration form in the
diff --git a/WebKitSite/demos/canvas-perf/canvas.html b/WebKitSite/demos/canvas-perf/canvas.html
new file mode 100644
index 0000000..bddf43d
--- /dev/null
+++ b/WebKitSite/demos/canvas-perf/canvas.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<body onload="doTest()">
+<pre id="output">
+</pre>
+<img src="kraken.jpg" id="image">
+<canvas id="original" width=3264 height=2448 style="width: 3264px; height: 2448px"></canvas>
+<canvas id="copy" width=3264 height=2448 style="width: 3264px; height: 2448px"></canvas>
+<canvas id="scaledUp" width=6528 height=4896 style="width: 6528px; height: 4896px"></canvas>
+<canvas id="scaledDown" width=1632 height=1224 style="width: 1632px; height: 1224px"></canvas>
+<canvas id="rotated" width=2448 height=3264 style="width: 2448px; height: 3264px; border: 1px solid red;"></canvas>
+<script>
+function doTest() {
+    var output = document.getElementById("output");
+    var image =  document.getElementById("image");
+    var original =  document.getElementById("original");
+
+    var copy =  document.getElementById("copy");
+    var scaledUp =  document.getElementById("scaledUp");
+    var scaledDown =  document.getElementById("scaledDown");
+    var rotated = document.getElementById("rotated");
+
+    original.getContext("2d").drawImage(image, 0, 0);
+
+    var startDate = new Date();
+    
+    var copyContext = copy.getContext("2d");
+    for (var i = 0; i < 2; ++i) {
+        copyContext.drawImage(original, 0, 0);
+    }
+
+    var time = (new Date()) - startDate;
+    output.innerHTML += "Direct image copy: " + (time/2) + "ms<br>";
+
+    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);
+    }
+
+    time = (new Date()) - startDate;
+    output.innerHTML += "Indirect copy with (via ImageData): " + (time/2) + "ms<br>";
+
+    startDate = new Date();
+    
+    var scaledUpContext = scaledUp.getContext("2d");
+    for (var i = 0; i < 2; ++i) {
+        scaledUpContext.drawImage(original, 0, 0, 6528, 4896);
+    }
+
+    time = (new Date()) - startDate;
+    output.innerHTML += "Copy with 2x scale: " + (time/2) + "ms<br>";
+
+    startDate = new Date();
+    var scaledDownContext = scaledDown.getContext("2d");
+    for (var i = 0; i < 2; ++i) {
+        scaledDownContext.drawImage(original, 0, 0, 1632, 1224);
+    }
+
+    time = (new Date()) - startDate;
+    output.innerHTML += "Copy with 0.5x scale: " + (time/2) + "ms<br>";
+
+    startDate = new Date();
+    var rotatedContext = rotated.getContext("2d");
+    rotatedContext.rotate(Math.PI / 2);
+
+    for (var i = 0; i < 2; ++i) {
+        rotatedContext.drawImage(original, 0, -original.height);
+    }
+
+    time = (new Date()) - startDate;
+    output.innerHTML += "Copy with rotate:" + (time/2) + "ms<br>";
+}
+</script>
+
+</body>
diff --git a/WebKitSite/demos/canvas-perf/kraken.jpg b/WebKitSite/demos/canvas-perf/kraken.jpg
new file mode 100644
index 0000000..5bf0c32
Binary files /dev/null and b/WebKitSite/demos/canvas-perf/kraken.jpg differ

-- 
WebKit Debian packaging

