diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:30:53 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 02:30:53 +0000 |
| commit | 4f4f3f6bdb8ac5461298923757970e071230c810 (patch) | |
| tree | 1dc264dbf4a8c8b6c70d5198c5adb3938f073e38 /chrome/browser/gpu_crash_browsertest.cc | |
| parent | c29240a21de2e855328792ae5b755c026cfc80eb (diff) | |
| download | chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.zip chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.tar.gz chromium_src-4f4f3f6bdb8ac5461298923757970e071230c810.tar.bz2 | |
Revert 105914 - Removed the ability to disable accelerated compositing for UI tests. There is no need to disable accelerated compositing on any platform. Mac bots are always accelerated. Mesa works fine on others.
BUG=95782
Broke Linux TSAN.
Review URL: http://codereview.chromium.org/7996010
TBR=alokp@chromium.org
Review URL: http://codereview.chromium.org/8330008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_crash_browsertest.cc')
| -rw-r--r-- | chrome/browser/gpu_crash_browsertest.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/gpu_crash_browsertest.cc b/chrome/browser/gpu_crash_browsertest.cc index a8cf8d9..344bcd8 100644 --- a/chrome/browser/gpu_crash_browsertest.cc +++ b/chrome/browser/gpu_crash_browsertest.cc @@ -35,9 +35,17 @@ class GPUCrashTest : public InProcessBrowserTest { EnableDOMAutomation(); InProcessBrowserTest::SetUpCommandLine(command_line); - // GPU tests require gpu acceleration. - // We do not care which GL backend is used. - command_line->AppendSwitchASCII(switches::kUseGL, "any"); + // OverrideGLImplementation and kDisableAcceleratedCompositing for + // OS_MACOSX are Taken verbatim from gpu_pixel_browsertest.cc and + // gpu_browsertest.cc. + EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation( + command_line, + gfx::kGLImplementationOSMesaName)); +#if defined(OS_MACOSX) + // Accelerated compositing does not work with OSMesa. AcceleratedSurface + // assumes GL contexts are native. + command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); +#endif } virtual void SetUpInProcessBrowserTestFixture() { FilePath test_dir; |