<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215252] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215252">215252</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-11 15:47:49 -0700 (Tue, 11 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK1] Add captureStream test with webrtc
https://bugs.webkit.org/show_bug.cgi?id=170746
Patch by Youenn Fablet <youenn@apple.com> on 2017-04-11
Reviewed by Eric Carlson.
* platform/mac-wk1/TestExpectations: Activating this new test in WK1.
* webrtc/captureCanvas-webrtc-expected.txt: Added.
* webrtc/captureCanvas-webrtc.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtccaptureCanvaswebrtcexpectedtxt">trunk/LayoutTests/webrtc/captureCanvas-webrtc-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtccaptureCanvaswebrtchtml">trunk/LayoutTests/webrtc/captureCanvas-webrtc.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215251 => 215252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-04-11 22:47:26 UTC (rev 215251)
+++ trunk/LayoutTests/ChangeLog        2017-04-11 22:47:49 UTC (rev 215252)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2017-04-11 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [WK1] Add captureStream test with webrtc
+ https://bugs.webkit.org/show_bug.cgi?id=170746
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac-wk1/TestExpectations: Activating this new test in WK1.
+ * webrtc/captureCanvas-webrtc-expected.txt: Added.
+ * webrtc/captureCanvas-webrtc.html: Added.
+
+2017-04-11 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> Migrating webrtc tests to latest API
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170709
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (215251 => 215252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2017-04-11 22:47:26 UTC (rev 215251)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2017-04-11 22:47:49 UTC (rev 215252)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> webrtc [ Skip ]
</span><span class="cx"> webrtc/datachannel [ Pass ]
</span><span class="cx"> webrtc/datachannel/bufferedAmountLowThreshold.html [ Failure ]
</span><ins>+webrtc/captureCanvas-webrtc.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> # These tests test the Shadow DOM based HTML form validation UI but Mac WK1 is using native dialogs instead.
</span><span class="cx"> fast/forms/validation-message-on-listbox.html
</span></span></pre></div>
<a id="trunkLayoutTestswebrtccaptureCanvaswebrtcexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/captureCanvas-webrtc-expected.txt (0 => 215252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/captureCanvas-webrtc-expected.txt         (rev 0)
+++ trunk/LayoutTests/webrtc/captureCanvas-webrtc-expected.txt        2017-04-11 22:47:49 UTC (rev 215252)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+
+PASS captureStream with webrtc
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtccaptureCanvaswebrtchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/captureCanvas-webrtc.html (0 => 215252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/captureCanvas-webrtc.html         (rev 0)
+++ trunk/LayoutTests/webrtc/captureCanvas-webrtc.html        2017-04-11 22:47:49 UTC (rev 215252)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head>
+ <canvas id="canvas1" width=100px height=100px></canvas>
+ <video id="video" autoplay width=100px height=100px></video>
+ <canvas id="canvas2" width=100px height=100px></canvas>
+ <script src="../resources/testharness.js"></script>
+ <script src="../resources/testharnessreport.js"></script>
+ <script src ="routines.js"></script>
+ <script>
+
+var canvas1 = document.getElementById("canvas1");
+var canvas2 = document.getElementById("canvas2");
+var video = document.getElementById("video");
+
+var color = "green";
+function printRectangle()
+{
+ var context = canvas1.getContext("2d");
+ context.fillStyle = color;
+ context.fillRect(0, 0, 100, 100);
+ setTimeout(printRectangle, 50);
+}
+
+promise_test((test) => {
+ printRectangle();
+ return new Promise((resolve, reject) => {
+ createConnections((firstConnection) => {
+ var stream = canvas1.captureStream();
+ firstConnection.addTrack(stream.getVideoTracks()[0], stream);
+ }, (secondConnection) => {
+ secondConnection.ontrack = (trackEvent) => {
+ assert_true(trackEvent.track instanceof MediaStreamTrack);
+ assert_true(trackEvent.receiver instanceof RTCRtpReceiver);
+ assert_true(Array.isArray(trackEvent.streams), "Array.isArray() should return true");
+ assert_true(Object.isFrozen(trackEvent.streams), "Object.isFrozen() should return true");
+ resolve(trackEvent.streams[0]);
+ };
+ });
+ setTimeout(() => reject("Test timed out"), 5000);
+ }).then((stream) => {
+ video.srcObject = stream;
+ return video.play();
+ }).then(() => {
+ return waitFor(100);
+ }).then(() => {
+ canvas2.getContext("2d").drawImage(video, 0 ,0);
+ assert_array_equals(canvas2.getContext("2d").getImageData(20 ,20, 60, 60), canvas1.getContext("2d").getImageData(20, 20, 60, 60));
+ }).then(() => {
+ color = "red";
+ return waitFor(300);
+ }).then(() => {
+ canvas2.getContext("2d").drawImage(video, 0 ,0);
+ assert_array_equals(canvas2.getContext("2d").getImageData(20 ,20, 60, 60), canvas1.getContext("2d").getImageData(20, 20, 60, 60));
+ }).then(() => {
+ color = "green";
+ return waitFor(300);
+ }).then(() => {
+ canvas2.getContext("2d").drawImage(video, 0 ,0);
+ assert_array_equals(canvas2.getContext("2d").getImageData(20 ,20, 60, 60), canvas1.getContext("2d").getImageData(20, 20, 60, 60));
+ });
+}, "captureStream with webrtc");
+ </script>
+ </head>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>