Changeset 214951 in webkit


Ignore:
Timestamp:
Apr 5, 2017 10:31:37 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Deprecate and remove URL.createObjectURL(mediastream)
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):

Location:
trunk
Files:
3 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r214938 r214951  
     12017-04-05  Youenn Fablet  <youenn@apple.com>
     2
     3        Deprecate and remove URL.createObjectURL(mediastream)
     4        https://bugs.webkit.org/show_bug.cgi?id=167518
     5        <rdar://problem/31149607>
     6
     7        Reviewed by Eric Carlson.
     8
     9        * fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html:
     10        * fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html:
     11        * fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html:
     12        * fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt:
     13        * fast/mediastream/MediaStream-video-element-displays-buffer.html:
     14        * fast/mediastream/MediaStream-video-element-expected.txt:
     15        * fast/mediastream/MediaStream-video-element-track-stop-expected.txt:
     16        * fast/mediastream/MediaStream-video-element-track-stop.html:
     17        * fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt:
     18        * fast/mediastream/MediaStream-video-element-video-tracks-disabled.html:
     19        * fast/mediastream/MediaStream-video-element.html:
     20        * fast/mediastream/resources/getUserMedia-helper.js:
     21        (setupVideoElementWithStream):
     22
    1232017-04-05  Javier Fernandez  <jfernandez@igalia.com>
    224
  • trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-2d-events.html

    r213598 r214951  
    4444  var video = document.createElement('video');
    4545  try {
    46     video.src = window.URL.createObjectURL(stream);
     46    video.srcObject = stream;
    4747    testPassed('Plugged stream to video tag.');
    4848  } catch(e) {
  • trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-request-frame-events.html

    r213598 r214951  
    4848  var video = document.getElementById('v');
    4949  try {
    50     video.src = window.URL.createObjectURL(stream);
     50    video.srcObject = stream;
    5151    testPassed('Plugged stream to video tag.');
    5252  } catch(e) {
  • trunk/LayoutTests/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html

    r213598 r214951  
    4141  var video = document.createElement('video');
    4242  try {
    43     video.src = window.URL.createObjectURL(stream);
     43    video.srcObject = stream;
    4444    testPassed('Plugged stream to video tag.');
    4545  } catch(e) {
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer-expected.txt

    r214385 r214951  
    77 === checking pixels from front camera ===
    88PASS mediaDevices.getUserMedia generated a stream successfully.
    9 videos[0].src = window.URL.createObjectURL(mediaStream)
     9videos[0].srcObject = mediaStream
    1010videos[0].play()
    1111PASS isPixelTransparent(buffer) is true
     
    1818 === checking pixels from back camera ===
    1919PASS mediaDevices.getUserMedia generated a stream successfully.
    20 videos[1].src = window.URL.createObjectURL(mediaStream)
     20videos[1].srcObject = mediaStream
    2121videos[1].play()
    2222PASS isPixelTransparent(buffer) is true
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-displays-buffer.html

    r214385 r214951  
    7373        mediaStream = stream;
    7474        testPassed('mediaDevices.getUserMedia generated a stream successfully.');
    75         evalAndLog(`videos[${currentTest}].src = window.URL.createObjectURL(mediaStream)`);
     75        evalAndLog(`videos[${currentTest}].srcObject = mediaStream`);
    7676    }
    7777
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-expected.txt

    r214178 r214951  
    1010
    1111**** setup video element ****
    12 video.src = window.URL.createObjectURL(mediaStream)
     12video.srcObject = mediaStream
    1313Event 'loadedmetadata'
    1414Event 'loadeddata'
     
    2424PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
    2525PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
    26 PASS video.src.indexOf("blob:") is 0
    2726
    2827**** check video tracks ****
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop-expected.txt

    r212311 r214951  
    1010
    1111**** setup video element ****
    12 video.src = window.URL.createObjectURL(mediaStream)
     12video.srcObject = mediaStream
    1313Event 'loadedmetadata'
    1414Event 'loadeddata'
     
    2525PASS video.videoWidth is mediaStream.getVideoTracks()[0].getSettings().width
    2626PASS video.videoHeight is mediaStream.getVideoTracks()[0].getSettings().height
    27 PASS video.src.indexOf("blob:") is 0
    2827
    2928PASS video.videoTracks.length is 1
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-track-stop.html

    r212311 r214951  
    66            var video;
    77            var mediaStream;
    8            
     8
    99            function logEvent(element, eventName, func)
    1010            {
     
    6363                shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
    6464                shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
    65                 shouldBe('video.src.indexOf("blob:")', '0');
    66                
     65
    6766                debug("");
    6867                shouldBe('video.videoTracks.length', '1');
     
    9291                mediaStream = stream;
    9392                testPassed('mediaDevices.getUserMedia succeeded.');
    94                        
     93
    9594                debug("<br>**** setup video element ****");
    96                 evalAndLog("video.src = window.URL.createObjectURL(mediaStream)");
     95                evalAndLog("video.srcObject = mediaStream");
    9796            }
    9897
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled-then-enabled-expected.txt

    r213880 r214951  
    55
    66PASS mediaDevices.getUserMedia generated a stream successfully.
    7 video.src = window.URL.createObjectURL(mediaStream)
     7video.srcObject = mediaStream
    88
    99 === beginning round of pixel tests ===
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element-video-tracks-disabled.html

    r211025 r214951  
    5454    {
    5555        mediaStream = stream;
    56         video.src = window.URL.createObjectURL(mediaStream);
     56        video.srcObject = mediaStream;
    5757    }
    5858
  • trunk/LayoutTests/fast/mediastream/MediaStream-video-element.html

    r212311 r214951  
    66            var video;
    77            var mediaStream;
    8            
     8
    99            function logEvent(element, eventName, func)
    1010            {
     
    5959                shouldBe('video.videoWidth', 'mediaStream.getVideoTracks()[0].getSettings().width');
    6060                shouldBe('video.videoHeight', 'mediaStream.getVideoTracks()[0].getSettings().height');
    61                 shouldBe('video.src.indexOf("blob:")', '0');
    6261
    6362                debug("<br>**** check video tracks ****");
     
    9493                mediaStream = stream;
    9594                testPassed('mediaDevices.getUserMedia succeeded.');
    96                        
     95
    9796                debug("<br>**** setup video element ****");
    98                 evalAndLog("video.src = window.URL.createObjectURL(mediaStream)");
     97                evalAndLog("video.srcObject = mediaStream");
    9998            }
    10099
  • trunk/LayoutTests/fast/mediastream/resources/getUserMedia-helper.js

    r203739 r214951  
    3030    mediaStream = stream;
    3131    testPassed('mediaDevices.getUserMedia generated a stream successfully.');
    32     evalAndLog('video.src = window.URL.createObjectURL(mediaStream)');
     32    evalAndLog('video.srcObject = mediaStream');
    3333}
  • trunk/Source/WebCore/CMakeLists.txt

    r214658 r214951  
    219219
    220220    Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
    221     Modules/mediastream/DOMURLMediaStream.idl
    222221    Modules/mediastream/DoubleRange.idl
    223222    Modules/mediastream/LongRange.idl
     
    945944
    946945    Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp
    947     Modules/mediastream/DOMURLMediaStream.cpp
    948946    Modules/mediastream/MediaConstraintsImpl.cpp
    949947    Modules/mediastream/MediaDeviceInfo.cpp
  • trunk/Source/WebCore/ChangeLog

    r214949 r214951  
     12017-04-05  Youenn Fablet  <youenn@apple.com>
     2
     3        Deprecate and remove URL.createObjectURL(mediastream)
     4        https://bugs.webkit.org/show_bug.cgi?id=167518
     5        <rdar://problem/31149607>
     6
     7        Reviewed by Eric Carlson.
     8
     9        Covered by updated tests.
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.cpp:
     13        * DerivedSources.make:
     14        * Modules/mediastream/DOMURLMediaStream.cpp: Removed.
     15        * Modules/mediastream/DOMURLMediaStream.h: Removed.
     16        * Modules/mediastream/DOMURLMediaStream.idl: Removed.
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * html/DOMURL.idl:
     19
    1202017-04-05  Alejandro G. Castro  <alex@igalia.com>
    221
  • trunk/Source/WebCore/DerivedSources.cpp

    r214330 r214951  
    181181#include "JSDOMURL.cpp"
    182182#include "JSDOMURLMediaSource.cpp"
    183 #include "JSDOMURLMediaStream.cpp"
    184183#include "JSDOMWindow.cpp"
    185184#include "JSDOMWindowFetch.cpp"
  • trunk/Source/WebCore/DerivedSources.make

    r214420 r214951  
    163163    $(WebCore)/Modules/mediasource/VideoTrackMediaSource.idl \
    164164    $(WebCore)/Modules/mediastream/CanvasCaptureMediaStreamTrack.idl \
    165     $(WebCore)/Modules/mediastream/DOMURLMediaStream.idl \
    166165    $(WebCore)/Modules/mediastream/DoubleRange.idl \
    167166    $(WebCore)/Modules/mediastream/LongRange.idl \
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r214924 r214951  
    662662                15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
    663663                15C77094100D3CA8005BA267 /* JSValidityState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C77092100D3CA8005BA267 /* JSValidityState.cpp */; };
    664                 15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */; };
    665                 15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */; };
    666664                163E88F7118A39D200ED9231 /* SimpleFontDataCoreText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */; };
    667665                16EA24CEEAB2A60534218ACF /* MathMLOperatorDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4F72C653A64807A83E76FB8 /* MathMLOperatorDictionary.cpp */; };
     
    74987496                073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceServer.cpp; sourceTree = "<group>"; };
    74997497                073794EA19EE341E00E5A045 /* JSRTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceServer.h; sourceTree = "<group>"; };
    7500                 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaStream.cpp; sourceTree = "<group>"; };
    7501                 073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMURLMediaStream.idl; sourceTree = "<group>"; };
    75027498                073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDataChannelHandlerMock.cpp; sourceTree = "<group>"; };
    75037499                073794F419F5864E00E5A045 /* RTCDataChannelHandlerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandlerMock.h; sourceTree = "<group>"; };
     
    80398035                15C77091100D3CA8005BA267 /* JSValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValidityState.h; sourceTree = "<group>"; };
    80408036                15C77092100D3CA8005BA267 /* JSValidityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValidityState.cpp; sourceTree = "<group>"; };
    8041                 15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMURLMediaStream.h; sourceTree = "<group>"; };
    80428037                163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontDataCoreText.cpp; sourceTree = "<group>"; };
    80438038                185BCF260F3279CE000EA262 /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; };
     
    1587615871                                41C7E1061E6A54360027B4DE /* CanvasCaptureMediaStreamTrack.h */,
    1587715872                                41C7E1081E6AA37C0027B4DE /* CanvasCaptureMediaStreamTrack.idl */,
    15878                                 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */,
    15879                                 15FCC9FD1B4DF85600E72326 /* DOMURLMediaStream.h */,
    15880                                 073794EE19EE364200E5A045 /* DOMURLMediaStream.idl */,
    1588115873                                93A806111E03B51C008A1F26 /* DoubleRange.h */,
    1588215874                                93A806121E03B51C008A1F26 /* DoubleRange.idl */,
     
    2684126833                                2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
    2684226834                                CD9DE18217AAD6A400EA386D /* DOMURLMediaSource.h in Headers */,
    26843                                 15FCC9FE1B4DF85E00E72326 /* DOMURLMediaStream.h in Headers */,
    2684426835                                1403B99709EB13AF00797C7F /* DOMWindow.h in Headers */,
    2684526836                                51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */,
     
    3081630807                                2E37DFDA12DBAFB800A6B233 /* DOMURL.cpp in Sources */,
    3081730808                                CD9DE18117AAD6A400EA386D /* DOMURLMediaSource.cpp in Sources */,
    30818                                 15FCC9FC1B4DF7F200E72326 /* DOMURLMediaStream.cpp in Sources */,
    3081930809                                1403B99809EB13AF00797C7F /* DOMWindow.cpp in Sources */,
    3082030810                                517FBA1E151AB17C00B57959 /* DOMWindowExtension.cpp in Sources */,
  • trunk/Source/WebCore/html/DOMURL.idl

    r212193 r214951  
    3535    InterfaceName=URL,
    3636    ImplementationLacksVTable,
    37     ExportMacro=WEBCORE_EXPORT,
     37    ExportMacro=WEBCORE_EXPORT
    3838] interface DOMURL {
    3939    [SetterMayThrowException, URL] stringifier attribute USVString href;
Note: See TracChangeset for help on using the changeset viewer.