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

Unified Diff: chrome/browser/gpu_browsertest.cc

Issue 8347007: Used use-gl=any instead of forcing osmesa for gpu browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/gpu_crash_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gpu_browsertest.cc
===================================================================
--- chrome/browser/gpu_browsertest.cc (revision 106080)
+++ chrome/browser/gpu_browsertest.cc (working copy)
@@ -33,40 +33,16 @@
virtual void SetUpCommandLine(CommandLine* command_line) {
InProcessBrowserTest::SetUpCommandLine(command_line);
- EXPECT_TRUE(test_launcher_utils::OverrideGLImplementation(
- command_line,
- gfx::kGLImplementationOSMesaName));
+ // GPU tests require gpu acceleration.
+ // We do not care which GL backend is used.
+ command_line->AppendSwitchASCII(switches::kUseGL, "any");
command_line->AppendSwitch(switches::kDisablePopupBlocking);
-
-#if defined(OS_MACOSX)
- // Accelerated compositing does not work with OSMesa. AcceleratedSurface
- // assumes GL contexts are native.
- command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
-#endif
}
FilePath gpu_test_dir_;
};
-#if defined(TOOLKIT_VIEWS)
-// Flaky on Windows (dbg): http://crbug.com/72608
-// For ChromeOS: http://crbug.com/76217
-#define MAYBE_BrowserTestCanLaunchWithOSMesa DISABLED_BrowserTestCanLaunchWithOSMesa
-#else
-#define MAYBE_BrowserTestCanLaunchWithOSMesa BrowserTestCanLaunchWithOSMesa
-#endif
-
-IN_PROC_BROWSER_TEST_F(GPUBrowserTest, MAYBE_BrowserTestCanLaunchWithOSMesa) {
- // Check the webgl test reports success and that the renderer was OSMesa.
- ui_test_utils::NavigateToURL(
- browser(),
- net::FilePathToFileURL(gpu_test_dir_.AppendASCII("webgl.html")));
-
- EXPECT_EQ(ASCIIToUTF16("SUCCESS: WebKit WebGL"),
- browser()->GetSelectedTabContents()->GetTitle());
-}
-
// Test is flaky and timing out. See crbug.com/99883
IN_PROC_BROWSER_TEST_F(GPUBrowserTest,
DISABLED_CanOpenPopupAndRenderWithWebGLCanvas) {
« no previous file with comments | « no previous file | chrome/browser/gpu_crash_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698