diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 19:52:12 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 19:52:12 +0000 |
| commit | 1ef6d1ba3956ba239456e5070d6f08e0ab0c3483 (patch) | |
| tree | 540442b9cf23dcff26e0bb67832aeae829cd7e3b | |
| parent | 4bdeb9865d23bec03b7a16dfb7d74dc69d5f399e (diff) | |
| download | chromium_src-1ef6d1ba3956ba239456e5070d6f08e0ab0c3483.zip chromium_src-1ef6d1ba3956ba239456e5070d6f08e0ab0c3483.tar.gz chromium_src-1ef6d1ba3956ba239456e5070d6f08e0ab0c3483.tar.bz2 | |
Disable GpuFeatureTest.Canvas2DAllowed in software compositing mode.
NOTRY=True
TBR=jbauman
BUG=306790
Review URL: https://codereview.chromium.org/27098002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228377 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 5e14cc4..6263e2d 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -357,6 +357,12 @@ IN_PROC_BROWSER_TEST_F(WebGLMultisamplingTest, MultisamplingDisabled) { } IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { +#if defined(USE_AURA) + // TODO(gpu): Fix this test in software compositing mode: + // http://crbug.com/306790. + if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) + return; +#endif // Accelerated canvas 2D is not supported on XP. if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; |