Index: LayoutTests/fast/canvas/canvas-composite-video.html |
diff --git a/LayoutTests/fast/canvas/canvas-composite-image.html b/LayoutTests/fast/canvas/canvas-composite-video.html |
similarity index 58% |
copy from LayoutTests/fast/canvas/canvas-composite-image.html |
copy to LayoutTests/fast/canvas/canvas-composite-video.html |
index e3e9a58a37f813176f6f3fac7c123c5a0bb53e27..622e5faf3850a288a1a6e0e8818fdd164061aa69 100644 |
--- a/LayoutTests/fast/canvas/canvas-composite-image.html |
+++ b/LayoutTests/fast/canvas/canvas-composite-video.html |
@@ -3,18 +3,6 @@ |
<head> |
<title>Test drawImage(image) with canvas with different composite modes.</title> |
<script src="resources/canvas-composite-image-common.js"></script> |
- <script type="application/x-javascript"> |
- function drawImage(context, compositeIndex, alpha) { |
- context.globalCompositeOperation = compositeTypes[compositeIndex]; |
- if (alpha) |
- context.globalAlpha = 0.5; |
- var imageElement = document.getElementById('image'); |
- context.drawImage(imageElement, 10, 10); |
- } |
- |
- function setupTest() {} |
- |
- </script> |
<style type="text/css"> |
body { margin: 5px; font-family: arial,verdana,helvetica; background: #fff; } |
canvas { border: 1px solid #999; } |
@@ -29,19 +17,36 @@ |
table { border-collapse: collapse; } |
</style> |
</head> |
- <body onload="runTest();"> |
+ <body> |
<div>Test Results</div> |
<div><table id='outputtable'></table></div> |
- <div>Test Image</div> |
- <div><img id = "image" src="data:image/png;base64, |
- iVBORw0KGgoAAAANSUhEUgAAAJYAAAA8CAIAAAAL5NQ9AAAACXBIWXMAAAsTAAALEwEAmpwY |
- AAAAB3RJTUUH2woaBQc4oLEFpAAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeB |
- DhcAAACMSURBVHja7dNBEYAgFEVRPhHMYgAzUIsmVnFvB/fsoQb+ObfBmzMvxneW1D1vzz2w |
- FiEUQiFEKIRCKIQIhVAIhRChEAqhECIUQiEUQoRCKIRCiFAIhVAIEep3xTWTLzzu5oVCKIRC |
- iFAIhVAIEQqhEAohQiEUQiFEKIRCKIQIhVAIhRChEAqhECLUZi3VEwcBMGr1NgAAAABJRU5E |
- rkJggg== |
- "></div> |
- <div>Test Output</div> |
- <div id='output'></div> |
+ <div>Test Video</div> |
+ <div><video id="video" loop> |
+ <source src="resources/canvas_video.mp4" type='video/mp4' /> |
+ <source src="resources/canvas_video.webm" type='video/webm' /> |
+ <source src="resources/canvas_video.ogv" type='video/ogg' /> |
+ </video></div> |
+ <script type="application/x-javascript"> |
+ function drawImage(context, compositeIndex, alpha) { |
+ context.globalCompositeOperation = compositeTypes[compositeIndex]; |
+ if (alpha) |
+ context.globalAlpha = 0.5; |
+ var videoElement = document.getElementById('video'); |
+ context.drawImage(videoElement, 10, 10); |
+ } |
+ |
+ function setupTest() {} |
+ |
+ var video = document.getElementById("video"); |
+ video.addEventListener("playing", playVideo, true); |
+ video.play(); |
+ |
+ function playVideo() { |
+ video.removeEventListener("playing", playVideo, true); |
+ // We cannot read pixel after drawing a video because of SecurityError: |
+ // The canvas has been tainted by cross-origin data. |
+ runTest("dumpAsTextWithPixelResults") |
+ } |
+ </script> |
</body> |
</html> |