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

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

Issue 2287263003: Fix build failure with "enable_webrtc = false". (Closed)
Patch Set: Created 4 years, 3 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
« content/content_renderer.gypi ('K') | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), 958 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()),
959 false, // is_remote 959 false, // is_remote
960 false, // is_readonly 960 false, // is_readonly
961 web_media_stream); 961 web_media_stream);
962 #endif 962 #endif
963 } 963 }
964 964
965 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( 965 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer(
966 WebMediaStream* web_media_stream, 966 WebMediaStream* web_media_stream,
967 WebMediaPlayer* web_media_player) { 967 WebMediaPlayer* web_media_player) {
968 #if defined(ENABLE_WEBRTC)
968 DCHECK(web_media_stream); 969 DCHECK(web_media_stream);
969 DCHECK(web_media_player); 970 DCHECK(web_media_player);
970 971
971 blink::WebMediaStreamSource web_media_stream_source; 972 blink::WebMediaStreamSource web_media_stream_source;
972 blink::WebMediaStreamTrack web_media_stream_track; 973 blink::WebMediaStreamTrack web_media_stream_track;
973 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); 974 const WebString track_id = WebString::fromUTF8(base::GenerateGUID());
974 975
975 web_media_stream_source.initialize(track_id, 976 web_media_stream_source.initialize(track_id,
976 blink::WebMediaStreamSource::TypeAudio, 977 blink::WebMediaStreamSource::TypeAudio,
977 track_id, 978 track_id,
978 false /* is_remote */); 979 false /* is_remote */);
979 web_media_stream_track.initialize(web_media_stream_source); 980 web_media_stream_track.initialize(web_media_stream_source);
980 981
981 MediaStreamAudioSource* const media_stream_source = 982 MediaStreamAudioSource* const media_stream_source =
982 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( 983 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl(
983 web_media_player); 984 web_media_player);
984 985
985 // Takes ownership of |media_stream_source|. 986 // Takes ownership of |media_stream_source|.
986 web_media_stream_source.setExtraData(media_stream_source); 987 web_media_stream_source.setExtraData(media_stream_source);
987 988
988 media_stream_source->ConnectToTrack(web_media_stream_track); 989 media_stream_source->ConnectToTrack(web_media_stream_track);
989 web_media_stream->addTrack(web_media_stream_track); 990 web_media_stream->addTrack(web_media_stream_track);
991 #endif
990 } 992 }
991 993
992 //------------------------------------------------------------------------------ 994 //------------------------------------------------------------------------------
993 995
994 WebImageCaptureFrameGrabber* 996 WebImageCaptureFrameGrabber*
995 RendererBlinkPlatformImpl::createImageCaptureFrameGrabber() { 997 RendererBlinkPlatformImpl::createImageCaptureFrameGrabber() {
996 #if defined(ENABLE_WEBRTC) 998 #if defined(ENABLE_WEBRTC)
997 return new ImageCaptureFrameGrabber(); 999 return new ImageCaptureFrameGrabber();
998 #else 1000 #else
999 return nullptr; 1001 return nullptr;
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 return &trial_token_validator_; 1339 return &trial_token_validator_;
1338 } 1340 }
1339 1341
1340 void RendererBlinkPlatformImpl::workerContextCreated( 1342 void RendererBlinkPlatformImpl::workerContextCreated(
1341 const v8::Local<v8::Context>& worker) { 1343 const v8::Local<v8::Context>& worker) {
1342 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( 1344 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
1343 worker); 1345 worker);
1344 } 1346 }
1345 1347
1346 } // namespace content 1348 } // namespace content
OLDNEW
« content/content_renderer.gypi ('K') | « content/content_renderer.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698