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

Side by Side Diff: content/renderer/renderer_main.cc

Issue 7637014: Revert 96565 - Warm up locale and KsecDD in renderer sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/trace_event.h" 6 #include "base/debug/trace_event.h"
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/mac/scoped_nsautorelease_pool.h" 8 #include "base/mac/scoped_nsautorelease_pool.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 { 202 {
203 #if defined(OS_WIN) || defined(OS_MACOSX) 203 #if defined(OS_WIN) || defined(OS_MACOSX)
204 // TODO(markus): Check if it is OK to unconditionally move this 204 // TODO(markus): Check if it is OK to unconditionally move this
205 // instruction down. 205 // instruction down.
206 RenderProcessImpl render_process; 206 RenderProcessImpl render_process;
207 render_process.set_main_thread(new RenderThread()); 207 render_process.set_main_thread(new RenderThread());
208 #endif 208 #endif
209 bool run_loop = true; 209 bool run_loop = true;
210 if (!no_sandbox) { 210 if (!no_sandbox) {
211 // Cause advapi32 to load before the sandbox is turned on.
212 unsigned int dummy_rand;
213 rand_s(&dummy_rand);
214 // Warm up language subsystems before the sandbox is turned on.
215 ::GetUserDefaultLangID();
216 ::GetUserDefaultLCID();
217 run_loop = platform.EnableSandbox(); 211 run_loop = platform.EnableSandbox();
218 } else { 212 } else {
219 LOG(ERROR) << "Running without renderer sandbox"; 213 LOG(ERROR) << "Running without renderer sandbox";
220 } 214 }
221 #if defined(OS_POSIX) && !defined(OS_MACOSX) 215 #if defined(OS_POSIX) && !defined(OS_MACOSX)
222 RenderProcessImpl render_process; 216 RenderProcessImpl render_process;
223 render_process.set_main_thread(new RenderThread()); 217 render_process.set_main_thread(new RenderThread());
224 #endif 218 #endif
225 219
226 platform.RunSandboxTests(); 220 platform.RunSandboxTests();
227 221
228 startup_timer.Stop(); // End of Startup Time Measurement. 222 startup_timer.Stop(); // End of Startup Time Measurement.
229 223
230 if (run_loop) { 224 if (run_loop) {
231 if (pool) 225 if (pool)
232 pool->Recycle(); 226 pool->Recycle();
233 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0); 227 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
234 MessageLoop::current()->Run(); 228 MessageLoop::current()->Run();
235 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 229 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
236 } 230 }
237 } 231 }
238 platform.PlatformUninitialize(); 232 platform.PlatformUninitialize();
239 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 233 TRACE_EVENT_END_ETW("RendererMain", 0, "");
240 return 0; 234 return 0;
241 } 235 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698