Deprecate and remove URL.createObjectURL(mediastream)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Apr 2017 17:31:37 +0000 (17:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Apr 2017 17:31:37 +0000 (17:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167518
<rdar://problem/31149607>

Patch by Youenn Fablet <youenn@apple.com> 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@214951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

22 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html
LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html
LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html
LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt
LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html
LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt
LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt
LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html
LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt
LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html
LayoutTests/fast/mediastream/MediaStream-video-element.html
LayoutTests/fast/mediastream/resources/getUserMedia-helper.js
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp [deleted file]
Source/WebCore/Modules/mediastream/DOMURLMediaStream.h [deleted file]
Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl [deleted file]
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/DOMURL.idl

index a65a6bf..45905b4 100644 (file)
@@ -1,3 +1,25 @@
+2017-04-05  Youenn Fablet  <youenn@apple.com>
+
+        Deprecate and remove URL.createObjectURL(mediastream)
+        https://bugs.webkit.org/show_bug.cgi?id=167518
+        <rdar://problem/31149607>
+
+        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):
+
 2017-04-05  Javier Fernandez  <jfernandez@igalia.com>
 
         [GTK] Unreviewed tests gardening
index 8ed45f4..40931a2 100644 (file)
@@ -43,7 +43,7 @@ function playMediaStream() {
 
   var video = document.createElement('video');
   try {
-    video.src = window.URL.createObjectURL(stream);
+    video.srcObject = stream;
     testPassed('Plugged stream to video tag.');
   } catch(e) {
     testFailed('Exception plugging stream to <video>: ' + e);
index e7af613..6a35877 100644 (file)
@@ -47,7 +47,7 @@ function playMediaStream() {
   // var video = document.createElement('video');
   var video = document.getElementById('v');
   try {
-    video.src = window.URL.createObjectURL(stream);
+    video.srcObject = stream;
     testPassed('Plugged stream to video tag.');
   } catch(e) {
     testFailed('Exception plugging stream to <video>: ' + e);
index fd619c8..93cb03d 100644 (file)
@@ -40,7 +40,7 @@ function playMediaStream() {
 
   var video = document.createElement('video');
   try {
-    video.src = window.URL.createObjectURL(stream);
+    video.srcObject = stream;
     testPassed('Plugged stream to video tag.');
   } catch(e) {
     testFailed('Exception plugging stream to <video>: ' + e);
index 3c315a9..fff5162 100644 (file)
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
  === checking pixels from front camera ===
 PASS mediaDevices.getUserMedia generated a stream successfully.
-videos[0].src = window.URL.createObjectURL(mediaStream)
+videos[0].srcObject = mediaStream
 videos[0].play()
 PASS isPixelTransparent(buffer) is true
 context.drawImage(videos[0], 0, 0, 680, 360)
@@ -17,7 +17,7 @@ PASS isPixelBlack(buffer) is true
 
  === checking pixels from back camera ===
 PASS mediaDevices.getUserMedia generated a stream successfully.
-videos[1].src = window.URL.createObjectURL(mediaStream)
+videos[1].srcObject = mediaStream
 videos[1].play()
 PASS isPixelTransparent(buffer) is true
 context.drawImage(videos[1], 0, 0, 680, 360)
index 33d5672..1fc7088 100644 (file)
@@ -72,7 +72,7 @@
     {
         mediaStream = stream;
         testPassed('mediaDevices.getUserMedia generated a stream successfully.');
-        evalAndLog(`videos[${currentTest}].src = window.URL.createObjectURL(mediaStream)`);
+        evalAndLog(`videos[${currentTest}].srcObject = mediaStream`);
     }
 
     function canplay()
 </script>
 <script src="../../resources/js-test-post.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>
index 5714550..8db2ee4 100644 (file)
@@ -9,7 +9,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS mediaDevices.getUserMedia succeeded.
 
 **** setup video element ****
-video.src = window.URL.createObjectURL(mediaStream)
+video.srcObject = mediaStream
 Event 'loadedmetadata'
 Event 'loadeddata'
 Event 'canplay'
@@ -23,7 +23,6 @@ video.pause()
 **** check video element ****
 PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
 PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
-PASS video.src.indexOf("blob:") is 0
 
 **** check video tracks ****
 PASS video.videoTracks.length is 1
index 48f915f..f047783 100644 (file)
@@ -9,7 +9,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS mediaDevices.getUserMedia succeeded.
 
 **** setup video element ****
-video.src = window.URL.createObjectURL(mediaStream)
+video.srcObject = mediaStream
 Event 'loadedmetadata'
 Event 'loadeddata'
 Event 'canplay'
@@ -24,7 +24,6 @@ video.pause()
 PASS video.ended is false
 PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
 PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
-PASS video.src.indexOf("blob:") is 0
 
 PASS video.videoTracks.length is 1
 PASS video.videoTracks.selectedIndex is 0
index e79825c..b2bdfe7 100644 (file)
@@ -5,7 +5,7 @@
         <script>
             var video;
             var mediaStream;
-            
+
             function logEvent(element, eventName, func)
             {
                 function _eventCallback(evt)
@@ -62,8 +62,7 @@
                 shouldBe('video.ended', 'false');
                 shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
                 shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
-                shouldBe('video.src.indexOf("blob:")', '0');
-                
+
                 debug("");
                 shouldBe('video.videoTracks.length', '1');
                 shouldBe('video.videoTracks.selectedIndex', '0');
@@ -91,9 +90,9 @@
             {
                 mediaStream = stream;
                 testPassed('mediaDevices.getUserMedia succeeded.');
-                        
+
                 debug("<br>**** setup video element ****");
-                evalAndLog("video.src = window.URL.createObjectURL(mediaStream)");
+                evalAndLog("video.srcObject = mediaStream");
             }
 
             function start()
index 0287ca4..012ecbb 100644 (file)
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS mediaDevices.getUserMedia generated a stream successfully.
-video.src = window.URL.createObjectURL(mediaStream)
+video.srcObject = mediaStream
 
  === beginning round of pixel tests ===
 PASS pixel was black.
index 8161800..111e82a 100644 (file)
@@ -53,7 +53,7 @@
     function setupStream(stream)
     {
         mediaStream = stream;
-        video.src = window.URL.createObjectURL(mediaStream);
+        video.srcObject = mediaStream;
     }
 
     function failedToSetupStream()
index 8183c40..e6eeb15 100644 (file)
@@ -5,7 +5,7 @@
         <script>
             var video;
             var mediaStream;
-            
+
             function logEvent(element, eventName, func)
             {
                 function _eventCallback(evt)
@@ -58,7 +58,6 @@
                 debug("<br>**** check video element ****");
                 shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
                 shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
-                shouldBe('video.src.indexOf("blob:")', '0');
 
                 debug("<br>**** check video tracks ****");
                 shouldBe('video.videoTracks.length', '1');
@@ -93,9 +92,9 @@
             {
                 mediaStream = stream;
                 testPassed('mediaDevices.getUserMedia succeeded.');
-                        
+
                 debug("<br>**** setup video element ****");
-                evalAndLog("video.src = window.URL.createObjectURL(mediaStream)");
+                evalAndLog("video.srcObject = mediaStream");
             }
 
             function start()
index 87fcf92..ce28cb6 100644 (file)
@@ -29,5 +29,5 @@ function setupVideoElementWithStream(stream)
 {
     mediaStream = stream;
     testPassed('mediaDevices.getUserMedia generated a stream successfully.');
-    evalAndLog('video.src = window.URL.createObjectURL(mediaStream)');
-}
\ No newline at end of file
+    evalAndLog('video.srcObject = mediaStream');
+}
index dd43cf3..f320572 100644 (file)
@@ -218,7 +218,6 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/mediasource/VideoPlaybackQuality.idl
 
     Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
-    Modules/mediastream/DOMURLMediaStream.idl
     Modules/mediastream/DoubleRange.idl
     Modules/mediastream/LongRange.idl
     Modules/mediastream/MediaDeviceInfo.idl
@@ -944,7 +943,6 @@ set(WebCore_SOURCES
     Modules/mediasource/VideoPlaybackQuality.cpp
 
     Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
-    Modules/mediastream/DOMURLMediaStream.cpp
     Modules/mediastream/MediaConstraintsImpl.cpp
     Modules/mediastream/MediaDeviceInfo.cpp
     Modules/mediastream/MediaDevices.cpp
index 82cfa4d..1011719 100644 (file)
@@ -1,3 +1,22 @@
+2017-04-05  Youenn Fablet  <youenn@apple.com>
+
+        Deprecate and remove URL.createObjectURL(mediastream)
+        https://bugs.webkit.org/show_bug.cgi?id=167518
+        <rdar://problem/31149607>
+
+        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:
+
 2017-04-05  Alejandro G. Castro  <alex@igalia.com>
 
         [Webrtc] Mock realtime sources factories should be static after r213941
index 33b7397..b7af1a1 100644 (file)
 #include "JSDOMTokenList.cpp"
 #include "JSDOMURL.cpp"
 #include "JSDOMURLMediaSource.cpp"
-#include "JSDOMURLMediaStream.cpp"
 #include "JSDOMWindow.cpp"
 #include "JSDOMWindowFetch.cpp"
 #include "JSDOMWindowIndexedDatabase.cpp"
index db04d14..a64a09f 100644 (file)
@@ -162,7 +162,6 @@ JS_BINDING_IDLS = \
     $(WebCore)/Modules/mediasource/VideoPlaybackQuality.idl \
     $(WebCore)/Modules/mediasource/VideoTrackMediaSource.idl \
     $(WebCore)/Modules/mediastream/CanvasCaptureMediaStreamTrack.idl \
-    $(WebCore)/Modules/mediastream/DOMURLMediaStream.idl \
     $(WebCore)/Modules/mediastream/DoubleRange.idl \
     $(WebCore)/Modules/mediastream/LongRange.idl \
     $(WebCore)/Modules/mediastream/MediaDeviceInfo.idl \
diff --git a/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp b/Source/WebCore/Modules/mediastream/DOMURLMediaStream.cpp
deleted file mode 100644 (file)
index 69dc730..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- * "AS IS" 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 "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "DOMURLMediaStream.h"
-
-#include "DOMURL.h"
-#include "MediaStream.h"
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-String DOMURLMediaStream::createObjectURL(ScriptExecutionContext& scriptExecutionContext, MediaStream& 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)
diff --git a/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h b/Source/WebCore/Modules/mediastream/DOMURLMediaStream.h
deleted file mode 100644 (file)
index 560f621..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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
- * "AS IS" 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 <wtf/Forward.h>
-
-namespace WebCore {
-
-class MediaStream;
-class ScriptExecutionContext;
-
-class DOMURLMediaStream {
-public:
-    static String createObjectURL(ScriptExecutionContext&, MediaStream&);
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
diff --git a/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl b/Source/WebCore/Modules/mediastream/DOMURLMediaStream.idl
deleted file mode 100644 (file)
index 593d670..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- * "AS IS" 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);
-};
index 996697a..0eea506 100644 (file)
                15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; settings = {ATTRIBUTES = (Private, ); }; };
                15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
                15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C77092100D3CA8005BA267 /* JSValidityState.cpp */; };
-               15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */; };
-               15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */; };
                163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */; };
                16EA24CEEAB2A60534218ACF /* MathMLOperatorDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4F72C653A64807A83E76FB8 /* MathMLOperatorDictionary.cpp */; };
                185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 185BCF260F3279CE000EA262 /* ThreadTimers.cpp */; };
                073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCConfiguration.h; sourceTree = "<group>"; };
                073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceServer.cpp; sourceTree = "<group>"; };
                073794EA19EE341E00E5A045 /* JSRTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceServer.h; sourceTree = "<group>"; };
-               073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaStream.cpp; sourceTree = "<group>"; };
-               073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMURLMediaStream.idl; sourceTree = "<group>"; };
                073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDataChannelHandlerMock.cpp; sourceTree = "<group>"; };
                073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerMock.h; sourceTree = "<group>"; };
                073794F719F5864E00E5A045 /* RTCNotifiersMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCNotifiersMock.cpp; sourceTree = "<group>"; };
                15C7708A100D3C6A005BA267 /* ValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidityState.h; sourceTree = "<group>"; };
                15C77091100D3CA8005BA267 /* JSValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValidityState.h; sourceTree = "<group>"; };
                15C77092100D3CA8005BA267 /* JSValidityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValidityState.cpp; sourceTree = "<group>"; };
-               15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaStream.h; sourceTree = "<group>"; };
                163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontDataCoreText.cpp; sourceTree = "<group>"; };
                185BCF260F3279CE000EA262 /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; };
                185BCF270F3279CE000EA262 /* ThreadTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadTimers.h; sourceTree = "<group>"; };
                                41C7E1051E6A54360027B4DE /* CanvasCaptureMediaStreamTrack.cpp */,
                                41C7E1061E6A54360027B4DE /* CanvasCaptureMediaStreamTrack.h */,
                                41C7E1081E6AA37C0027B4DE /* CanvasCaptureMediaStreamTrack.idl */,
