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 14006ce388f2c59fd6e83ec6256919e5f01b3bba..d87a79db88f5fe6dcc57eefc46acb27dd361ca4a 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -183,6 +183,10 @@ |
#include "ui/gfx/win/dpi.h" |
#endif |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+#include "content/browser/browser_io_surface_manager_mac.h" |
+#endif |
+ |
#if defined(ENABLE_BROWSER_CDMS) |
#include "content/browser/media/cdm/browser_cdm_manager.h" |
#endif |
@@ -1548,6 +1552,14 @@ void RenderProcessHostImpl::OnChannelConnected(int32 peer_pid) { |
tracked_objects::ThreadData::Status status = |
tracked_objects::ThreadData::status(); |
Send(new ChildProcessMsg_SetProfilerStatus(status)); |
+ |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ io_surface_manager_mailbox_ = |
+ BrowserIOSurfaceManager::GetInstance()->GenerateChildProcessMailbox( |
+ GetID()); |
+ Send(new ChildProcessMsg_SetIOSurfaceManagerMailbox( |
+ io_surface_manager_mailbox_)); |
+#endif |
} |
void RenderProcessHostImpl::OnChannelError() { |
@@ -1665,6 +1677,14 @@ void RenderProcessHostImpl::Cleanup() { |
// reused in between now and when the Delete task runs. |
UnregisterHost(GetID()); |
} |
+ |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ if (!io_surface_manager_mailbox_.IsZero()) { |
+ BrowserIOSurfaceManager::GetInstance()->InvalidateChildProcessMailbox( |
+ io_surface_manager_mailbox_); |
+ io_surface_manager_mailbox_.SetZero(); |
+ } |
+#endif |
} |
void RenderProcessHostImpl::AddPendingView() { |