OLD | NEW |
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 #include <algorithm> | 10 #include <algorithm> |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 #include "content/browser/renderer_host/media/device_request_message_filter.h" | 78 #include "content/browser/renderer_host/media/device_request_message_filter.h" |
79 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" | 79 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
80 #include "content/browser/renderer_host/media/midi_dispatcher_host.h" | 80 #include "content/browser/renderer_host/media/midi_dispatcher_host.h" |
81 #include "content/browser/renderer_host/media/midi_host.h" | 81 #include "content/browser/renderer_host/media/midi_host.h" |
82 #include "content/browser/renderer_host/media/peer_connection_tracker_host.h" | 82 #include "content/browser/renderer_host/media/peer_connection_tracker_host.h" |
83 #include "content/browser/renderer_host/media/video_capture_host.h" | 83 #include "content/browser/renderer_host/media/video_capture_host.h" |
84 #include "content/browser/renderer_host/memory_benchmark_message_filter.h" | 84 #include "content/browser/renderer_host/memory_benchmark_message_filter.h" |
85 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" | 85 #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h" |
86 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" | 86 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" |
87 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h" | 87 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h" |
| 88 #include "content/browser/renderer_host/render_frame_message_filter.h" |
88 #include "content/browser/renderer_host/render_message_filter.h" | 89 #include "content/browser/renderer_host/render_message_filter.h" |
89 #include "content/browser/renderer_host/render_view_host_delegate.h" | 90 #include "content/browser/renderer_host/render_view_host_delegate.h" |
90 #include "content/browser/renderer_host/render_view_host_impl.h" | 91 #include "content/browser/renderer_host/render_view_host_impl.h" |
91 #include "content/browser/renderer_host/render_widget_helper.h" | 92 #include "content/browser/renderer_host/render_widget_helper.h" |
92 #include "content/browser/renderer_host/render_widget_host_impl.h" | 93 #include "content/browser/renderer_host/render_widget_host_impl.h" |
93 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h" | 94 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h" |
94 #include "content/browser/renderer_host/text_input_client_message_filter.h" | 95 #include "content/browser/renderer_host/text_input_client_message_filter.h" |
95 #include "content/browser/resolve_proxy_msg_helper.h" | 96 #include "content/browser/resolve_proxy_msg_helper.h" |
96 #include "content/browser/service_worker/service_worker_context.h" | 97 #include "content/browser/service_worker/service_worker_context.h" |
97 #include "content/browser/service_worker/service_worker_dispatcher_host.h" | 98 #include "content/browser/service_worker/service_worker_dispatcher_host.h" |
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 #else | 553 #else |
553 NULL, | 554 NULL, |
554 #endif | 555 #endif |
555 GetBrowserContext(), | 556 GetBrowserContext(), |
556 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), | 557 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), |
557 widget_helper_.get(), | 558 widget_helper_.get(), |
558 audio_manager, | 559 audio_manager, |
559 media_internals, | 560 media_internals, |
560 storage_partition_impl_->GetDOMStorageContext())); | 561 storage_partition_impl_->GetDOMStorageContext())); |
561 channel_->AddFilter(render_message_filter.get()); | 562 channel_->AddFilter(render_message_filter.get()); |
| 563 channel_->AddFilter( |
| 564 new RenderFrameMessageFilter(GetID(), widget_helper_.get())); |
562 BrowserContext* browser_context = GetBrowserContext(); | 565 BrowserContext* browser_context = GetBrowserContext(); |
563 ResourceContext* resource_context = browser_context->GetResourceContext(); | 566 ResourceContext* resource_context = browser_context->GetResourceContext(); |
564 | 567 |
565 scoped_refptr<net::URLRequestContextGetter> request_context( | 568 scoped_refptr<net::URLRequestContextGetter> request_context( |
566 browser_context->GetRequestContextForRenderProcess(GetID())); | 569 browser_context->GetRequestContextForRenderProcess(GetID())); |
567 scoped_refptr<net::URLRequestContextGetter> media_request_context( | 570 scoped_refptr<net::URLRequestContextGetter> media_request_context( |
568 browser_context->GetMediaRequestContextForRenderProcess(GetID())); | 571 browser_context->GetMediaRequestContextForRenderProcess(GetID())); |
569 | 572 |
570 ResourceMessageFilter::GetContextsCallback get_contexts_callback( | 573 ResourceMessageFilter::GetContextsCallback get_contexts_callback( |
571 base::Bind(&GetContexts, browser_context->GetResourceContext(), | 574 base::Bind(&GetContexts, browser_context->GetResourceContext(), |
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1799 // Skip widgets in other processes. | 1802 // Skip widgets in other processes. |
1800 if (widget->GetProcess()->GetID() != GetID()) | 1803 if (widget->GetProcess()->GetID() != GetID()) |
1801 continue; | 1804 continue; |
1802 | 1805 |
1803 RenderViewHost* rvh = RenderViewHost::From(widget); | 1806 RenderViewHost* rvh = RenderViewHost::From(widget); |
1804 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); | 1807 rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences()); |
1805 } | 1808 } |
1806 } | 1809 } |
1807 | 1810 |
1808 } // namespace content | 1811 } // namespace content |
OLD | NEW |