<!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>[214951] trunk</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/214951">214951</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-05 10:31:37 -0700 (Wed, 05 Apr 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Deprecate and remove URL.createObjectURL(mediastream)
https://bugs.webkit.org/show_bug.cgi?id=167518
&lt;rdar://problem/31149607&gt;

Patch by Youenn Fablet &lt;youenn@apple.com&gt; on 2017-04-05
Reviewed by Eric Carlson.

Source/WebCore:

Covered by updated tests.

* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* Modules/mediastream/DOMURLMediaStream.cpp: Removed.
* Modules/mediastream/DOMURLMediaStream.h: Removed.
* Modules/mediastream/DOMURLMediaStream.idl: Removed.
* WebCore.xcodeproj/project.pbxproj:
* html/DOMURL.idl:

LayoutTests:

* fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html:
* fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html:
* fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html:
* fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt:
* fast/mediastream/MediaStream-video-element-displays-buffer.html:
* fast/mediastream/MediaStream-video-element-expected.txt:
* fast/mediastream/MediaStream-video-element-track-stop-expected.txt:
* fast/mediastream/MediaStream-video-element-track-stop.html:
* fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt:
* fast/mediastream/MediaStream-video-element-video-tracks-disabled.html:
* fast/mediastream/MediaStream-video-element.html:
* fast/mediastream/resources/getUserMedia-helper.js:
(setupVideoElementWithStream):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStream2deventshtml">trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html</a></li>
<li><a href="#trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStreamrequestframeeventshtml">trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html</a></li>
<li><a href="#trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStreamwebgleventshtml">trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferhtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementtrackstopexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementtrackstophtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledhtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamvideoelementhtml">trunk/LayoutTests/fast/mediastream/MediaStream-video-element.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamresourcesgetUserMediahelperjs">trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlDOMURLidl">trunk/Source/WebCore/html/DOMURL.idl</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamh">trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamidl">trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/ChangeLog        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-04-05  Youenn Fablet  &lt;youenn@apple.com&gt;
+
+        Deprecate and remove URL.createObjectURL(mediastream)
+        https://bugs.webkit.org/show_bug.cgi?id=167518
+        &lt;rdar://problem/31149607&gt;
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html:
+        * fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html:
+        * fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html:
+        * fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt:
+        * fast/mediastream/MediaStream-video-element-displays-buffer.html:
+        * fast/mediastream/MediaStream-video-element-expected.txt:
+        * fast/mediastream/MediaStream-video-element-track-stop-expected.txt:
+        * fast/mediastream/MediaStream-video-element-track-stop.html:
+        * fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt:
+        * fast/mediastream/MediaStream-video-element-video-tracks-disabled.html:
+        * fast/mediastream/MediaStream-video-element.html:
+        * fast/mediastream/resources/getUserMedia-helper.js:
+        (setupVideoElementWithStream):
+
</ins><span class="cx"> 2017-04-05  Javier Fernandez  &lt;jfernandez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Unreviewed tests gardening
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStream2deventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> 
</span><span class="cx">   var video = document.createElement('video');
</span><span class="cx">   try {
</span><del>-    video.src = window.URL.createObjectURL(stream);
</del><ins>+    video.srcObject = stream;
</ins><span class="cx">     testPassed('Plugged stream to video tag.');
</span><span class="cx">   } catch(e) {
</span><span class="cx">     testFailed('Exception plugging stream to &lt;video&gt;: ' + e);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStreamrequestframeeventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">   // var video = document.createElement('video');
</span><span class="cx">   var video = document.getElementById('v');
</span><span class="cx">   try {
</span><del>-    video.src = window.URL.createObjectURL(stream);
</del><ins>+    video.srcObject = stream;
</ins><span class="cx">     testPassed('Plugged stream to video tag.');
</span><span class="cx">   } catch(e) {
</span><span class="cx">     testFailed('Exception plugging stream to &lt;video&gt;: ' + e);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediacapturefromelementCanvasCaptureMediaStreamwebgleventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> 
</span><span class="cx">   var video = document.createElement('video');
</span><span class="cx">   try {
</span><del>-    video.src = window.URL.createObjectURL(stream);
</del><ins>+    video.srcObject = stream;
</ins><span class="cx">     testPassed('Plugged stream to video tag.');
</span><span class="cx">   } catch(e) {
</span><span class="cx">     testFailed('Exception plugging stream to &lt;video&gt;: ' + e);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> 
</span><span class="cx">  === checking pixels from front camera ===
</span><span class="cx"> PASS mediaDevices.getUserMedia generated a stream successfully.
</span><del>-videos[0].src = window.URL.createObjectURL(mediaStream)
</del><ins>+videos[0].srcObject = mediaStream
</ins><span class="cx"> videos[0].play()
</span><span class="cx"> PASS isPixelTransparent(buffer) is true
</span><span class="cx"> context.drawImage(videos[0], 0, 0, 680, 360)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> 
</span><span class="cx">  === checking pixels from back camera ===
</span><span class="cx"> PASS mediaDevices.getUserMedia generated a stream successfully.
</span><del>-videos[1].src = window.URL.createObjectURL(mediaStream)
</del><ins>+videos[1].srcObject = mediaStream
</ins><span class="cx"> videos[1].play()
</span><span class="cx"> PASS isPixelTransparent(buffer) is true
</span><span class="cx"> context.drawImage(videos[1], 0, 0, 680, 360)
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementdisplaysbufferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">     {
</span><span class="cx">         mediaStream = stream;
</span><span class="cx">         testPassed('mediaDevices.getUserMedia generated a stream successfully.');
</span><del>-        evalAndLog(`videos[${currentTest}].src = window.URL.createObjectURL(mediaStream)`);
</del><ins>+        evalAndLog(`videos[${currentTest}].srcObject = mediaStream`);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     function canplay()
</span><span class="lines">@@ -104,4 +104,4 @@
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
</span><span class="cx"> &lt;/body&gt;
</span><del>-&lt;/html&gt;
</del><span class="cx">\ No newline at end of file
</span><ins>+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> PASS mediaDevices.getUserMedia succeeded.
</span><span class="cx"> 
</span><span class="cx"> **** setup video element ****
</span><del>-video.src = window.URL.createObjectURL(mediaStream)
</del><ins>+video.srcObject = mediaStream
</ins><span class="cx"> Event 'loadedmetadata'
</span><span class="cx"> Event 'loadeddata'
</span><span class="cx"> Event 'canplay'
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> **** check video element ****
</span><span class="cx"> PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
</span><span class="cx"> PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
</span><del>-PASS video.src.indexOf(&quot;blob:&quot;) is 0
</del><span class="cx"> 
</span><span class="cx"> **** check video tracks ****
</span><span class="cx"> PASS video.videoTracks.length is 1
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementtrackstopexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> PASS mediaDevices.getUserMedia succeeded.
</span><span class="cx"> 
</span><span class="cx"> **** setup video element ****
</span><del>-video.src = window.URL.createObjectURL(mediaStream)
</del><ins>+video.srcObject = mediaStream
</ins><span class="cx"> Event 'loadedmetadata'
</span><span class="cx"> Event 'loadeddata'
</span><span class="cx"> Event 'canplay'
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> PASS video.ended is false
</span><span class="cx"> PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
</span><span class="cx"> PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
</span><del>-PASS video.src.indexOf(&quot;blob:&quot;) is 0
</del><span class="cx"> 
</span><span class="cx"> PASS video.videoTracks.length is 1
</span><span class="cx"> PASS video.videoTracks.selectedIndex is 0
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementtrackstophtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">         &lt;script&gt;
</span><span class="cx">             var video;
</span><span class="cx">             var mediaStream;
</span><del>-            
</del><ins>+
</ins><span class="cx">             function logEvent(element, eventName, func)
</span><span class="cx">             {
</span><span class="cx">                 function _eventCallback(evt)
</span><span class="lines">@@ -62,8 +62,7 @@
</span><span class="cx">                 shouldBe('video.ended', 'false');
</span><span class="cx">                 shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
</span><span class="cx">                 shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
</span><del>-                shouldBe('video.src.indexOf(&quot;blob:&quot;)', '0');
-                
</del><ins>+
</ins><span class="cx">                 debug(&quot;&quot;);
</span><span class="cx">                 shouldBe('video.videoTracks.length', '1');
</span><span class="cx">                 shouldBe('video.videoTracks.selectedIndex', '0');
</span><span class="lines">@@ -91,9 +90,9 @@
</span><span class="cx">             {
</span><span class="cx">                 mediaStream = stream;
</span><span class="cx">                 testPassed('mediaDevices.getUserMedia succeeded.');
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 debug(&quot;&lt;br&gt;**** setup video element ****&quot;);
</span><del>-                evalAndLog(&quot;video.src = window.URL.createObjectURL(mediaStream)&quot;);
</del><ins>+                evalAndLog(&quot;video.srcObject = mediaStream&quot;);
</ins><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             function start()
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledthenenabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS mediaDevices.getUserMedia generated a stream successfully.
</span><del>-video.src = window.URL.createObjectURL(mediaStream)
</del><ins>+video.srcObject = mediaStream
</ins><span class="cx"> 
</span><span class="cx">  === beginning round of pixel tests ===
</span><span class="cx"> PASS pixel was black.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementvideotracksdisabledhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     function setupStream(stream)
</span><span class="cx">     {
</span><span class="cx">         mediaStream = stream;
</span><del>-        video.src = window.URL.createObjectURL(mediaStream);
</del><ins>+        video.srcObject = mediaStream;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     function failedToSetupStream()
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamvideoelementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-video-element.html (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-video-element.html        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-video-element.html        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">         &lt;script&gt;
</span><span class="cx">             var video;
</span><span class="cx">             var mediaStream;
</span><del>-            
</del><ins>+
</ins><span class="cx">             function logEvent(element, eventName, func)
</span><span class="cx">             {
</span><span class="cx">                 function _eventCallback(evt)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx">                 debug(&quot;&lt;br&gt;**** check video element ****&quot;);
</span><span class="cx">                 shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
</span><span class="cx">                 shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
</span><del>-                shouldBe('video.src.indexOf(&quot;blob:&quot;)', '0');
</del><span class="cx"> 
</span><span class="cx">                 debug(&quot;&lt;br&gt;**** check video tracks ****&quot;);
</span><span class="cx">                 shouldBe('video.videoTracks.length', '1');
</span><span class="lines">@@ -93,9 +92,9 @@
</span><span class="cx">             {
</span><span class="cx">                 mediaStream = stream;
</span><span class="cx">                 testPassed('mediaDevices.getUserMedia succeeded.');
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 debug(&quot;&lt;br&gt;**** setup video element ****&quot;);
</span><del>-                evalAndLog(&quot;video.src = window.URL.createObjectURL(mediaStream)&quot;);
</del><ins>+                evalAndLog(&quot;video.srcObject = mediaStream&quot;);
</ins><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             function start()
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamresourcesgetUserMediahelperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -29,5 +29,5 @@
</span><span class="cx"> {
</span><span class="cx">     mediaStream = stream;
</span><span class="cx">     testPassed('mediaDevices.getUserMedia generated a stream successfully.');
</span><del>-    evalAndLog('video.src = window.URL.createObjectURL(mediaStream)');
-}
</del><span class="cx">\ No newline at end of file
</span><ins>+    evalAndLog('video.srcObject = mediaStream');
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/CMakeLists.txt        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -218,7 +218,6 @@
</span><span class="cx">     Modules/mediasource/VideoPlaybackQuality.idl
</span><span class="cx"> 
</span><span class="cx">     Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
</span><del>-    Modules/mediastream/DOMURLMediaStream.idl
</del><span class="cx">     Modules/mediastream/DoubleRange.idl
</span><span class="cx">     Modules/mediastream/LongRange.idl
</span><span class="cx">     Modules/mediastream/MediaDeviceInfo.idl
</span><span class="lines">@@ -944,7 +943,6 @@
</span><span class="cx">     Modules/mediasource/VideoPlaybackQuality.cpp
</span><span class="cx"> 
</span><span class="cx">     Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
</span><del>-    Modules/mediastream/DOMURLMediaStream.cpp
</del><span class="cx">     Modules/mediastream/MediaConstraintsImpl.cpp
</span><span class="cx">     Modules/mediastream/MediaDeviceInfo.cpp
</span><span class="cx">     Modules/mediastream/MediaDevices.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/ChangeLog        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-04-05  Youenn Fablet  &lt;youenn@apple.com&gt;
+
+        Deprecate and remove URL.createObjectURL(mediastream)
+        https://bugs.webkit.org/show_bug.cgi?id=167518
+        &lt;rdar://problem/31149607&gt;
+
+        Reviewed by Eric Carlson.
+
+        Covered by updated tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * Modules/mediastream/DOMURLMediaStream.cpp: Removed.
+        * Modules/mediastream/DOMURLMediaStream.h: Removed.
+        * Modules/mediastream/DOMURLMediaStream.idl: Removed.
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/DOMURL.idl:
+
</ins><span class="cx"> 2017-04-05  Alejandro G. Castro  &lt;alex@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Webrtc] Mock realtime sources factories should be static after r213941
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/DerivedSources.cpp        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -180,7 +180,6 @@
</span><span class="cx"> #include &quot;JSDOMTokenList.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMURL.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMURLMediaSource.cpp&quot;
</span><del>-#include &quot;JSDOMURLMediaStream.cpp&quot;
</del><span class="cx"> #include &quot;JSDOMWindow.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMWindowFetch.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMWindowIndexedDatabase.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/DerivedSources.make        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -162,7 +162,6 @@
</span><span class="cx">     $(WebCore)/Modules/mediasource/VideoPlaybackQuality.idl \
</span><span class="cx">     $(WebCore)/Modules/mediasource/VideoTrackMediaSource.idl \
</span><span class="cx">     $(WebCore)/Modules/mediastream/CanvasCaptureMediaStreamTrack.idl \
</span><del>-    $(WebCore)/Modules/mediastream/DOMURLMediaStream.idl \
</del><span class="cx">     $(WebCore)/Modules/mediastream/DoubleRange.idl \
</span><span class="cx">     $(WebCore)/Modules/mediastream/LongRange.idl \
</span><span class="cx">     $(WebCore)/Modules/mediastream/MediaDeviceInfo.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include &quot;config.h&quot;
-
-#if ENABLE(MEDIA_STREAM)
-
-#include &quot;DOMURLMediaStream.h&quot;
-
-#include &quot;DOMURL.h&quot;
-#include &quot;MediaStream.h&quot;
-#include &lt;wtf/MainThread.h&gt;
-
-namespace WebCore {
-
-String DOMURLMediaStream::createObjectURL(ScriptExecutionContext&amp; scriptExecutionContext, MediaStream&amp; stream)
-{
-    // Since WebWorkers cannot obtain Stream objects, we should be on the main thread.
-    ASSERT(isMainThread());
-    return DOMURL::createPublicURL(scriptExecutionContext, stream);
-}
-
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(MEDIA_STREAM)
-
-#include &lt;wtf/Forward.h&gt;
-
-namespace WebCore {
-
-class MediaStream;
-class ScriptExecutionContext;
-
-class DOMURLMediaStream {
-public:
-    static String createObjectURL(ScriptExecutionContext&amp;, MediaStream&amp;);
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamDOMURLMediaStreamidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// FIXME 169871: legacy or remove
-[
-    Conditional=MEDIA_STREAM
-]
-partial interface DOMURL {
-    [CallWith=ScriptExecutionContext] static DOMString createObjectURL(MediaStream stream);
-};
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -661,8 +661,6 @@
</span><span class="cx">                 15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
</span><span class="cx">                 15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C77092100D3CA8005BA267 /* JSValidityState.cpp */; };
</span><del>-                15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */; };
-                15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */; };
</del><span class="cx">                 163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */; };
</span><span class="cx">                 16EA24CEEAB2A60534218ACF /* MathMLOperatorDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4F72C653A64807A83E76FB8 /* MathMLOperatorDictionary.cpp */; };
</span><span class="cx">                 185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 185BCF260F3279CE000EA262 /* ThreadTimers.cpp */; };
</span><span class="lines">@@ -7497,8 +7495,6 @@
</span><span class="cx">                 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCConfiguration.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceServer.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceServer.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaStream.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMURLMediaStream.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDataChannelHandlerMock.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerMock.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 073794F719F5864E00E5A045 /* RTCNotifiersMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCNotifiersMock.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -8038,7 +8034,6 @@
</span><span class="cx">                 15C7708A100D3C6A005BA267 /* ValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidityState.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 15C77091100D3CA8005BA267 /* JSValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValidityState.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 15C77092100D3CA8005BA267 /* JSValidityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValidityState.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaStream.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontDataCoreText.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 185BCF260F3279CE000EA262 /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 185BCF270F3279CE000EA262 /* ThreadTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadTimers.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -15875,9 +15870,6 @@
</span><span class="cx">                                 41C7E1051E6A54360027B4DE /* CanvasCaptureMediaStreamTrack.cpp */,
</span><span class="cx">                                 41C7E1061E6A54360027B4DE /* CanvasCaptureMediaStreamTrack.h */,
</span><span class="cx">                                 41C7E1081E6AA37C0027B4DE /* CanvasCaptureMediaStreamTrack.idl */,
</span><del>-                                073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */,
-                                15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */,
-                                073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */,
</del><span class="cx">                                 93A806111E03B51C008A1F26 /* DoubleRange.h */,
</span><span class="cx">                                 93A806121E03B51C008A1F26 /* DoubleRange.idl */,
</span><span class="cx">                                 93A806131E03B51C008A1F26 /* LongRange.h */,
</span><span class="lines">@@ -26840,7 +26832,6 @@
</span><span class="cx">                                 76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */,
</span><span class="cx">                                 2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
</span><span class="cx">                                 CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
</span><del>-                                15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */,
</del><span class="cx">                                 1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
</span><span class="cx">                                 51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
</span><span class="cx">                                 5185FC751BB4C4E80012898F /* DOMWindowIndexedDatabase.h in Headers */,
</span><span class="lines">@@ -30815,7 +30806,6 @@
</span><span class="cx">                                 76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */,
</span><span class="cx">                                 2E37DFDA12DBAFB800A6B233 /* DOMURL.cpp in Sources */,
</span><span class="cx">                                 CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */,
</span><del>-                                15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */,
</del><span class="cx">                                 1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
</span><span class="cx">                                 517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */,
</span><span class="cx">                                 418C39561C8DAC7F0051C8A3 /* DOMWindowFetch.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlDOMURLidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/DOMURL.idl (214950 => 214951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/DOMURL.idl        2017-04-05 17:19:16 UTC (rev 214950)
+++ trunk/Source/WebCore/html/DOMURL.idl        2017-04-05 17:31:37 UTC (rev 214951)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">     JSGenerateToJSObject,
</span><span class="cx">     InterfaceName=URL,
</span><span class="cx">     ImplementationLacksVTable,
</span><del>-    ExportMacro=WEBCORE_EXPORT,
</del><ins>+    ExportMacro=WEBCORE_EXPORT
</ins><span class="cx"> ] interface DOMURL {
</span><span class="cx">     [SetterMayThrowException, URL] stringifier attribute USVString href;
</span><span class="cx">     readonly attribute USVString origin;
</span></span></pre>
</div>
</div>

</body>
</html>