diff options
Diffstat (limited to 'chrome/test/gpu/gpu_feature_browsertest.cc')
-rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index a1baa93..5e36c09 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -187,11 +187,15 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingAllowed) { RunEventTest(url, kSwapBuffersEvent, true); } -class AcceleratedCompositingBlockedTest : public GpuFeatureTest { - public: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { - GpuFeatureTest::SetUpInProcessBrowserTestFixture(); - const std::string json_blacklist = +#if defined(USE_AURA) +// Compositing is always on for Aura. +#define MAYBE_AcceleratedCompositingBlocked DISABLED_AcceleratedCompositingBlocked +#else +#define MAYBE_AcceleratedCompositingBlocked AcceleratedCompositingBlocked +#endif + +IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingBlocked) { + const std::string json_blacklist = "{\n" " \"name\": \"gpu blacklist\",\n" " \"version\": \"1.0\",\n" @@ -204,19 +208,7 @@ class AcceleratedCompositingBlockedTest : public GpuFeatureTest { " }\n" " ]\n" "}"; - SetupBlacklist(json_blacklist); - } -}; - -#if defined(USE_AURA) -// Compositing is always on for Aura. -#define MAYBE_AcceleratedCompositingBlocked DISABLED_AcceleratedCompositingBlocked -#else -#define MAYBE_AcceleratedCompositingBlocked AcceleratedCompositingBlocked -#endif - -IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest, - MAYBE_AcceleratedCompositingBlocked) { + SetupBlacklist(json_blacklist); EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)); @@ -366,11 +358,18 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP")) return; - EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); + bool is_blacklisted = false; +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) + // Blacklist rule #24 disables accelerated_2d_canvas on Linux. + is_blacklisted = true; +#endif + + EXPECT_EQ(is_blacklisted, + GpuDataManager::GetInstance()->IsFeatureBlacklisted( + gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); - RunEventTest(url, kAcceleratedCanvasCreationEvent, true); + RunEventTest(url, kAcceleratedCanvasCreationEvent, !is_blacklisted); } IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) { |