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/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/files/file.h" | 10 #include "base/files/file.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { | 166 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { |
167 command_line.AppendSwitch(switches::kDisableThreadedCompositing); | 167 command_line.AppendSwitch(switches::kDisableThreadedCompositing); |
168 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); | 168 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); |
169 command_line.AppendSwitch(switches::kDisableImplSidePainting); | 169 command_line.AppendSwitch(switches::kDisableImplSidePainting); |
170 // Text blobs are normally disabled when kDisableImplSidePainting is | 170 // Text blobs are normally disabled when kDisableImplSidePainting is |
171 // present to ensure correct LCD behavior, but for layout tests we want | 171 // present to ensure correct LCD behavior, but for layout tests we want |
172 // them on because LCD is always suppressed. | 172 // them on because LCD is always suppressed. |
173 command_line.AppendSwitch(switches::kForceTextBlobs); | 173 command_line.AppendSwitch(switches::kForceTextBlobs); |
174 } | 174 } |
175 | 175 |
| 176 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { |
| 177 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); |
| 178 } |
| 179 |
176 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 180 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
177 command_line.AppendSwitch(switches::kMuteAudio); | 181 command_line.AppendSwitch(switches::kMuteAudio); |
178 | 182 |
179 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 183 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
180 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); | 184 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); |
181 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); | 185 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |
182 | 186 |
183 command_line.AppendSwitch(switches::kEnableFileCookies); | 187 command_line.AppendSwitch(switches::kEnableFileCookies); |
184 | 188 |
185 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); | 189 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 326 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
323 renderer_client_.reset( | 327 renderer_client_.reset( |
324 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ? | 328 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ? |
325 new LayoutTestContentRendererClient : | 329 new LayoutTestContentRendererClient : |
326 new ShellContentRendererClient); | 330 new ShellContentRendererClient); |
327 | 331 |
328 return renderer_client_.get(); | 332 return renderer_client_.get(); |
329 } | 333 } |
330 | 334 |
331 } // namespace content | 335 } // namespace content |
OLD | NEW |