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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 10662049: Move the device enumerate/open/close work to device thread from IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small changes to fix the trybots' failure Created 8 years, 5 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 | Annotate | Revision Log
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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 519
520 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( 520 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
521 GetID(), PROCESS_TYPE_RENDERER, resource_context, 521 GetID(), PROCESS_TYPE_RENDERER, resource_context,
522 new RendererURLRequestContextSelector(browser_context, GetID())); 522 new RendererURLRequestContextSelector(browser_context, GetID()));
523 523
524 channel_->AddFilter(resource_message_filter); 524 channel_->AddFilter(resource_message_filter);
525 #if !defined(OS_ANDROID) 525 #if !defined(OS_ANDROID)
526 // TODO(dtrainor, klobag): Enable this when BrowserMainLoop gets 526 // TODO(dtrainor, klobag): Enable this when BrowserMainLoop gets
527 // included in Android builds. Tracked via 115941. 527 // included in Android builds. Tracked via 115941.
528 media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager(); 528 media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager();
529 channel_->AddFilter(new AudioInputRendererHost( 529 media_stream::MediaStreamManager* media_stream_manager =
530 resource_context, audio_manager)); 530 BrowserMainLoop::GetMediaStreamManager();
531 channel_->AddFilter(new AudioInputRendererHost(audio_manager,
532 media_stream_manager));
531 channel_->AddFilter(new AudioRendererHost(audio_manager, media_observer)); 533 channel_->AddFilter(new AudioRendererHost(audio_manager, media_observer));
532 channel_->AddFilter(new VideoCaptureHost(resource_context, audio_manager)); 534 channel_->AddFilter(new VideoCaptureHost());
533 #endif 535 #endif
534 channel_->AddFilter(new AppCacheDispatcherHost( 536 channel_->AddFilter(new AppCacheDispatcherHost(
535 static_cast<ChromeAppCacheService*>( 537 static_cast<ChromeAppCacheService*>(
536 BrowserContext::GetAppCacheService(browser_context)), 538 BrowserContext::GetAppCacheService(browser_context)),
537 GetID())); 539 GetID()));
538 channel_->AddFilter(new ClipboardMessageFilter()); 540 channel_->AddFilter(new ClipboardMessageFilter());
539 channel_->AddFilter(new DOMStorageMessageFilter(GetID(), 541 channel_->AddFilter(new DOMStorageMessageFilter(GetID(),
540 static_cast<DOMStorageContextImpl*>( 542 static_cast<DOMStorageContextImpl*>(
541 BrowserContext::GetDOMStorageContext(browser_context)))); 543 BrowserContext::GetDOMStorageContext(browser_context))));
542 channel_->AddFilter(new IndexedDBDispatcherHost(GetID(), 544 channel_->AddFilter(new IndexedDBDispatcherHost(GetID(),
543 static_cast<IndexedDBContextImpl*>( 545 static_cast<IndexedDBContextImpl*>(
544 BrowserContext::GetIndexedDBContext(browser_context)))); 546 BrowserContext::GetIndexedDBContext(browser_context))));
545 channel_->AddFilter(GeolocationDispatcherHost::New( 547 channel_->AddFilter(GeolocationDispatcherHost::New(
546 GetID(), browser_context->GetGeolocationPermissionContext())); 548 GetID(), browser_context->GetGeolocationPermissionContext()));
547 gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get()); 549 gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get());
548 channel_->AddFilter(gpu_message_filter_); 550 channel_->AddFilter(gpu_message_filter_);
549 #if defined(ENABLE_WEBRTC) 551 #if defined(ENABLE_WEBRTC)
550 channel_->AddFilter(new media_stream::MediaStreamDispatcherHost( 552 channel_->AddFilter(new media_stream::MediaStreamDispatcherHost(GetID()));
551 resource_context, GetID(), BrowserMainLoop::GetAudioManager()));
552 #endif 553 #endif
553 channel_->AddFilter( 554 channel_->AddFilter(
554 GetContentClient()->browser()->AllowPepperPrivateFileAPI() ? 555 GetContentClient()->browser()->AllowPepperPrivateFileAPI() ?
555 new PepperUnsafeFileMessageFilter(GetID(), browser_context->GetPath()) : 556 new PepperUnsafeFileMessageFilter(GetID(), browser_context->GetPath()) :
556 new PepperFileMessageFilter(GetID())); 557 new PepperFileMessageFilter(GetID()));
557 channel_->AddFilter(new PepperMessageFilter(PepperMessageFilter::RENDERER, 558 channel_->AddFilter(new PepperMessageFilter(PepperMessageFilter::RENDERER,
558 GetID(), browser_context)); 559 GetID(), browser_context));
559 #if defined(ENABLE_INPUT_SPEECH) 560 #if defined(ENABLE_INPUT_SPEECH)
560 channel_->AddFilter(new speech::InputTagSpeechDispatcherHost( 561 channel_->AddFilter(new speech::InputTagSpeechDispatcherHost(
561 GetID(), browser_context->GetRequestContext(), 562 GetID(), browser_context->GetRequestContext(),
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
1534 int32 route_id, 1535 int32 route_id,
1535 int32 gpu_process_host_id) { 1536 int32 gpu_process_host_id) {
1536 TRACE_EVENT0("renderer_host", 1537 TRACE_EVENT0("renderer_host",
1537 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); 1538 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
1538 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, 1539 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
1539 gpu_process_host_id, 1540 gpu_process_host_id,
1540 0); 1541 0);
1541 } 1542 }
1542 1543
1543 } // namespace content 1544 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/test/webrtc_audio_device_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698