diff options
author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:04:31 +0000 |
---|---|---|
committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:04:31 +0000 |
commit | a547aaf2985d1ca7fb619da57f11ee0a89d1a16f (patch) | |
tree | 1de4a878fb067a81499ab8e647ea25b20c06af6c /ppapi | |
parent | dc8b1cd41a13c81f6bac9e5cc69e73b91afa02df (diff) | |
download | chromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.zip chromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.tar.gz chromium_src-a547aaf2985d1ca7fb619da57f11ee0a89d1a16f.tar.bz2 |
Use window.URL instead of window.webkitURL.
It was unprefixed back in Chrome 23.
BUG=330691
TEST=no behavior change
Review URL: https://codereview.chromium.org/121203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/examples/video_effects/video_effects.html | 10 | ||||
-rw-r--r-- | ppapi/tests/test_video_destination.cc | 2 | ||||
-rw-r--r-- | ppapi/tests/test_video_source.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ppapi/examples/video_effects/video_effects.html b/ppapi/examples/video_effects/video_effects.html index 82d813f..f7dd0ce 100644 --- a/ppapi/examples/video_effects/video_effects.html +++ b/ppapi/examples/video_effects/video_effects.html @@ -52,7 +52,7 @@ textarea { var RTCPeerConnection = webkitRTCPeerConnection; var getUserMedia = navigator.webkitGetUserMedia.bind(navigator); var attachMediaStream = function(element, stream) { - element.src = webkitURL.createObjectURL(stream); + element.src = URL.createObjectURL(stream); }; var startButton = document.getElementById('startButton'); var toggleEffectButton = document.getElementById('toggleEffectButton'); @@ -95,7 +95,7 @@ function start() { } function onRegisterStreamDone() { - vidprocessedlocal.src = webkitURL.createObjectURL(processedLocalstream); + vidprocessedlocal.src = URL.createObjectURL(processedLocalstream); toggleEffectButton.disabled = false; } @@ -110,9 +110,9 @@ function HandleMessage(message_event) { } function initEffect() { - var url = webkitURL.createObjectURL(localstream); + var url = URL.createObjectURL(localstream); processedLocalstream = new webkitMediaStream([]); - var processedStreamUrl = webkitURL.createObjectURL(processedLocalstream); + var processedStreamUrl = URL.createObjectURL(processedLocalstream); effectsPlugin.postMessage( 'registerStream' + ' ' + url + ' ' + processedStreamUrl); } @@ -177,7 +177,7 @@ function hangup() { } function gotRemoteStream(e){ - vidremote.src = webkitURL.createObjectURL(e.stream); + vidremote.src = URL.createObjectURL(e.stream); trace("Received remote stream"); } diff --git a/ppapi/tests/test_video_destination.cc b/ppapi/tests/test_video_destination.cc index b06abcb..f3c4cf8 100644 --- a/ppapi/tests/test_video_destination.cc +++ b/ppapi/tests/test_video_destination.cc @@ -101,7 +101,7 @@ std::string TestVideoDestination::TestCreate() { std::string TestVideoDestination::TestPutFrame() { std::string js_code; js_code += "var test_stream = new webkitMediaStream([]);" - "var url = webkitURL.createObjectURL(test_stream);" + "var url = URL.createObjectURL(test_stream);" "var plugin = document.getElementById('plugin');" "plugin.postMessage(url);"; instance_->EvalScript(js_code); diff --git a/ppapi/tests/test_video_source.cc b/ppapi/tests/test_video_source.cc index b6587f8..a6b7299 100644 --- a/ppapi/tests/test_video_source.cc +++ b/ppapi/tests/test_video_source.cc @@ -94,7 +94,7 @@ std::string TestVideoSource::TestGetFrame() { js_code += "var test_stream;" "function gotStream(stream){" " test_stream = stream;" - " var url = webkitURL.createObjectURL(test_stream);" + " var url = URL.createObjectURL(test_stream);" " var plugin = document.getElementById('plugin');" " plugin.postMessage(url);" "}" |