Chromium Code Reviews| Index: content/browser/renderer_host/render_process_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
| index 7a05a6572136715c049360ceede9deee2dd384ed..b9212cbf1e703b1d87ee3b7582cb9ec0ff628631 100644 |
| --- a/content/browser/renderer_host/render_process_host_impl.cc |
| +++ b/content/browser/renderer_host/render_process_host_impl.cc |
| @@ -84,6 +84,7 @@ |
| #include "content/browser/renderer_host/render_widget_helper.h" |
| #include "content/browser/renderer_host/socket_stream_dispatcher_host.h" |
| #include "content/browser/renderer_host/text_input_client_message_filter.h" |
| +#include "content/browser/renderer_host/url_handling_message_filter.h" |
| #include "content/browser/renderer_host/webrtc_logging_handler_host.h" |
| #include "content/browser/resolve_proxy_msg_helper.h" |
| #include "content/browser/speech/input_tag_speech_dispatcher_host.h" |
| @@ -111,6 +112,7 @@ |
| #include "content/public/common/process_type.h" |
| #include "content/public/common/result_codes.h" |
| #include "content/public/common/url_constants.h" |
| +#include "content/public/common/url_handling_messages.h" |
| #include "content/renderer/render_process_impl.h" |
| #include "content/renderer/render_thread_impl.h" |
| #include "ipc/ipc_channel.h" |
| @@ -541,8 +543,11 @@ bool RenderProcessHostImpl::Init() { |
| void RenderProcessHostImpl::CreateMessageFilters() { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| + |
| channel_->AddFilter(new ResourceSchedulerFilter(GetID())); |
| - MediaInternals* media_internals = MediaInternals::GetInstance();; |
| + |
| + MediaInternals* media_internals = MediaInternals::GetInstance(); |
| + |
| // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages |
| // from guests. |
| if (supports_browser_plugin_) { |
| @@ -565,17 +570,18 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| media_internals, |
| storage_partition_impl_->GetDOMStorageContext())); |
| channel_->AddFilter(render_message_filter); |
| + |
|
jam
2013/08/30 16:16:38
revert all of your whitespace changes to this file
sergeygs
2013/09/02 07:36:21
Already did.
|
| BrowserContext* browser_context = GetBrowserContext(); |
| - ResourceContext* resource_context = browser_context->GetResourceContext(); |
| + ResourceContext* resource_context = browser_context->GetResourceContext(); |
| ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( |
| GetID(), PROCESS_TYPE_RENDERER, resource_context, |
| storage_partition_impl_->GetAppCacheService(), |
| ChromeBlobStorageContext::GetFor(browser_context), |
| storage_partition_impl_->GetFileSystemContext(), |
| new RendererURLRequestContextSelector(browser_context, GetID())); |
| - |
| channel_->AddFilter(resource_message_filter); |
| + |
| media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager(); |
| MediaStreamManager* media_stream_manager = |
| BrowserMainLoop::GetMediaStreamManager(); |
| @@ -584,19 +590,25 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| channel_->AddFilter(new AudioRendererHost( |
| GetID(), audio_manager, BrowserMainLoop::GetAudioMirroringManager(), |
| media_internals)); |
| + |
| channel_->AddFilter(new VideoCaptureHost()); |
| + |
| channel_->AddFilter(new AppCacheDispatcherHost( |
| storage_partition_impl_->GetAppCacheService(), |
| GetID())); |
| + |
| channel_->AddFilter(new ClipboardMessageFilter(browser_context)); |
| + |
| channel_->AddFilter( |
| new DOMStorageMessageFilter( |
| GetID(), |
| storage_partition_impl_->GetDOMStorageContext())); |
| + |
| channel_->AddFilter( |
| new IndexedDBDispatcherHost( |
| GetID(), |
| storage_partition_impl_->GetIndexedDBContext())); |
| + |
| if (IsGuest()) { |
| if (!g_browser_plugin_geolocation_context.Get()) { |
| g_browser_plugin_geolocation_context.Get() = |
| @@ -608,11 +620,14 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| channel_->AddFilter(GeolocationDispatcherHost::New( |
| GetID(), browser_context->GetGeolocationPermissionContext())); |
| } |
| + |
| gpu_message_filter_ = new GpuMessageFilter(GetID(), widget_helper_.get()); |
| channel_->AddFilter(gpu_message_filter_); |
| + |
| #if defined(ENABLE_WEBRTC) |
| peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); |
| channel_->AddFilter(peer_connection_tracker_host_); |
| + |
| channel_->AddFilter(new MediaStreamDispatcherHost(GetID())); |
| #endif |
| #if defined(ENABLE_PLUGINS) |
| @@ -626,16 +641,22 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| GetID(), storage_partition_impl_->GetURLRequestContext(), |
| browser_context->GetSpeechRecognitionPreferences())); |
| #endif |
| + |
| channel_->AddFilter(new FileAPIMessageFilter( |
| GetID(), |
| storage_partition_impl_->GetURLRequestContext(), |
| storage_partition_impl_->GetFileSystemContext(), |
| ChromeBlobStorageContext::GetFor(browser_context))); |
| + |
| channel_->AddFilter(new OrientationMessageFilter()); |
| + |
| channel_->AddFilter(new FileUtilitiesMessageFilter(GetID())); |
| + |
| channel_->AddFilter(new MimeRegistryMessageFilter()); |
| + |
| channel_->AddFilter(new DatabaseMessageFilter( |
| storage_partition_impl_->GetDatabaseTracker())); |
| + |
| #if defined(OS_MACOSX) |
| channel_->AddFilter(new TextInputClientMessageFilter(GetID())); |
| #elif defined(OS_WIN) |
| @@ -668,19 +689,29 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
| #endif |
| channel_->AddFilter(new TraceMessageFilter()); |
| + |
| + // ResolveProxyMsgHelper |
| channel_->AddFilter(new ResolveProxyMsgHelper( |
| browser_context->GetRequestContextForRenderProcess(GetID()))); |
| + |
| channel_->AddFilter(new QuotaDispatcherHost( |
| GetID(), |
| storage_partition_impl_->GetQuotaManager(), |
| GetContentClient()->browser()->CreateQuotaPermissionContext())); |
| + |
| channel_->AddFilter(new GamepadBrowserMessageFilter()); |
| + |
| channel_->AddFilter(new ProfilerMessageFilter(PROCESS_TYPE_RENDERER)); |
| + |
| channel_->AddFilter(new HistogramMessageFilter()); |
| + |
| channel_->AddFilter(new HyphenatorMessageFilter(this)); |
| + |
| #if defined(ENABLE_WEBRTC) |
| channel_->AddFilter(new WebRtcLoggingHandlerHost()); |
| #endif |
| + |
| + channel_->AddFilter(new UrlHandlingMessageFilter(this)); |
| } |
| int RenderProcessHostImpl::GetNextRoutingID() { |