diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 19:57:20 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 19:57:20 +0000 |
| commit | 16db35b60df148be277d062651291cf98282ac67 (patch) | |
| tree | 0a7b3a851a4e721eb4c5a247eb6935b1db1f8fe6 /chrome/browser/gpu_uitest.cc | |
| parent | 48ed52b2e67987bf5b835ffa86194ee641afbb6a (diff) | |
| download | chromium_src-16db35b60df148be277d062651291cf98282ac67.zip chromium_src-16db35b60df148be277d062651291cf98282ac67.tar.gz chromium_src-16db35b60df148be277d062651291cf98282ac67.tar.bz2 | |
Conditionally disable accelerated compositing for certain tests
Review URL: http://codereview.chromium.org/7826034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_uitest.cc')
| -rw-r--r-- | chrome/browser/gpu_uitest.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/gpu_uitest.cc b/chrome/browser/gpu_uitest.cc index d4c2c3bc..7cc0019 100644 --- a/chrome/browser/gpu_uitest.cc +++ b/chrome/browser/gpu_uitest.cc @@ -17,16 +17,6 @@ class GPUUITest : public UITest { } virtual void SetUp() { - EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation( - &launch_arguments_, - gfx::kGLImplementationOSMesaName)); - -#if defined(OS_MACOSX) - // Accelerated compositing does not work with OSMesa. AcceleratedSurface - // assumes GL contexts are native. - launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing); -#endif - UITest::SetUp(); gpu_test_dir_ = test_data_directory_.AppendASCII("gpu"); |