OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #if defined(OS_MACOSX) | 5 #if defined(OS_MACOSX) |
6 #include <signal.h> | 6 #include <signal.h> |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 #endif // OS_MACOSX | 8 #endif // OS_MACOSX |
9 | 9 |
10 #include "app/hi_res_timer_manager.h" | 10 #include "app/hi_res_timer_manager.h" |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
271 { | 271 { |
272 #if !defined(OS_LINUX) | 272 #if !defined(OS_LINUX) |
273 // TODO(markus): Check if it is OK to unconditionally move this | 273 // TODO(markus): Check if it is OK to unconditionally move this |
274 // instruction down. | 274 // instruction down. |
275 RenderProcessImpl render_process; | 275 RenderProcessImpl render_process; |
276 render_process.set_main_thread(new RenderThread()); | 276 render_process.set_main_thread(new RenderThread()); |
277 #endif | 277 #endif |
278 bool run_loop = true; | 278 bool run_loop = true; |
279 if (!no_sandbox) { | 279 if (!no_sandbox) { |
280 run_loop = platform.EnableSandbox(); | 280 run_loop = platform.EnableSandbox(); |
281 } else { | |
282 LOG(ERROR) << "Running without renderer sandbox"; | |
vtl
2010/12/01 22:52:11
This will annoy lots of Linux developers. Good.
| |
281 } | 283 } |
282 #if defined(OS_LINUX) | 284 #if defined(OS_LINUX) |
283 RenderProcessImpl render_process; | 285 RenderProcessImpl render_process; |
284 render_process.set_main_thread(new RenderThread()); | 286 render_process.set_main_thread(new RenderThread()); |
285 #endif | 287 #endif |
286 | 288 |
287 platform.RunSandboxTests(); | 289 platform.RunSandboxTests(); |
288 | 290 |
289 startup_timer.Stop(); // End of Startup Time Measurement. | 291 startup_timer.Stop(); // End of Startup Time Measurement. |
290 | 292 |
291 if (run_loop) { | 293 if (run_loop) { |
292 if (pool) | 294 if (pool) |
293 pool->Recycle(); | 295 pool->Recycle(); |
294 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); | 296 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); |
295 MessageLoop::current()->Run(); | 297 MessageLoop::current()->Run(); |
296 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); | 298 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); |
297 } | 299 } |
298 } | 300 } |
299 platform.PlatformUninitialize(); | 301 platform.PlatformUninitialize(); |
300 TRACE_EVENT_END("RendererMain", 0, ""); | 302 TRACE_EVENT_END("RendererMain", 0, ""); |
301 return 0; | 303 return 0; |
302 } | 304 } |
OLD | NEW |