Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1504)

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1463853002: Mac: Move IOSurface token initialization earlier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/child_io_surface_manager_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d51107c055b2774c6a2c87514aa09f8ae05df32f..c1dffde8e379acdfdbd7d7ca21ac446018c28314 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1675,13 +1675,6 @@ void RenderProcessHostImpl::OnChannelConnected(int32 peer_pid) {
tracked_objects::ThreadData::status();
Send(new ChildProcessMsg_SetProfilerStatus(status));
-#if defined(OS_MACOSX) && !defined(OS_IOS)
- io_surface_manager_token_ =
- BrowserIOSurfaceManager::GetInstance()->GenerateChildProcessToken(
- GetID());
- Send(new ChildProcessMsg_SetIOSurfaceManagerToken(io_surface_manager_token_));
-#endif
-
#if defined(USE_OZONE)
Send(new ChildProcessMsg_InitializeClientNativePixmapFactory(
base::FileDescriptor(
@@ -2427,6 +2420,13 @@ void RenderProcessHostImpl::OnProcessLaunched() {
UpdateProcessPriority();
}
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ io_surface_manager_token_ =
+ BrowserIOSurfaceManager::GetInstance()->GenerateChildProcessToken(
+ GetID());
+ Send(new ChildProcessMsg_SetIOSurfaceManagerToken(io_surface_manager_token_));
+#endif
+
// NOTE: This needs to be before sending queued messages because
// ExtensionService uses this notification to initialize the renderer process
// with state that must be there before any JavaScript executes.
« no previous file with comments | « no previous file | content/child/child_io_surface_manager_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698