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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 #endif | 159 #endif |
160 | 160 |
161 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { | 161 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { |
162 command_line.AppendSwitch( | 162 command_line.AppendSwitch( |
163 switches::kEnableExperimentalWebPlatformFeatures); | 163 switches::kEnableExperimentalWebPlatformFeatures); |
164 } | 164 } |
165 | 165 |
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 // Text blobs are normally disabled when kDisableImplSidePainting is | 170 // Text blobs are normally disabled when kDisableImplSidePainting is |
170 // 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 |
171 // them on because LCD is always suppressed. | 172 // them on because LCD is always suppressed. |
172 command_line.AppendSwitch(switches::kForceTextBlobs); | 173 command_line.AppendSwitch(switches::kForceTextBlobs); |
173 | |
174 if (!command_line.HasSwitch(switches::kEnableImplSidePainting)) | |
175 command_line.AppendSwitch(switches::kDisableImplSidePainting); | |
176 } | 174 } |
177 | 175 |
178 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { | 176 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { |
179 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); | 177 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); |
180 } | 178 } |
181 | 179 |
182 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 180 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
183 command_line.AppendSwitch(switches::kMuteAudio); | 181 command_line.AppendSwitch(switches::kMuteAudio); |
184 | 182 |
185 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 183 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 326 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
329 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( | 327 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
330 switches::kDumpRenderTree) | 328 switches::kDumpRenderTree) |
331 ? new LayoutTestContentRendererClient | 329 ? new LayoutTestContentRendererClient |
332 : new ShellContentRendererClient); | 330 : new ShellContentRendererClient); |
333 | 331 |
334 return renderer_client_.get(); | 332 return renderer_client_.get(); |
335 } | 333 } |
336 | 334 |
337 } // namespace content | 335 } // namespace content |
OLD | NEW |