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 "content/shell/app/shell_main_delegate.h" | 5 #include "content/shell/app/shell_main_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 | 107 |
108 InitLogging(); | 108 InitLogging(); |
109 CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 109 CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
110 if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) { | 110 if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) { |
111 if (!CheckLayoutSystemDeps()) { | 111 if (!CheckLayoutSystemDeps()) { |
112 if (exit_code) | 112 if (exit_code) |
113 *exit_code = 1; | 113 *exit_code = 1; |
114 return true; | 114 return true; |
115 } | 115 } |
116 } | 116 } |
| 117 |
| 118 #if defined(OS_ANDROID) |
| 119 // Disable <canvas> path antialiasing for consistency with Android Chrome. |
| 120 command_line.AppendSwitch(switches::kDisable2dCanvasAntialiasing); |
| 121 #endif |
| 122 |
117 if (command_line.HasSwitch(switches::kDumpRenderTree)) { | 123 if (command_line.HasSwitch(switches::kDumpRenderTree)) { |
118 EnableBrowserLayoutTestMode(); | 124 EnableBrowserLayoutTestMode(); |
119 | 125 |
120 command_line.AppendSwitch(switches::kProcessPerTab); | 126 command_line.AppendSwitch(switches::kProcessPerTab); |
121 command_line.AppendSwitch(switches::kEnableLogging); | 127 command_line.AppendSwitch(switches::kEnableLogging); |
122 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); | 128 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); |
123 #if !defined(OS_ANDROID) | 129 #if !defined(OS_ANDROID) |
124 // OSMesa is not yet available for Android. http://crbug.com/248925 | 130 // OSMesa is not yet available for Android. http://crbug.com/248925 |
125 command_line.AppendSwitchASCII( | 131 command_line.AppendSwitchASCII( |
126 switches::kUseGL, gfx::kGLImplementationOSMesaName); | 132 switches::kUseGL, gfx::kGLImplementationOSMesaName); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 browser_client_.reset(new ShellContentBrowserClient); | 232 browser_client_.reset(new ShellContentBrowserClient); |
227 return browser_client_.get(); | 233 return browser_client_.get(); |
228 } | 234 } |
229 | 235 |
230 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 236 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
231 renderer_client_.reset(new ShellContentRendererClient); | 237 renderer_client_.reset(new ShellContentRendererClient); |
232 return renderer_client_.get(); | 238 return renderer_client_.get(); |
233 } | 239 } |
234 | 240 |
235 } // namespace content | 241 } // namespace content |
OLD | NEW |