Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 981753002: Turn on property tree verification for layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); 183 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas);
184 } 184 }
185 185
186 command_line.AppendSwitch(switches::kEnableInbandTextTracks); 186 command_line.AppendSwitch(switches::kEnableInbandTextTracks);
187 command_line.AppendSwitch(switches::kMuteAudio); 187 command_line.AppendSwitch(switches::kMuteAudio);
188 188
189 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. 189 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
190 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); 190 command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
191 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 191 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
192 192
193 command_line.AppendSwitch(cc::switches::kEnablePropertyTreeVerification);
194
193 command_line.AppendSwitch(switches::kEnableFileCookies); 195 command_line.AppendSwitch(switches::kEnableFileCookies);
194 196
195 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 197 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
196 198
197 command_line.AppendSwitchASCII(switches::kHostResolverRules, 199 command_line.AppendSwitchASCII(switches::kHostResolverRules,
198 "MAP *.test 127.0.0.1"); 200 "MAP *.test 127.0.0.1");
199 201
200 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. 202 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone.
201 command_line.AppendSwitch(switches::kEnableNpapi); 203 command_line.AppendSwitch(switches::kEnableNpapi);
202 204
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 337 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
336 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( 338 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
337 switches::kRunLayoutTest) 339 switches::kRunLayoutTest)
338 ? new LayoutTestContentRendererClient 340 ? new LayoutTestContentRendererClient
339 : new ShellContentRendererClient); 341 : new ShellContentRendererClient);
340 342
341 return renderer_client_.get(); 343 return renderer_client_.get();
342 } 344 }
343 345
344 } // namespace content 346 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698