0

Remove deprecated usage of URL.createObjectURL with MediaStream

Only straightforward usage has been removed, identified with regexp
"URL.createObjectURL.*stream".

Bug: 800767
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I83d563080b2f534e7d9e3062b1633017dc9a01a8
Reviewed-on: https://chromium-review.googlesource.com/878741
Commit-Queue: Florent Castelli <orphis@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555378}
This commit is contained in:
Florent Castelli
2018-05-02 14:04:21 +00:00
committed by Commit Bot
parent 63ce1d9cfb
commit 703cf3e54c
23 changed files with 44 additions and 55 deletions
android_webview/javatests/src/org/chromium/android_webview/test
chrome
browser
resources
common
extensions
docs
examples
api
tabCapture
test
content/test/data/media
extensions/test/data/app_view/apitest/media_request
native_client_sdk/src/examples/api/video_encode
ppapi/examples
video_effects
video_encode
third_party
WebKit
blink
ui/webui/resources/cr_elements/chromeos/cr_picture

@ -50,11 +50,7 @@ public class MediaAccessPermissionRequestTest {
+ "var video = document.querySelector('video');" + "var video = document.querySelector('video');"
+ "function successCallback(stream) {" + "function successCallback(stream) {"
+ " window.document.title = 'grant';" + " window.document.title = 'grant';"
+ " if (window.URL) {" + " video.srcObject = stream;"
+ " video.src = window.URL.createObjectURL(stream);"
+ " } else {"
+ " video.src = stream;"
+ " }"
+ "}" + "}"
+ "function errorCallback(error){" + "function errorCallback(error){"
+ " window.document.title = 'deny';" + " window.document.title = 'deny';"

@ -231,9 +231,11 @@ cr.define('options', function() {
stopCamera: function() { stopCamera: function() {
this.cameraOnline = false; this.cameraOnline = false;
if (this.cameraVideo_) if (this.cameraVideo_)
this.cameraVideo_.src = ''; this.cameraVideo_.srcObject = null;
if (this.cameraStream_) if (this.cameraStream_) {
this.stopVideoTracks_(this.cameraStream_); this.stopVideoTracks_(this.cameraStream_);
this.cameraStream_ = null;
}
// Cancel any pending getUserMedia() checks. // Cancel any pending getUserMedia() checks.
this.cameraStartInProgress_ = false; this.cameraStartInProgress_ = false;
}, },
@ -258,7 +260,7 @@ cr.define('options', function() {
*/ */
handleCameraAvailable_: function(onAvailable, stream) { handleCameraAvailable_: function(onAvailable, stream) {
if (this.cameraStartInProgress_ && onAvailable()) { if (this.cameraStartInProgress_ && onAvailable()) {
this.cameraVideo_.src = URL.createObjectURL(stream); this.cameraVideo_.srcObject = stream;
this.cameraStream_ = stream; this.cameraStream_ = stream;
} else { } else {
this.stopVideoTracks_(stream); this.stopVideoTracks_(stream);

@ -20,7 +20,7 @@ function takeScreenshot(callback) {
video, 0, 0, video.videoWidth, video.videoHeight); video, 0, 0, video.videoWidth, video.videoHeight);
video.pause(); video.pause();
video.src = ''; video.srcObject = null;
screenshotStream.getVideoTracks()[0].stop(); screenshotStream.getVideoTracks()[0].stop();
screenshotStream = null; screenshotStream = null;
@ -39,7 +39,7 @@ function takeScreenshot(callback) {
function(stream) { function(stream) {
if (stream) { if (stream) {
screenshotStream = stream; screenshotStream = stream;
video.src = window.URL.createObjectURL(screenshotStream); video.srcObject = screenshotStream;
video.play(); video.play();
} }
}, },

@ -12,7 +12,7 @@ function shutdownReceiver() {
} }
var player = document.getElementById('player'); var player = document.getElementById('player');
player.src = ''; player.srcObject = null;
var tracks = window.currentStream.getTracks(); var tracks = window.currentStream.getTracks();
for (var i = 0; i < tracks.length; ++i) { for (var i = 0; i < tracks.length; ++i) {
tracks[i].stop(); tracks[i].stop();
@ -32,7 +32,7 @@ window.addEventListener('load', function() {
this.play(); this.play();
}); });
player.setAttribute('controls', '1'); player.setAttribute('controls', '1');
player.src = URL.createObjectURL(window.currentStream); player.srcObject = window.currentStream;
// Add onended event listeners. This detects when tab capture was shut down by // Add onended event listeners. This detects when tab capture was shut down by
// closing the tab being captured. // closing the tab being captured.

@ -102,7 +102,7 @@ function waitForExpectedColors(colorDeviation) {
this.video.width = width; this.video.width = width;
this.video.height = height; this.video.height = height;
this.video.addEventListener("error", chrome.test.fail); this.video.addEventListener("error", chrome.test.fail);
this.video.src = URL.createObjectURL(receiveStream); this.video.srcObject = receiveStream;
this.video.play(); this.video.play();
this.readbackCanvas = document.createElement("canvas"); this.readbackCanvas = document.createElement("canvas");
@ -144,7 +144,7 @@ function waitForExpectedColors(colorDeviation) {
// Destroy the video, which will disconnect the consumer of the // Destroy the video, which will disconnect the consumer of the
// MediaStream. // MediaStream.
this.video.removeEventListener("error", chrome.test.fail); this.video.removeEventListener("error", chrome.test.fail);
this.video.src = ''; this.video.srcObject = null;
this.video = null; this.video = null;
// Wait one second, then execute the second round of testing. This tests // Wait one second, then execute the second round of testing. This tests

@ -132,7 +132,7 @@ function waitForAnExpectedColor(
// If not yet done, plug the LocalMediaStream into the video element. // If not yet done, plug the LocalMediaStream into the video element.
if (!this.stream || this.stream != stream) { if (!this.stream || this.stream != stream) {
this.stream = stream; this.stream = stream;
video.src = URL.createObjectURL(stream); video.srcObject = stream;
video.play(); video.play();
} }

@ -44,7 +44,7 @@ function connectToVideoAndRunTest(stream) {
var start_time = new Date().getTime(); var start_time = new Date().getTime();
// Play the LocalMediaStream in the video element. // Play the LocalMediaStream in the video element.
video.src = URL.createObjectURL(stream); video.srcObject = stream;
video.play(); video.play();
var frame = 0; var frame = 0;

@ -158,7 +158,7 @@ function initialize() {
function gotStream(stream) { function gotStream(stream) {
trace('Received local stream'); trace('Received local stream');
localVideo.src = webkitURL.createObjectURL(stream); localVideo.srcObject = stream;
localStream = stream; localStream = stream;
pcClient.addStream(localStream); pcClient.addStream(localStream);
renegotiateClient(); renegotiateClient();
@ -217,7 +217,7 @@ function onServerGotStream(e) {
// html, otherwise we can't detect video in it. // html, otherwise we can't detect video in it.
throw 'Received video with unexpected id ' + e.stream.id; throw 'Received video with unexpected id ' + e.stream.id;
} }
remoteVideo.src = webkitURL.createObjectURL(e.stream); remoteVideo.srcObject = e.stream;
} }
function onClientIceCandidate(event) { function onClientIceCandidate(event) {

@ -99,7 +99,7 @@ function connectStream(contextType) {
var canvas = document.getElementById('canvas-' + contextType); var canvas = document.getElementById('canvas-' + contextType);
var video = document.getElementById('canvas-' + contextType + '-local-view'); var video = document.getElementById('canvas-' + contextType + '-local-view');
var stream = canvas.captureStream(); var stream = canvas.captureStream();
video.src = URL.createObjectURL(stream); video.srcObject = stream;
video.load(); video.load();
} }

@ -210,8 +210,7 @@
} }
function attachMediaStream(stream, videoElement) { function attachMediaStream(stream, videoElement) {
var localStreamUrl = URL.createObjectURL(stream); $(videoElement).srcObject = stream;
$(videoElement).src = localStreamUrl;
} }
function detectVideoInLocalView1(stream) { function detectVideoInLocalView1(stream) {

@ -18,7 +18,7 @@
function gotStreamCallback(stream) { function gotStreamCallback(stream) {
var localView = $('local-view'); var localView = $('local-view');
localView.src = URL.createObjectURL(stream); localView.srcObject = stream;
detectVideoPlaying('local-view').then(() => { detectVideoPlaying('local-view').then(() => {
sendValueToTest(localView.videoWidth + 'x' + localView.videoHeight); sendValueToTest(localView.videoWidth + 'x' + localView.videoHeight);
}); });

@ -65,8 +65,7 @@ function setupPeerConnection(stream) {
} }
}; };
remotePeerConnection.onaddstream = function(event) { remotePeerConnection.onaddstream = function(event) {
document.getElementById('remoteVideo').src = URL.createObjectURL( document.getElementById('remoteVideo').srcObject = event.stream;
event.stream);
resolve(event.stream); resolve(event.stream);
}; };
@ -78,14 +77,13 @@ function setupPeerConnection(stream) {
createAnswer(description); createAnswer(description);
}, function(error) { failTest(error.toString()); }); }, function(error) { failTest(error.toString()); });
document.getElementById('video').src = URL.createObjectURL( document.getElementById('video').srcObject = localStream;
localStream);
}); });
} }
function createAndStartMediaRecorder(stream, mimeType, slice) { function createAndStartMediaRecorder(stream, mimeType, slice) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
document.getElementById('video').src = URL.createObjectURL(stream); document.getElementById('video').srcObject = stream;
var recorder = new MediaRecorder(stream, {'mimeType' : mimeType}); var recorder = new MediaRecorder(stream, {'mimeType' : mimeType});
console.log('Recorder object created, mimeType = ' + mimeType); console.log('Recorder object created, mimeType = ' + mimeType);
if (slice != undefined) { if (slice != undefined) {

@ -167,8 +167,7 @@
} }
function displayAndRemember(localStream) { function displayAndRemember(localStream) {
var localStreamUrl = URL.createObjectURL(localStream); $('local-view').srcObject = localStream;
$('local-view').src = localStreamUrl;
gLocalStream = localStream; gLocalStream = localStream;
} }
@ -195,9 +194,8 @@
function onRemoteStream(e, target) { function onRemoteStream(e, target) {
console.log("Receiving remote stream..."); console.log("Receiving remote stream...");
gRemoteStreams[target] = e.stream; gRemoteStreams[target] = e.stream;
var remoteStreamUrl = URL.createObjectURL(e.stream);
var remoteVideo = $(target); var remoteVideo = $(target);
remoteVideo.src = remoteStreamUrl; remoteVideo.srcObject = e.stream;
} }
</script> </script>

@ -248,8 +248,7 @@
} }
function displayAndRemember(localStream) { function displayAndRemember(localStream) {
var localStreamUrl = URL.createObjectURL(localStream); $('local-view').srcObject = localStream;
$('local-view').src = localStreamUrl;
gLocalStream = localStream; gLocalStream = localStream;
} }
@ -261,9 +260,8 @@
function onRemoteStream(e, target) { function onRemoteStream(e, target) {
console.log("Receiving remote stream..."); console.log("Receiving remote stream...");
gRemoteStreams[target] = e.stream; gRemoteStreams[target] = e.stream;
var remoteStreamUrl = URL.createObjectURL(e.stream);
var remoteVideo = $(target); var remoteVideo = $(target);
remoteVideo.src = remoteStreamUrl; remoteVideo.srcObject = e.stream;
} }
function connectOnIceCandidate(caller, callee) { function connectOnIceCandidate(caller, callee) {

@ -193,7 +193,7 @@
var videoElement = document.createElement('video'); var videoElement = document.createElement('video');
// No crash for this operation. // No crash for this operation.
videoElement.src = URL.createObjectURL(newStream); videoElement.srcObject = newStream;
detectVideoPlaying('remote-view-2') detectVideoPlaying('remote-view-2')
.then(reportTestSuccess); .then(reportTestSuccess);
}) })
@ -516,8 +516,7 @@
} }
function displayAndRemember(localStream) { function displayAndRemember(localStream) {
var localStreamUrl = URL.createObjectURL(localStream); $('local-view').srcObject = localStream;
$('local-view').src = localStreamUrl;
gLocalStream = localStream; gLocalStream = localStream;
} }
@ -655,9 +654,8 @@
e.stream.id + ' was received.'); e.stream.id + ' was received.');
} }
gRemoteStreams[target] = e.stream; gRemoteStreams[target] = e.stream;
var remoteStreamUrl = URL.createObjectURL(e.stream);
var remoteVideo = $(target); var remoteVideo = $(target);
remoteVideo.src = remoteStreamUrl; remoteVideo.srcObject = e.stream;
} }
// Check that applyConstraints() fails on remote tracks because there is // Check that applyConstraints() fails on remote tracks because there is

