diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-05 23:09:09 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-05 23:09:09 +0000 |
| commit | dfe14730bc4052cad2329088f827404570c1d9f8 (patch) | |
| tree | 4a1c3183d01a56bfbc80f93599a3eee7c328fefc | |
| parent | 72f05d6006238f840299aed5adde730558c1c10e (diff) | |
| download | chromium_src-dfe14730bc4052cad2329088f827404570c1d9f8.zip chromium_src-dfe14730bc4052cad2329088f827404570c1d9f8.tar.gz chromium_src-dfe14730bc4052cad2329088f827404570c1d9f8.tar.bz2 | |
XP bot fix.
Bypass Canvas2DAllowed on XP.
BUG=
TEST=XP bots
TBR=jbates
Review URL: https://chromiumcodereview.appspot.com/9605002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125019 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 689d8d0..4da5121 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -282,20 +282,19 @@ class Canvas2DEnabledTest : public GpuFeatureTest { }; IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DAllowed) { - GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType(); - EXPECT_EQ(type, 0); - - const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); - - GpuResultFlags expectations = EXPECT_GPU_SWAP_BUFFERS; #if defined(OS_WIN) // Accelerated canvas 2D is not supported on XP. GPUTestBotConfig test_bot; test_bot.LoadCurrentConfig(NULL); if (test_bot.os() == GPUTestConfig::kOsWinXP) - expectations = EXPECT_NO_GPU_PROCESS; + return; #endif - RunTest(url, expectations); + + GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType(); + EXPECT_EQ(type, 0); + + const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); + RunTest(url, EXPECT_GPU_SWAP_BUFFERS); } IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DBlocked) { |