Chromium Code Reviews| Index: content/browser/renderer_host/render_view_host.cc |
| diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc |
| index 24e09f55cf511df9b1d076acc4b5ed677e055b07..0db367eab5100d6866fb5ddb315eb245fe5d1785 100644 |
| --- a/content/browser/renderer_host/render_view_host.cc |
| +++ b/content/browser/renderer_host/render_view_host.cc |
| @@ -24,6 +24,7 @@ |
| #include "content/browser/host_zoom_map_impl.h" |
| #include "content/browser/in_process_webkit/session_storage_namespace.h" |
| #include "content/browser/power_save_blocker.h" |
| +#include "content/browser/renderer_host/pepper_message_filter.h" |
| #include "content/browser/renderer_host/render_process_host_impl.h" |
| #include "content/browser/renderer_host/render_widget_host.h" |
| #include "content/browser/renderer_host/render_widget_host_view.h" |
| @@ -147,6 +148,9 @@ RenderViewHost::RenderViewHost(SiteInstance* instance, |
| content::NOTIFICATION_RENDER_VIEW_HOST_CREATED, |
| content::Source<RenderViewHost>(this), |
| content::NotificationService::NoDetails()); |
| + |
| + PepperMessageFilter::SetRenderSite(process()->GetID(), this->routing_id(), |
|
jam
2012/02/10 18:23:54
it's a bit odd that RenderViewHost (UI thread) is
|
| + instance_->GetSite()); |
| } |
| RenderViewHost::~RenderViewHost() { |
| @@ -165,6 +169,8 @@ RenderViewHost::~RenderViewHost() { |
| // Be sure to clean up any leftover state from cross-site requests. |
| CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( |
| process()->GetID(), routing_id(), false); |
| + |
| + PepperMessageFilter::SetRenderSite(process()->GetID(), routing_id(), GURL()); |
| } |
| bool RenderViewHost::CreateRenderView(const string16& frame_name, |
| @@ -955,6 +961,9 @@ void RenderViewHost::OnMsgNavigate(const IPC::Message& msg) { |
| FilterURL(policy, renderer_id, &validated_params.password_form.action); |
| delegate_->DidNavigate(this, validated_params); |
| + |
| + PepperMessageFilter::SetRenderSite(renderer_id, routing_id(), |
| + instance_->GetSite()); |
| } |
| void RenderViewHost::OnMsgUpdateState(int32 page_id, |