@ -23,7 +23,7 @@
function gotStreamCallback(stream) { function gotStreamCallback(stream) {
var localView = $('local-view'); var localView = $('local-view');
localView.src = URL.createObjectURL(stream); localView.srcObject = stream;
var videoTracks = stream.getVideoTracks(); var videoTracks = stream.getVideoTracks();
if (videoTracks.length == 0) { if (videoTracks.length == 0) {

@ -14,7 +14,7 @@
navigator.webkitGetUserMedia( navigator.webkitGetUserMedia(
{ video: true, audio: true }, { video: true, audio: true },
function(stream) { function(stream) {
video.src = window.URL.createObjectURL(stream); video.srcObject = stream;
}, function(err) { window.console.log(err); } }, function(err) { window.console.log(err); }
); );
} }

@ -13,7 +13,7 @@ function $(id) {
function success(stream) { function success(stream) {
track = stream.getVideoTracks()[0]; track = stream.getVideoTracks()[0];
var video = $('video') var video = $('video')
video.src = URL.createObjectURL(stream); video.srcObject = stream;
video.track = track; video.track = track;
video.play(); video.play();

@ -51,7 +51,7 @@ textarea {
<script> <script>
var getUserMedia = navigator.webkitGetUserMedia.bind(navigator); var getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
var attachMediaStream = function(element, stream) { var attachMediaStream = function(element, stream) {
element.src = URL.createObjectURL(stream); element.srcObject = stream;
}; };
var startButton = document.getElementById('startButton'); var startButton = document.getElementById('startButton');
var toggleEffectButton = document.getElementById('toggleEffectButton'); var toggleEffectButton = document.getElementById('toggleEffectButton');
@ -94,7 +94,7 @@ function start() {
} }
function onRegisterStreamDone() { function onRegisterStreamDone() {
vidprocessedlocal.src = URL.createObjectURL(processedLocalstream); vidprocessedlocal.srcObject = processedLocalstream;
toggleEffectButton.disabled = false; toggleEffectButton.disabled = false;
} }
@ -176,7 +176,7 @@ function hangup() {
} }
function gotRemoteStream(e){ function gotRemoteStream(e){
vidremote.src = URL.createObjectURL(e.stream); vidremote.srcObject = e.stream;
trace("Received remote stream"); trace("Received remote stream");
} }

@ -18,7 +18,7 @@
function success(stream) { function success(stream) {
track = stream.getVideoTracks()[0]; track = stream.getVideoTracks()[0];
video.src = URL.createObjectURL(stream); video.srcObject = stream;
video.play(); video.play();
var list = $('profileList'); var list = $('profileList');

@ -7,16 +7,14 @@
async_test(function(t) { async_test(function(t) {
var video = document.querySelector("video"); var video = document.querySelector("video");
navigator.webkitGetUserMedia({video:true}, function(stream) { navigator.webkitGetUserMedia({video:true}, function(stream) {
var previewURL = URL.createObjectURL(stream);
video.ontimeupdate = t.step_func(function() { video.ontimeupdate = t.step_func(function() {
// restart preview. // restart preview.
video.src = previewURL; video.srcObject = stream;
video.ontimeupdate = t.step_func_done(); video.ontimeupdate = t.step_func_done();
}); });
//start preview. //start preview.
video.src = previewURL; video.srcObject = stream;
}, getStreamFailed); }, getStreamFailed);
function getStreamFailed(error) { function getStreamFailed(error) {

@ -75,7 +75,7 @@
} }
var audioElement = new Audio(); var audioElement = new Audio();
audioElement.src = URL.createObjectURL(mediaStreamDestination.stream); audioElement.srcObject = mediaStreamDestination.stream;
audioElement.play(); audioElement.play();
// The ChannelMerger for the individual channel access. // The ChannelMerger for the individual channel access.

@ -145,7 +145,7 @@ Polymer({
var successCallback = function(stream) { var successCallback = function(stream) {
if (this.cameraStartInProgress_) { if (this.cameraStartInProgress_) {
this.$.cameraVideo.src = URL.createObjectURL(stream); this.$.cameraVideo.srcObject = stream;
this.cameraStream_ = stream; this.cameraStream_ = stream;
} else { } else {
this.stopVideoTracks_(stream); this.stopVideoTracks_(stream);
@ -170,9 +170,11 @@ Polymer({
stopCamera: function() { stopCamera: function() {
this.$.userImageStreamCrop.classList.remove('preview'); this.$.userImageStreamCrop.classList.remove('preview');
this.cameraOnline_ = false; this.cameraOnline_ = false;
this.$.cameraVideo.src = ''; this.$.cameraVideo.srcObject = null;
if (this.cameraStream_) if (this.cameraStream_) {
this.stopVideoTracks_(this.cameraStream_); this.stopVideoTracks_(this.cameraStream_);
this.cameraStream_ = null;
}
// Cancel any pending getUserMedia() checks. // Cancel any pending getUserMedia() checks.
this.cameraStartInProgress_ = false; this.cameraStartInProgress_ = false;
}, },