From 16db35b60df148be277d062651291cf98282ac67 Mon Sep 17 00:00:00 2001 From: "nduca@chromium.org" Date: Mon, 12 Sep 2011 19:57:20 +0000 Subject: 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 --- chrome/browser/gpu_uitest.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'chrome/browser/gpu_uitest.cc') 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"); -- cgit v1.1