OLD | NEW |
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 <stdlib.h> | 5 #include <stdlib.h> |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif | 10 #endif |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 deferred_messages.Get().push(new GpuHostMsg_OnLogMessage( | 97 deferred_messages.Get().push(new GpuHostMsg_OnLogMessage( |
98 severity, header, message)); | 98 severity, header, message)); |
99 return false; | 99 return false; |
100 } | 100 } |
101 | 101 |
102 } // namespace anonymous | 102 } // namespace anonymous |
103 | 103 |
104 // Main function for starting the Gpu process. | 104 // Main function for starting the Gpu process. |
105 int GpuMain(const MainFunctionParams& parameters) { | 105 int GpuMain(const MainFunctionParams& parameters) { |
106 TRACE_EVENT0("gpu", "GpuMain"); | 106 TRACE_EVENT0("gpu", "GpuMain"); |
107 base::debug::TraceLog::GetInstance()->SetProcessName("GPU Process"); | 107 base::trace_event::TraceLog::GetInstance()->SetProcessName("GPU Process"); |
108 base::debug::TraceLog::GetInstance()->SetProcessSortIndex( | 108 base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex( |
109 kTraceEventGpuProcessSortIndex); | 109 kTraceEventGpuProcessSortIndex); |
110 | 110 |
111 const base::CommandLine& command_line = parameters.command_line; | 111 const base::CommandLine& command_line = parameters.command_line; |
112 if (command_line.HasSwitch(switches::kGpuStartupDialog)) { | 112 if (command_line.HasSwitch(switches::kGpuStartupDialog)) { |
113 ChildProcess::WaitForDebugger("Gpu"); | 113 ChildProcess::WaitForDebugger("Gpu"); |
114 } | 114 } |
115 | 115 |
116 base::Time start_time = base::Time::Now(); | 116 base::Time start_time = base::Time::Now(); |
117 | 117 |
118 #if defined(OS_WIN) | 118 #if defined(OS_WIN) |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 return true; | 532 return true; |
533 } | 533 } |
534 | 534 |
535 return false; | 535 return false; |
536 } | 536 } |
537 #endif // defined(OS_WIN) | 537 #endif // defined(OS_WIN) |
538 | 538 |
539 } // namespace. | 539 } // namespace. |
540 | 540 |
541 } // namespace content | 541 } // namespace content |
OLD | NEW |