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

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

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "fix gpu/command_buffer/client/cmd_buffer_helper to new macros" Created 9 years, 8 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) 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 #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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 } 228 }
229 229
230 private: 230 private:
231 base::TimeTicks begin_process_message_; 231 base::TimeTicks begin_process_message_;
232 base::Histogram* const process_times_; 232 base::Histogram* const process_times_;
233 DISALLOW_COPY_AND_ASSIGN(RendererMessageLoopObserver); 233 DISALLOW_COPY_AND_ASSIGN(RendererMessageLoopObserver);
234 }; 234 };
235 235
236 // mainline routine for running as the Renderer process 236 // mainline routine for running as the Renderer process
237 int RendererMain(const MainFunctionParams& parameters) { 237 int RendererMain(const MainFunctionParams& parameters) {
238 TRACE_EVENT_BEGIN("RendererMain", 0, ""); 238 TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
239 239
240 const CommandLine& parsed_command_line = parameters.command_line_; 240 const CommandLine& parsed_command_line = parameters.command_line_;
241 base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_; 241 base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
242 242
243 #if defined(OS_MACOSX) 243 #if defined(OS_MACOSX)
244 // TODO(viettrungluu): Code taken from browser_main.cc. 244 // TODO(viettrungluu): Code taken from browser_main.cc.
245 int pipefd[2]; 245 int pipefd[2];
246 int ret = pipe(pipefd); 246 int ret = pipe(pipefd);
247 if (ret < 0) { 247 if (ret < 0) {
248 PLOG(DFATAL) << "Failed to create pipe"; 248 PLOG(DFATAL) << "Failed to create pipe";
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 render_process.set_main_thread(new RenderThread()); 354 render_process.set_main_thread(new RenderThread());
355 #endif 355 #endif
356 356
357 platform.RunSandboxTests(); 357 platform.RunSandboxTests();
358 358
359 startup_timer.Stop(); // End of Startup Time Measurement. 359 startup_timer.Stop(); // End of Startup Time Measurement.
360 360
361 if (run_loop) { 361 if (run_loop) {
362 if (pool) 362 if (pool)
363 pool->Recycle(); 363 pool->Recycle();
364 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); 364 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
365 MessageLoop::current()->Run(); 365 MessageLoop::current()->Run();
366 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); 366 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
367 } 367 }
368 } 368 }
369 platform.PlatformUninitialize(); 369 platform.PlatformUninitialize();
370 TRACE_EVENT_END("RendererMain", 0, ""); 370 TRACE_EVENT_END_ETW("RendererMain", 0, "");
371 return 0; 371 return 0;
372 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698