<!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>[192484] 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/192484">192484</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-11-16 14:04:32 -0800 (Mon, 16 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enable passing tests in LayoutTests/fast/mediastream
https://bugs.webkit.org/show_bug.cgi?id=151311

Reviewed by Eric Carlson.

Mark LayoutTests/fast/mediastream as passing by default, and skip only the tests that currently
fail. Also unprefixes some tests that fail due to invoking the webkitMediaStream constructor
rather than MediaStream. As we implement more functionality in the Media Stream and Capture
spec, we will remove entries from the fast/mediastream section under Mac TestExpectations.

* fast/events/constructors/media-stream-event-constructor.html:
* fast/mediastream/MediaStream-add-ended-tracks.html:
* fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html:
* fast/mediastream/MediaStream-construct-with-ended-tracks.html:
* fast/mediastream/MediaStreamConstructor-expected.txt:
* fast/mediastream/MediaStreamConstructor.html:
* fast/mediastream/MediaStreamTrack-onended.html:
* platform/mac-wk1/TestExpectations:
* platform/mac/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsconstructorsmediastreameventconstructorhtml">trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddendedtrackshtml">trunk/LayoutTests/fast/mediastream/MediaStream-add-ended-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamaddtrackstoinactivestreamhtml">trunk/LayoutTests/fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamconstructwithendedtrackshtml">trunk/LayoutTests/fast/mediastream/MediaStream-construct-with-ended-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamConstructorexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStreamConstructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamConstructorhtml">trunk/LayoutTests/fast/mediastream/MediaStreamConstructor.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamTrackonendedhtml">trunk/LayoutTests/fast/mediastream/MediaStreamTrack-onended.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/ChangeLog        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-16  Wenson Hsieh  &lt;wenson_hsieh@apple.com&gt;
+
+        Enable passing tests in LayoutTests/fast/mediastream
+        https://bugs.webkit.org/show_bug.cgi?id=151311
+
+        Reviewed by Eric Carlson.
+
+        Mark LayoutTests/fast/mediastream as passing by default, and skip only the tests that currently
+        fail. Also unprefixes some tests that fail due to invoking the webkitMediaStream constructor
+        rather than MediaStream. As we implement more functionality in the Media Stream and Capture
+        spec, we will remove entries from the fast/mediastream section under Mac TestExpectations.
+
+        * fast/events/constructors/media-stream-event-constructor.html:
+        * fast/mediastream/MediaStream-add-ended-tracks.html:
+        * fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html:
+        * fast/mediastream/MediaStream-construct-with-ended-tracks.html:
+        * fast/mediastream/MediaStreamConstructor-expected.txt:
+        * fast/mediastream/MediaStreamConstructor.html:
+        * fast/mediastream/MediaStreamTrack-onended.html:
+        * platform/mac-wk1/TestExpectations:
+        * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-11-16  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Null-pointer dereference in WebCore::firstEditablePositionAfterPositionInRoot
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsconstructorsmediastreameventconstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> description(&quot;This tests the constructor for the MediaStreamEvent DOM class.&quot;);
</span><span class="cx"> 
</span><span class="cx"> var testObject = {nyannyan: 123};
</span><del>-var mediaStream = new webkitMediaStream();
</del><ins>+var mediaStream = new MediaStream();
</ins><span class="cx"> 
</span><span class="cx"> // No initializer is passed.
</span><span class="cx"> shouldBe(&quot;new MediaStreamEvent('eventType').bubbles&quot;, &quot;false&quot;);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddendedtrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-ended-tracks.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-ended-tracks.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-ended-tracks.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">                 shouldBeEqualToString('audioTrack.readyState', 'ended');
</span><span class="cx"> 
</span><span class="cx">                 debug(&quot;*** construct new 'empty' stream2&quot;)
</span><del>-                stream2 = new webkitMediaStream();
</del><ins>+                stream2 = new MediaStream();
</ins><span class="cx">                 shouldBe('stream2.getTracks().length', '0');
</span><span class="cx">                 shouldBe('stream2.active', 'false');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamaddtrackstoinactivestreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-add-tracks-to-inactive-stream.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> 
</span><span class="cx">             function createStreamAndAddTracks()
</span><span class="cx">             {
</span><del>-                stream2 = new webkitMediaStream();
</del><ins>+                stream2 = new MediaStream();
</ins><span class="cx">                 debug(&quot;MediaStream without tracks created.&quot;);
</span><span class="cx">                 shouldBe('stream2.getAudioTracks().length', '0');
</span><span class="cx">                 audioTrack = stream1.getAudioTracks()[0];
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamconstructwithendedtrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-construct-with-ended-tracks.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-construct-with-ended-tracks.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-construct-with-ended-tracks.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx">                 var tracksArray = [];
</span><span class="cx">                 tracksArray.push(videoTrack);
</span><span class="cx">                 tracksArray.push(audioTrack);
</span><del>-                newMediaStream = new webkitMediaStream(tracksArray);
</del><ins>+                newMediaStream = new MediaStream(tracksArray);
</ins><span class="cx"> 
</span><span class="cx">                 shouldEvaluateTo('newMediaStream.active', false);
</span><span class="cx">                 shouldNotBe('mediaStream.id', 'newMediaStream.id');
</span><span class="cx"> 
</span><del>-                mediaStreamCopy = new webkitMediaStream(newMediaStream);
</del><ins>+                mediaStreamCopy = new MediaStream(newMediaStream);
</ins><span class="cx">                 shouldEvaluateTo('mediaStreamCopy.active', false);
</span><span class="cx">                 shouldNotBe('mediaStreamCopy.id', 'newMediaStream.id');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamConstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamConstructor-expected.txt (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamConstructor-expected.txt        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamConstructor-expected.txt        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Tests webkitMediaStream.
</del><ins>+Tests MediaStream.
</ins><span class="cx"> 
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="lines">@@ -6,75 +6,75 @@
</span><span class="cx"> PASS Got local stream.
</span><span class="cx"> PASS localStream.getAudioTracks().length is 1
</span><span class="cx"> PASS localStream.getVideoTracks().length is 1
</span><del>-PASS typeof webkitMediaStream === 'object' is true
</del><ins>+PASS typeof MediaStream === 'object' is true
</ins><span class="cx"> PASS checkIdAttribute(localStream.id) is true
</span><del>-PASS new webkitMediaStream(document) threw exception TypeError: Type error.
-PASS new webkitMediaStream([document]) threw exception TypeError: Invalid Array element type.
-PASS new webkitMediaStream([stream.getAudioTracks()[0], document]) threw exception TypeError: Invalid Array element type.
-PASS new webkitMediaStream([null]) threw exception TypeError: Invalid Array element type.
-PASS new webkitMediaStream([undefined]) threw exception TypeError: Invalid Array element type.
-PASS new webkitMediaStream(null) threw exception TypeError: Type error.
-PASS new webkitMediaStream(undefined) threw exception TypeError: Type error.
</del><ins>+PASS new MediaStream(document) threw exception TypeError: Type error.
+PASS new MediaStream([document]) threw exception TypeError: Invalid Array element type.
+PASS new MediaStream([stream.getAudioTracks()[0], document]) threw exception TypeError: Invalid Array element type.
+PASS new MediaStream([null]) threw exception TypeError: Invalid Array element type.
+PASS new MediaStream([undefined]) threw exception TypeError: Invalid Array element type.
+PASS new MediaStream(null) threw exception TypeError: Type error.
+PASS new MediaStream(undefined) threw exception TypeError: Type error.
</ins><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream()&quot;
</del><ins>+*** testing &quot;new MediaStream()&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream([])&quot;
</del><ins>+*** testing &quot;new MediaStream([])&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream(stream)&quot;
</del><ins>+*** testing &quot;new MediaStream(stream)&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream([stream.getAudioTracks()[0]])&quot;
</del><ins>+*** testing &quot;new MediaStream([stream.getAudioTracks()[0]])&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream([stream.getVideoTracks()[0]])&quot;
</del><ins>+*** testing &quot;new MediaStream([stream.getVideoTracks()[0]])&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream([stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;
</del><ins>+*** testing &quot;new MediaStream([stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span><span class="cx"> 
</span><del>-*** testing &quot;new webkitMediaStream([stream.getVideoTracks()[0], stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;
</del><ins>+*** testing &quot;new MediaStream([stream.getVideoTracks()[0], stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;
</ins><span class="cx"> PASS Stream constructed
</span><del>-PASS [object webkitMediaStream] is non-null.
-PASS [object webkitMediaStream] is defined.
-PASS newStream.constructor.toString() is '[object webkitMediaStreamConstructor]'
</del><ins>+PASS [object MediaStream] is non-null.
+PASS [object MediaStream] is defined.
+PASS newStream.constructor.toString() is '[object MediaStreamConstructor]'
</ins><span class="cx"> PASS newStream.getAudioTracks().length is nAudio
</span><span class="cx"> PASS newStream.getVideoTracks().length is nVideo
</span><span class="cx"> PASS checkIdAttribute(newStream.id) is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamConstructorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamConstructor.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamConstructor.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamConstructor.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">         &lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
</span><span class="cx">         &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
</span><span class="cx">         &lt;script&gt;
</span><del>-            description(&quot;Tests webkitMediaStream.&quot;);
</del><ins>+            description(&quot;Tests MediaStream.&quot;);
</ins><span class="cx"> 
</span><span class="cx">             var undefined;
</span><span class="cx">             var stream;
</span><span class="lines">@@ -47,30 +47,30 @@
</span><span class="cx">                 shouldBe('localStream.getAudioTracks().length', '1');
</span><span class="cx">                 shouldBe('localStream.getVideoTracks().length', '1');
</span><span class="cx"> 
</span><del>-                shouldBeTrue(&quot;typeof webkitMediaStream === 'object'&quot;);
</del><ins>+                shouldBeTrue(&quot;typeof MediaStream === 'object'&quot;);
</ins><span class="cx">                 shouldBeTrue('checkIdAttribute(localStream.id)');
</span><span class="cx">                 testConstructor(localStream);
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             function testConstructor(s) {
</span><span class="cx">                 stream = s;
</span><del>-                shouldThrow('new webkitMediaStream(document)');
-                shouldThrow('new webkitMediaStream([document])');
-                shouldThrow('new webkitMediaStream([stream.getAudioTracks()[0], document])');
-                shouldThrow('new webkitMediaStream([null])');
-                shouldThrow('new webkitMediaStream([undefined])');
-                shouldThrow('new webkitMediaStream(null)');
-                shouldThrow('new webkitMediaStream(undefined)');
</del><ins>+                shouldThrow('new MediaStream(document)');
+                shouldThrow('new MediaStream([document])');
+                shouldThrow('new MediaStream([stream.getAudioTracks()[0], document])');
+                shouldThrow('new MediaStream([null])');
+                shouldThrow('new MediaStream([undefined])');
+                shouldThrow('new MediaStream(null)');
+                shouldThrow('new MediaStream(undefined)');
</ins><span class="cx"> 
</span><del>-                verifyStream(&quot;new webkitMediaStream()&quot;, 0, 0);
-                verifyStream(&quot;new webkitMediaStream([])&quot;, 0, 0);
</del><ins>+                verifyStream(&quot;new MediaStream()&quot;, 0, 0);
+                verifyStream(&quot;new MediaStream([])&quot;, 0, 0);
</ins><span class="cx"> 
</span><del>-                verifyStream(&quot;new webkitMediaStream(stream)&quot;, s.getAudioTracks().length, s.getVideoTracks().length);
</del><ins>+                verifyStream(&quot;new MediaStream(stream)&quot;, s.getAudioTracks().length, s.getVideoTracks().length);
</ins><span class="cx"> 
</span><del>-                verifyStream(&quot;new webkitMediaStream([stream.getAudioTracks()[0]])&quot;, 1, 0);
-                verifyStream(&quot;new webkitMediaStream([stream.getVideoTracks()[0]])&quot;, 0, 1);
-                verifyStream(&quot;new webkitMediaStream([stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;, 1, 1);
-                verifyStream(&quot;new webkitMediaStream([stream.getVideoTracks()[0], stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;, 1, 1);
</del><ins>+                verifyStream(&quot;new MediaStream([stream.getAudioTracks()[0]])&quot;, 1, 0);
+                verifyStream(&quot;new MediaStream([stream.getVideoTracks()[0]])&quot;, 0, 1);
+                verifyStream(&quot;new MediaStream([stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;, 1, 1);
+                verifyStream(&quot;new MediaStream([stream.getVideoTracks()[0], stream.getAudioTracks()[0], stream.getVideoTracks()[0]])&quot;, 1, 1);
</ins><span class="cx"> 
</span><span class="cx">                 finishJSTest();
</span><span class="cx">             }
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">                 testPassed('Stream constructed');
</span><span class="cx">                 shouldBeNonNull(newStream);
</span><span class="cx">                 shouldBeDefined(newStream);
</span><del>-                shouldBe(&quot;newStream.constructor.toString()&quot;, &quot;'[object webkitMediaStreamConstructor]'&quot;);
</del><ins>+                shouldBe(&quot;newStream.constructor.toString()&quot;, &quot;'[object MediaStreamConstructor]'&quot;);
</ins><span class="cx">                 shouldBe('newStream.getAudioTracks().length', 'nAudio');
</span><span class="cx">                 shouldBe('newStream.getVideoTracks().length', 'nVideo');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamTrackonendedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamTrack-onended.html (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamTrack-onended.html        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamTrack-onended.html        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">             function gotStream2(s) {
</span><span class="cx">                 debug(&quot;&quot;);
</span><span class="cx">                 testPassed('gotStream2 was called.');
</span><del>-                stream = new webkitMediaStream(s);
</del><ins>+                stream = new MediaStream(s);
</ins><span class="cx">                 track = stream.getAudioTracks()[0];
</span><span class="cx">                 trackClone = track.clone();
</span><span class="cx">                 shouldBeFalse('track.readyState == &quot;ended&quot;');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/platform/mac/TestExpectations        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -149,11 +149,35 @@
</span><span class="cx"> # X-Content-Type-Options (ENABLE_NOSNIFF) is not enabled.
</span><span class="cx"> webkit.org/b/136452 http/tests/security/contentTypeOptions
</span><span class="cx"> 
</span><del>-# Media Stream API is not yet enabled.
-fast/mediastream
-fast/events/constructors/media-stream-event-constructor.html
-http/tests/media/media-stream
</del><ins>+# Media Stream API is not fully supported.
+fast/mediastream/MediaStream-add-remove-tracks.html
+fast/mediastream/MediaStream-add-ended-tracks.html
+fast/mediastream/MediaStream-MediaElement-srcObject.html
+fast/mediastream/MediaStreamTrack-onended.html
+fast/mediastream/MediaStreamTrack.html
</ins><span class="cx"> 
</span><ins>+# WebRTC is not supported yet.
+fast/mediastream/RTCPeerConnection-AddRemoveStream.html
+fast/mediastream/RTCPeerConnection-createAnswer.html
+fast/mediastream/RTCPeerConnection-createOffer.html
+fast/mediastream/RTCPeerConnection-datachannel.html
+fast/mediastream/RTCPeerConnection-dtmf.html
+fast/mediastream/RTCPeerConnection-events.html
+fast/mediastream/RTCPeerConnection-getConfiguration.html
+fast/mediastream/RTCPeerConnection-have-local-offer.html
+fast/mediastream/RTCPeerConnection-have-local-pranswer.html
+fast/mediastream/RTCPeerConnection-have-remote-offer.html
+fast/mediastream/RTCPeerConnection-have-remote-pranswer.html
+fast/mediastream/RTCPeerConnection-ice.html
+fast/mediastream/RTCPeerConnection-localDescription.html
+fast/mediastream/RTCPeerConnection-onnegotiationneeded.html
+fast/mediastream/RTCPeerConnection-remoteDescription.html
+fast/mediastream/RTCPeerConnection-stats.html
+fast/mediastream/RTCPeerConnection-statsSelector.html
+fast/mediastream/RTCPeerConnection-stable.html
+fast/mediastream/RTCPeerConnection-state.html
+fast/mediastream/RTCPeerConnection.html
+
</ins><span class="cx"> # Asserts in debug.
</span><span class="cx"> [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (192483 => 192484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-11-16 20:50:55 UTC (rev 192483)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2015-11-16 22:04:32 UTC (rev 192484)
</span><span class="lines">@@ -86,6 +86,10 @@
</span><span class="cx"> # WK1 and WK2 mousemove events are subtly different in ways that break this test on WK1.
</span><span class="cx"> fast/events/ghostly-mousemoves-in-subframe.html [ Skip ]
</span><span class="cx"> 
</span><ins>+# Media Stream API testing is not supported for WK1 yet.
+fast/mediastream
+http/tests/media/media-stream
+
</ins><span class="cx"> # Disable snapshotting tests on WK1 only
</span><span class="cx"> plugins/snapshotting
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>