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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages | 484 // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages |
485 // from guests. | 485 // from guests. |
486 if (IsGuest()) { | 486 if (IsGuest()) { |
487 scoped_refptr<BrowserPluginMessageFilter> bp_message_filter( | 487 scoped_refptr<BrowserPluginMessageFilter> bp_message_filter( |
488 new BrowserPluginMessageFilter( | 488 new BrowserPluginMessageFilter( |
489 GetID(), | 489 GetID(), |
490 GetBrowserContext())); | 490 GetBrowserContext())); |
491 channel_->AddFilter(bp_message_filter); | 491 channel_->AddFilter(bp_message_filter); |
492 } | 492 } |
493 | 493 |
| 494 PluginServiceImpl* plugin_service = NULL; |
| 495 #if defined(ENABLE_PLUGINS) |
| 496 plugin_service = PluginServiceImpl::GetInstance(); |
| 497 #endif |
| 498 |
494 scoped_refptr<RenderMessageFilter> render_message_filter( | 499 scoped_refptr<RenderMessageFilter> render_message_filter( |
495 new RenderMessageFilter( | 500 new RenderMessageFilter( |
496 GetID(), | 501 GetID(), |
497 PluginServiceImpl::GetInstance(), | 502 plugin_service, |
498 GetBrowserContext(), | 503 GetBrowserContext(), |
499 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), | 504 GetBrowserContext()->GetRequestContextForRenderProcess(GetID()), |
500 widget_helper_, | 505 widget_helper_, |
501 media_observer, | 506 media_observer, |
502 storage_partition_impl_->GetDOMStorageContext())); | 507 storage_partition_impl_->GetDOMStorageContext())); |
503 channel_->AddFilter(render_message_filter); | 508 channel_->AddFilter(render_message_filter); |
504 BrowserContext* browser_context = GetBrowserContext(); | 509 BrowserContext* browser_context = GetBrowserContext(); |
505 ResourceContext* resource_context = browser_context->GetResourceContext(); | 510 ResourceContext* resource_context = browser_context->GetResourceContext(); |
506 | 511 |
507 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( | 512 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( |
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1588 int32 gpu_process_host_id) { | 1593 int32 gpu_process_host_id) { |
1589 TRACE_EVENT0("renderer_host", | 1594 TRACE_EVENT0("renderer_host", |
1590 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); | 1595 "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost"); |
1591 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, | 1596 RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id, |
1592 gpu_process_host_id, | 1597 gpu_process_host_id, |
1593 surface_handle, | 1598 surface_handle, |
1594 0); | 1599 0); |
1595 } | 1600 } |
1596 | 1601 |
1597 } // namespace content | 1602 } // namespace content |
OLD | NEW |