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

Side by Side Diff: content/app/content_main_runner.cc

Issue 1665513002: Pass both 32 and 64 bit snapshot and natives fds to child processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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 unified diff | Download patch
OLDNEW
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 #include "content/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 #include <string> 10 #include <string>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 #if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER) 133 #if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
134 base::LazyInstance<ContentPluginClient> 134 base::LazyInstance<ContentPluginClient>
135 g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER; 135 g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
136 base::LazyInstance<ContentRendererClient> 136 base::LazyInstance<ContentRendererClient>
137 g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 137 g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
138 base::LazyInstance<ContentUtilityClient> 138 base::LazyInstance<ContentUtilityClient>
139 g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER; 139 g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER;
140 #endif // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER 140 #endif // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER
141 141
142 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
143 #if defined __LP64__
144 #define kV8NativesDataDescriptor kV8NativesDataDescriptor64
145 #define kV8SnapshotDataDescriptor kV8SnapshotDataDescriptor64
146 #else
147 #define kV8NativesDataDescriptor kV8NativesDataDescriptor32
148 #define kV8SnapshotDataDescriptor kV8SnapshotDataDescriptor32
149 #endif
150 #endif
151
142 #if defined(OS_POSIX) && !defined(OS_IOS) 152 #if defined(OS_POSIX) && !defined(OS_IOS)
143 153
144 // Setup signal-handling state: resanitize most signals, ignore SIGPIPE. 154 // Setup signal-handling state: resanitize most signals, ignore SIGPIPE.
145 void SetupSignalHandlers() { 155 void SetupSignalHandlers() {
146 // Sanitise our signal handling state. Signals that were ignored by our 156 // Sanitise our signal handling state. Signals that were ignored by our
147 // parent will also be ignored by us. We also inherit our parent's sigmask. 157 // parent will also be ignored by us. We also inherit our parent's sigmask.
148 sigset_t empty_signal_set; 158 sigset_t empty_signal_set;
149 CHECK_EQ(0, sigemptyset(&empty_signal_set)); 159 CHECK_EQ(0, sigemptyset(&empty_signal_set));
150 CHECK_EQ(0, sigprocmask(SIG_SETMASK, &empty_signal_set, NULL)); 160 CHECK_EQ(0, sigprocmask(SIG_SETMASK, &empty_signal_set, NULL));
151 161
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 805
796 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 806 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
797 }; 807 };
798 808
799 // static 809 // static
800 ContentMainRunner* ContentMainRunner::Create() { 810 ContentMainRunner* ContentMainRunner::Create() {
801 return new ContentMainRunnerImpl(); 811 return new ContentMainRunnerImpl();
802 } 812 }
803 813
804 } // namespace content 814 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698