Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 2425703002: Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Remove |remote| and |readonly| members of MediaStreamTrack Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 956
957 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer( 957 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer(
958 WebMediaStream* web_media_stream, 958 WebMediaStream* web_media_stream,
959 WebMediaPlayer* web_media_player) { 959 WebMediaPlayer* web_media_player) {
960 #if defined(ENABLE_WEBRTC) 960 #if defined(ENABLE_WEBRTC)
961 DCHECK(web_media_stream); 961 DCHECK(web_media_stream);
962 DCHECK(web_media_player); 962 DCHECK(web_media_player);
963 AddVideoTrackToMediaStream( 963 AddVideoTrackToMediaStream(
964 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( 964 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl(
965 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), 965 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()),
966 false, // is_remote
967 false, // is_readonly
968 web_media_stream); 966 web_media_stream);
969 #endif 967 #endif
970 } 968 }
971 969
972 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( 970 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer(
973 WebMediaStream* web_media_stream, 971 WebMediaStream* web_media_stream,
974 WebMediaPlayer* web_media_player) { 972 WebMediaPlayer* web_media_player) {
975 #if defined(ENABLE_WEBRTC) 973 #if defined(ENABLE_WEBRTC)
976 DCHECK(web_media_stream); 974 DCHECK(web_media_stream);
977 DCHECK(web_media_player); 975 DCHECK(web_media_player);
978 976
979 blink::WebMediaStreamSource web_media_stream_source; 977 blink::WebMediaStreamSource web_media_stream_source;
980 blink::WebMediaStreamTrack web_media_stream_track; 978 blink::WebMediaStreamTrack web_media_stream_track;
981 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); 979 const WebString track_id = WebString::fromUTF8(base::GenerateGUID());
982 980
983 web_media_stream_source.initialize(track_id, 981 web_media_stream_source.initialize(
984 blink::WebMediaStreamSource::TypeAudio, 982 track_id, blink::WebMediaStreamSource::TypeAudio, track_id);
985 track_id,
986 false /* is_remote */);
987 web_media_stream_track.initialize(web_media_stream_source); 983 web_media_stream_track.initialize(web_media_stream_source);
988 984
989 MediaStreamAudioSource* const media_stream_source = 985 MediaStreamAudioSource* const media_stream_source =
990 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( 986 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl(
991 web_media_player); 987 web_media_player);
992 988
993 // Takes ownership of |media_stream_source|. 989 // Takes ownership of |media_stream_source|.
994 web_media_stream_source.setExtraData(media_stream_source); 990 web_media_stream_source.setExtraData(media_stream_source);
995 991
996 media_stream_source->ConnectToTrack(web_media_stream_track); 992 media_stream_source->ConnectToTrack(web_media_stream_track);
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 return &trial_token_validator_; 1348 return &trial_token_validator_;
1353 } 1349 }
1354 1350
1355 void RendererBlinkPlatformImpl::workerContextCreated( 1351 void RendererBlinkPlatformImpl::workerContextCreated(
1356 const v8::Local<v8::Context>& worker) { 1352 const v8::Local<v8::Context>& worker) {
1357 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( 1353 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
1358 worker); 1354 worker);
1359 } 1355 }
1360 1356
1361 } // namespace content 1357 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698