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

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

Issue 11143009: [content shell] Always use the osmesa driver for layout tests, and disable the gpu blacklist (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« 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/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/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"
11 #include "content/public/browser/browser_main_runner.h" 11 #include "content/public/browser/browser_main_runner.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/public/common/url_constants.h" 13 #include "content/public/common/url_constants.h"
14 #include "content/shell/shell_browser_main.h" 14 #include "content/shell/shell_browser_main.h"
15 #include "content/shell/shell_content_browser_client.h" 15 #include "content/shell/shell_content_browser_client.h"
16 #include "content/shell/shell_content_renderer_client.h" 16 #include "content/shell/shell_content_renderer_client.h"
17 #include "content/shell/shell_switches.h" 17 #include "content/shell/shell_switches.h"
18 #include "content/shell/webkit_test_platform_support.h" 18 #include "content/shell/webkit_test_platform_support.h"
19 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/base/ui_base_paths.h" 21 #include "ui/base/ui_base_paths.h"
22 #include "ui/gl/gl_switches.h"
22 23
23 #if defined(OS_ANDROID) 24 #if defined(OS_ANDROID)
24 #include "base/global_descriptors_posix.h" 25 #include "base/global_descriptors_posix.h"
25 #include "content/shell/android/shell_descriptors.h" 26 #include "content/shell/android/shell_descriptors.h"
26 #endif 27 #endif
27 28
28 #if defined(OS_MACOSX) 29 #if defined(OS_MACOSX)
29 #include "content/shell/paths_mac.h" 30 #include "content/shell/paths_mac.h"
30 #endif // OS_MACOSX 31 #endif // OS_MACOSX
31 32
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #endif 87 #endif
87 88
88 InitLogging(); 89 InitLogging();
89 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { 90 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
90 CommandLine::ForCurrentProcess()->AppendSwitch( 91 CommandLine::ForCurrentProcess()->AppendSwitch(
91 switches::kAllowUniversalAccessFromFiles); 92 switches::kAllowUniversalAccessFromFiles);
92 CommandLine::ForCurrentProcess()->AppendSwitch( 93 CommandLine::ForCurrentProcess()->AppendSwitch(
93 switches::kAllowFileAccessFromFiles); 94 switches::kAllowFileAccessFromFiles);
94 CommandLine::ForCurrentProcess()->AppendSwitch( 95 CommandLine::ForCurrentProcess()->AppendSwitch(
95 switches::kForceCompositingMode); 96 switches::kForceCompositingMode);
97 CommandLine::ForCurrentProcess()->AppendSwitchASCII(
98 switches::kUseGL, gfx::kGLImplementationOSMesaName);
99 CommandLine::ForCurrentProcess()->AppendSwitch(
100 switches::kIgnoreGpuBlacklist);
96 net::CookieMonster::EnableFileScheme(); 101 net::CookieMonster::EnableFileScheme();
97 if (!WebKitTestPlatformInitialize()) { 102 if (!WebKitTestPlatformInitialize()) {
98 if (exit_code) 103 if (exit_code)
99 *exit_code = 1; 104 *exit_code = 1;
100 return true; 105 return true;
101 } 106 }
102 } 107 }
103 SetContentClient(&content_client_); 108 SetContentClient(&content_client_);
104 return false; 109 return false;
105 } 110 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 browser_client_.reset(new ShellContentBrowserClient); 174 browser_client_.reset(new ShellContentBrowserClient);
170 return browser_client_.get(); 175 return browser_client_.get();
171 } 176 }
172 177
173 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 178 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
174 renderer_client_.reset(new ShellContentRendererClient); 179 renderer_client_.reset(new ShellContentRendererClient);
175 return renderer_client_.get(); 180 return renderer_client_.get();
176 } 181 }
177 182
178 } // namespace content 183 } // 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