Index: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc |
diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc |
index 86c525d65d3d95d6117df85e0f6c6c39e62355ff..137e9ca0a51ea7dfef90c68397b4a08dc3d7cd96 100644 |
--- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc |
+++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc |
@@ -185,8 +185,8 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklisting) { |
manager->GetBlacklistedFeatureCount()); |
EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2)); |
} else { |
- EXPECT_FALSE(manager->GpuAccessAllowed(&reason)); |
- EXPECT_FALSE(reason.empty()); |
+ EXPECT_TRUE(manager->GpuAccessAllowed(&reason)); |
+ EXPECT_TRUE(reason.empty()); |
EXPECT_EQ(2u, manager->GetBlacklistedFeatureCount()); |
EXPECT_FALSE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2)); |
} |
@@ -570,7 +570,12 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStrings) { |
// Not enough GPUInfo. |
EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ if (manager->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
+ manager->GetBlacklistedFeatureCount()); |
+ } else { |
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ } |
// Now assume browser gets GL strings from local state. |
// The entry applies, blacklist more features than from the preliminary step. |
@@ -578,7 +583,12 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStrings) { |
// happens before renderer launching. |
manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa801); |
EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ if (manager->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
+ manager->GetBlacklistedFeatureCount()); |
+ } else { |
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ } |
EXPECT_TRUE( |
manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)); |
} |
@@ -611,7 +621,12 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) { |
// Full GPUInfo, the entry applies. |
EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ if (manager->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
+ manager->GetBlacklistedFeatureCount()); |
+ } else { |
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ } |
EXPECT_TRUE( |
manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)); |
@@ -620,7 +635,12 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) { |
// (Otherwise the entry should not apply.) |
manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa802); |
EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ if (manager->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
+ manager->GetBlacklistedFeatureCount()); |
+ } else { |
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ } |
EXPECT_TRUE( |
manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)); |
} |
@@ -651,7 +671,13 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsDefered) { |
manager->InitializeForTesting(kData, gpu_info); |
EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
- EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ if (manager->ShouldUseSwiftShader()) { |
+ EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
+ manager->GetBlacklistedFeatureCount()); |
+ } else { |
+ EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
+ } |
+ |
EXPECT_TRUE( |
manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)); |
} |
@@ -745,20 +771,18 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) { |
run_loop.RunUntilIdle(); |
} |
EXPECT_TRUE(observer.gpu_info_updated()); |
- |
EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
manager->GetBlacklistedFeatureCount()); |
} else { |
EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
- // Update with the same Intel GPU active. |
+ // Update to previous Intel GPU. |
EXPECT_FALSE(manager->UpdateActiveGpu(0x8086, 0x04a1)); |
{ |
base::RunLoop run_loop; |
run_loop.RunUntilIdle(); |
} |
EXPECT_FALSE(observer.gpu_info_updated()); |
- |
EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
} |
@@ -779,24 +803,18 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) { |
observer.Reset(); |
EXPECT_FALSE(observer.gpu_info_updated()); |
+ // Update to previous NVIDIA GPU. |
+ EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640)); |
+ { |
+ base::RunLoop run_loop; |
+ run_loop.RunUntilIdle(); |
+ } |
+ EXPECT_FALSE(observer.gpu_info_updated()); |
Ken Russell (switch to Gerrit)
2017/04/11 22:03:45
It's a little confusing to me that the EXPECT_TRUE
|
+ |
if (manager->ShouldUseSwiftShader()) { |
- // Update to previous NVIDIA GPU. |
- EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640)); |
- { |
- base::RunLoop run_loop; |
- run_loop.RunUntilIdle(); |
- } |
- EXPECT_TRUE(observer.gpu_info_updated()); |
EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES), |
manager->GetBlacklistedFeatureCount()); |
} else { |
- // Update with the same NVIDIA GPU active. |
- EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640)); |
- { |
- base::RunLoop run_loop; |
- run_loop.RunUntilIdle(); |
- } |
- EXPECT_FALSE(observer.gpu_info_updated()); |
EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); |
} |