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 #include "app/app_switches.h" | 5 #include "app/app_switches.h" |
6 #include "app/gfx/gl/gl_implementation.h" | 6 #include "app/gfx/gl/gl_implementation.h" |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 | 121 |
122 bool enable_gp_fault_error_box = false; | 122 bool enable_gp_fault_error_box = false; |
123 enable_gp_fault_error_box = | 123 enable_gp_fault_error_box = |
124 parsed_command_line.HasSwitch(test_shell::kGPFaultErrorBox); | 124 parsed_command_line.HasSwitch(test_shell::kGPFaultErrorBox); |
125 | 125 |
126 bool allow_external_pages = | 126 bool allow_external_pages = |
127 parsed_command_line.HasSwitch(test_shell::kAllowExternalPages); | 127 parsed_command_line.HasSwitch(test_shell::kAllowExternalPages); |
128 | 128 |
129 if (parsed_command_line.HasSwitch(test_shell::kEnableAccel2DCanvas)) | 129 if (parsed_command_line.HasSwitch(test_shell::kEnableAccel2DCanvas)) |
130 TestShell::SetAccelerated2dCanvasEnabled(true); | 130 TestShell::SetAccelerated2dCanvasEnabled(true); |
| 131 if (parsed_command_line.HasSwitch(test_shell::kEnableAccelCompositing)) |
| 132 TestShell::SetAcceleratedCompositingEnabled(true); |
131 | 133 |
132 TestShell::InitLogging(suppress_error_dialogs, | 134 TestShell::InitLogging(suppress_error_dialogs, |
133 layout_test_mode, | 135 layout_test_mode, |
134 enable_gp_fault_error_box); | 136 enable_gp_fault_error_box); |
135 | 137 |
136 // Initialize WebKit for this scope. | 138 // Initialize WebKit for this scope. |
137 TestShellWebKitInit test_shell_webkit_init(layout_test_mode); | 139 TestShellWebKitInit test_shell_webkit_init(layout_test_mode); |
138 | 140 |
139 // Suppress abort message in v8 library in debugging mode (but not | 141 // Suppress abort message in v8 library in debugging mode (but not |
140 // actually under a debugger). V8 calls abort() when it hits | 142 // actually under a debugger). V8 calls abort() when it hits |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 TestShell::ShutdownTestShell(); | 397 TestShell::ShutdownTestShell(); |
396 TestShell::CleanupLogging(); | 398 TestShell::CleanupLogging(); |
397 | 399 |
398 // Tear down shared StatsTable; prevents unit_tests from leaking it. | 400 // Tear down shared StatsTable; prevents unit_tests from leaking it. |
399 StatsTable::set_current(NULL); | 401 StatsTable::set_current(NULL); |
400 delete table; | 402 delete table; |
401 RemoveSharedMemoryFile(stats_filename); | 403 RemoveSharedMemoryFile(stats_filename); |
402 | 404 |
403 return 0; | 405 return 0; |
404 } | 406 } |
OLD | NEW |