-                               073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */,
-                               15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */,
-                               073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */,
                                93A806111E03B51C008A1F26 /* DoubleRange.h */,
                                93A806121E03B51C008A1F26 /* DoubleRange.idl */,
                                93A806131E03B51C008A1F26 /* LongRange.h */,
                                76FC2B0C12370DA0006A991A /* DOMTokenList.h in Headers */,
                                2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
                                CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
-                               15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */,
                                1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
                                51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
                                5185FC751BB4C4E80012898F /* DOMWindowIndexedDatabase.h in Headers */,
                                76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */,
                                2E37DFDA12DBAFB800A6B233 /* DOMURL.cpp in Sources */,
                                CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */,
-                               15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */,
                                1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
                                517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */,
                                418C39561C8DAC7F0051C8A3 /* DOMWindowFetch.cpp in Sources */,
index b278f26..7aa5be6 100644 (file)
@@ -34,7 +34,7 @@
     JSGenerateToJSObject,
     InterfaceName=URL,
     ImplementationLacksVTable,
-    ExportMacro=WEBCORE_EXPORT,
+    ExportMacro=WEBCORE_EXPORT
 ] interface DOMURL {
     [SetterMayThrowException, URL] stringifier attribute USVString href;
     readonly attribute USVString origin;