<!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>[195060] 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/195060">195060</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-01-14 10:18:19 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move streams/webkitGetUserMedia-shadowing-then.html to fast/mediastream
https://bugs.webkit.org/show_bug.cgi?id=152973
Reviewed by Brent Fulgham.
Moved the test, made it asynchronous to ensure that the error callback is called.
* fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt: Renamed from LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt.
* fast/mediastream/webkitGetUserMedia-shadowing-then.html: Renamed from LayoutTests/streams/webkitGetUserMedia-shadowing-then.html.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamwebkitGetUserMediashadowingthenexpectedtxt">trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamwebkitGetUserMediashadowingthenhtml">trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstreamswebkitGetUserMediashadowingthenexpectedtxt">trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstreamswebkitGetUserMediashadowingthenhtml">trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195059 => 195060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-14 17:50:12 UTC (rev 195059)
+++ trunk/LayoutTests/ChangeLog 2016-01-14 18:18:19 UTC (rev 195060)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Move streams/webkitGetUserMedia-shadowing-then.html to fast/mediastream
+ https://bugs.webkit.org/show_bug.cgi?id=152973
+
+ Reviewed by Brent Fulgham.
+
+ Moved the test, made it asynchronous to ensure that the error callback is called.
+
+ * fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt: Renamed from LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt.
+ * fast/mediastream/webkitGetUserMedia-shadowing-then.html: Renamed from LayoutTests/streams/webkitGetUserMedia-shadowing-then.html.
+
</ins><span class="cx"> 2016-01-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r195002.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamwebkitGetUserMediashadowingthenexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt (0 => 195060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then-expected.txt 2016-01-14 18:18:19 UTC (rev 195060)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamwebkitGetUserMediashadowingthenhtmlfromrev195059trunkLayoutTestsstreamswebkitGetUserMediashadowingthenhtml"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then.html (from rev 195059, trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then.html) (0 => 195060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/webkitGetUserMedia-shadowing-then.html 2016-01-14 18:18:19 UTC (rev 195060)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Shadowing then()</title>
+</head>
+<body>
+<!--
+This test verifies that the implementation of navigator.webkitGetUserMedia does not use public promise APIs.
+-->
+<p id="output"></p>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function endTest(testStatus) {
+ document.getElementById("output").textContent = testStatus;
+ testRunner.notifyDone();
+ }
+
+ // Shadow Promise.prototype.then
+ Promise.prototype.then = (function () {
+ const realThen = Promise.prototype.then;
+ return function () {
+ endTest("FAIL: Executed shadowed, public .then()");
+ }
+ })();
+
+ function gotUserMedia(mediaStream) {
+ endTest("FAIL: Got user media");
+ }
+
+ function userMediaError(error) {
+ endTest("PASS");
+ }
+
+ var options = { audio: false, video: false };
+ navigator.webkitGetUserMedia(options, gotUserMedia, userMediaError);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsstreamswebkitGetUserMediashadowingthenexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt (195059 => 195060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt 2016-01-14 17:50:12 UTC (rev 195059)
+++ trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then-expected.txt 2016-01-14 18:18:19 UTC (rev 195060)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-This test verifies that the implementation of navigator.webkitGetUserMedia does not use public promise APIs. Test passes if no message about a shadowed public .then() is printed.
-
</del></span></pre></div>
<a id="trunkLayoutTestsstreamswebkitGetUserMediashadowingthenhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then.html (195059 => 195060)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then.html 2016-01-14 17:50:12 UTC (rev 195059)
+++ trunk/LayoutTests/streams/webkitGetUserMedia-shadowing-then.html 2016-01-14 18:18:19 UTC (rev 195060)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Shadowing then()</title>
-</head>
-<body>
-This test verifies that the implementation of navigator.webkitGetUserMedia does not use public promise APIs. Test passes if no message about a shadowed public .then() is printed.
-<p id="output"></p>
-<script>
- // Shadow Promise.prototype.then
- Promise.prototype.then = (function () {
- const realThen = Promise.prototype.then;
- return function (successCallback, errorCallback) {
- document.getElementById("output").textContent = "Executed shadowed, public .then()";
- realThen.call(this, successCallback, errorCallback);
- }
- })();
-
- function gotUserMedia(mediaStream) {
- console.log("Got user media");
- }
-
- function userMediaError(error) {
- console.log(error);
- }
-
- var options = { audio: false, video: true };
- navigator.webkitGetUserMedia(options, gotUserMedia, userMediaError);
-
- if (window.testRunner) {
- testRunner.dumpAsText();
- }
-</script>
-</body>
-</html>
</del><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>