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

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

Issue 6551019: Trace_event upgrades (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More gooder js thanks to arv. Created 9 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 | Annotate | Revision Log
OLDNEW
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 "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 *bad_pointer = 0; 173 *bad_pointer = 0;
174 } 174 }
175 175
176 if (command_line.HasSwitch(switches::kRendererStartupDialog)) { 176 if (command_line.HasSwitch(switches::kRendererStartupDialog)) {
177 ChildProcess::WaitForDebugger(L"Renderer"); 177 ChildProcess::WaitForDebugger(L"Renderer");
178 } 178 }
179 } 179 }
180 180
181 // mainline routine for running as the Renderer process 181 // mainline routine for running as the Renderer process
182 int RendererMain(const MainFunctionParams& parameters) { 182 int RendererMain(const MainFunctionParams& parameters) {
183 TRACE_EVENT_BEGIN("RendererMain", 0, ""); 183 TRACE_EVENT_BEGIN_LEGACY("RendererMain", 0, "");
184 184
185 const CommandLine& parsed_command_line = parameters.command_line_; 185 const CommandLine& parsed_command_line = parameters.command_line_;
186 base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_; 186 base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
187 187
188 #if defined(OS_MACOSX) 188 #if defined(OS_MACOSX)
189 // TODO(viettrungluu): Code taken from browser_main.cc. 189 // TODO(viettrungluu): Code taken from browser_main.cc.
190 int pipefd[2]; 190 int pipefd[2];
191 int ret = pipe(pipefd); 191 int ret = pipe(pipefd);
192 if (ret < 0) { 192 if (ret < 0) {
193 PLOG(DFATAL) << "Failed to create pipe"; 193 PLOG(DFATAL) << "Failed to create pipe";
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 render_process.set_main_thread(new RenderThread()); 289 render_process.set_main_thread(new RenderThread());
290 #endif 290 #endif
291 291
292 platform.RunSandboxTests(); 292 platform.RunSandboxTests();
293 293
294 startup_timer.Stop(); // End of Startup Time Measurement. 294 startup_timer.Stop(); // End of Startup Time Measurement.
295 295
296 if (run_loop) { 296 if (run_loop) {
297 if (pool) 297 if (pool)
298 pool->Recycle(); 298 pool->Recycle();
299 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); 299 TRACE_EVENT_BEGIN_LEGACY("RendererMain.START_MSG_LOOP", 0, 0);
300 MessageLoop::current()->Run(); 300 MessageLoop::current()->Run();
301 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); 301 TRACE_EVENT_END_LEGACY("RendererMain.START_MSG_LOOP", 0, 0);
302 } 302 }
303 } 303 }
304 platform.PlatformUninitialize(); 304 platform.PlatformUninitialize();
305 TRACE_EVENT_END("RendererMain", 0, ""); 305 TRACE_EVENT_END_LEGACY("RendererMain", 0, "");
306 return 0; 306 return 0;
307 } 307 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698