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 67d6c069b4ab0b7fa41becf886eb60b114406748..8e58434c87daca7392bfcb83aace06594e18133d 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -688,6 +688,7 @@ RenderProcessHostImpl::~RenderProcessHostImpl() { |
IPC::AttachmentBroker::GetGlobal()->DeregisterCommunicationChannel( |
channel_.get()); |
#endif |
+ |
// We may have some unsent messages at this point, but that's OK. |
channel_.reset(); |
while (!queued_messages_.empty()) { |
@@ -886,7 +887,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
storage_partition_impl_->GetDOMStorageContext(), |
storage_partition_impl_->GetCacheStorageContext())); |
AddFilter(render_message_filter.get()); |
- AddFilter(new RenderFrameMessageFilter( |
+ |
+ render_frame_message_filter_ = new RenderFrameMessageFilter( |
GetID(), |
#if defined(ENABLE_PLUGINS) |
PluginServiceImpl::GetInstance(), |
@@ -895,7 +897,9 @@ void RenderProcessHostImpl::CreateMessageFilters() { |
#endif |
GetBrowserContext(), |
request_context.get(), |
- widget_helper_.get())); |
+ widget_helper_.get()); |
+ AddFilter(render_frame_message_filter_.get()); |
+ |
BrowserContext* browser_context = GetBrowserContext(); |
ResourceContext* resource_context = browser_context->GetResourceContext(); |
@@ -2438,6 +2442,7 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead, |
IPC::AttachmentBroker::GetGlobal()->DeregisterCommunicationChannel( |
channel_.get()); |
#endif |
+ |
channel_.reset(); |
while (!queued_messages_.empty()) { |
delete queued_messages_.front(); |