| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 306 |
| 307 TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering) { | 307 TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering) { |
| 308 // Blacklist, then register SwiftShader. | 308 // Blacklist, then register SwiftShader. |
| 309 ScopedGpuDataManagerImplPrivate manager; | 309 ScopedGpuDataManagerImplPrivate manager; |
| 310 manager->InitializeForTesting("", gpu::GPUInfo()); | 310 manager->InitializeForTesting("", gpu::GPUInfo()); |
| 311 EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); | 311 EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); |
| 312 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | 312 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
| 313 EXPECT_FALSE(manager->ShouldUseSwiftShader()); | 313 EXPECT_FALSE(manager->ShouldUseSwiftShader()); |
| 314 | 314 |
| 315 manager->DisableHardwareAcceleration(); | 315 manager->DisableHardwareAcceleration(); |
| 316 EXPECT_FALSE(manager->GpuAccessAllowed(NULL)); | |
| 317 EXPECT_FALSE(manager->ShouldUseSwiftShader()); | |
| 318 | |
| 319 // If SwiftShader is enabled, even if we blacklist GPU, | |
| 320 // GPU process is still allowed. | |
| 321 const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath")); | |
| 322 manager->RegisterSwiftShaderPath(test_path); | |
| 323 EXPECT_TRUE(manager->ShouldUseSwiftShader()); | 316 EXPECT_TRUE(manager->ShouldUseSwiftShader()); |
| 324 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | 317 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
| 325 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); | 318 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
| 326 EXPECT_TRUE(manager->IsFeatureBlacklisted( | 319 EXPECT_TRUE(manager->IsFeatureBlacklisted( |
| 327 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); | 320 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); |
| 328 } | 321 } |
| 329 | 322 |
| 330 TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering2) { | 323 TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering2) { |
| 331 // Register SwiftShader, then blacklist. | 324 // Register SwiftShader, then blacklist. |
| 332 ScopedGpuDataManagerImplPrivate manager; | 325 ScopedGpuDataManagerImplPrivate manager; |
| 333 manager->InitializeForTesting("", gpu::GPUInfo()); | 326 manager->InitializeForTesting("", gpu::GPUInfo()); |
| 334 EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); | 327 EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); |
| 335 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | 328 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
| 336 EXPECT_FALSE(manager->ShouldUseSwiftShader()); | 329 EXPECT_FALSE(manager->ShouldUseSwiftShader()); |
| 337 | 330 |
| 338 const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath")); | |
| 339 manager->RegisterSwiftShaderPath(test_path); | |
| 340 EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount()); | |
| 341 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | |
| 342 EXPECT_FALSE(manager->ShouldUseSwiftShader()); | |
| 343 | |
| 344 manager->DisableHardwareAcceleration(); | 331 manager->DisableHardwareAcceleration(); |
| 345 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | 332 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
| 346 EXPECT_TRUE(manager->ShouldUseSwiftShader()); | 333 EXPECT_TRUE(manager->ShouldUseSwiftShader()); |
| 347 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); | 334 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
| 348 EXPECT_TRUE(manager->IsFeatureBlacklisted( | 335 EXPECT_TRUE(manager->IsFeatureBlacklisted( |
| 349 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); | 336 gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)); |
| 350 } | 337 } |
| 351 | 338 |
| 352 TEST_F(GpuDataManagerImplPrivateTest, GpuInfoUpdate) { | 339 TEST_F(GpuDataManagerImplPrivateTest, GpuInfoUpdate) { |
| 353 ScopedGpuDataManagerImpl manager; | 340 ScopedGpuDataManagerImpl manager; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 368 run_loop.RunUntilIdle(); | 355 run_loop.RunUntilIdle(); |
| 369 } | 356 } |
| 370 EXPECT_TRUE(observer.gpu_info_updated()); | 357 EXPECT_TRUE(observer.gpu_info_updated()); |
| 371 } | 358 } |
| 372 | 359 |
| 373 TEST_F(GpuDataManagerImplPrivateTest, NoGpuInfoUpdateWithSwiftShader) { | 360 TEST_F(GpuDataManagerImplPrivateTest, NoGpuInfoUpdateWithSwiftShader) { |
| 374 ScopedGpuDataManagerImpl manager; | 361 ScopedGpuDataManagerImpl manager; |
| 375 manager->InitializeForTesting("", gpu::GPUInfo()); | 362 manager->InitializeForTesting("", gpu::GPUInfo()); |
| 376 | 363 |
| 377 manager->DisableHardwareAcceleration(); | 364 manager->DisableHardwareAcceleration(); |
| 378 const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath")); | |
| 379 manager->RegisterSwiftShaderPath(test_path); | |
| 380 EXPECT_TRUE(manager->ShouldUseSwiftShader()); | 365 EXPECT_TRUE(manager->ShouldUseSwiftShader()); |
| 381 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); | 366 EXPECT_TRUE(manager->GpuAccessAllowed(NULL)); |
| 382 | 367 |
| 383 { | 368 { |
| 384 base::RunLoop run_loop; | 369 base::RunLoop run_loop; |
| 385 run_loop.RunUntilIdle(); | 370 run_loop.RunUntilIdle(); |
| 386 } | 371 } |
| 387 | 372 |
| 388 TestObserver observer; | 373 TestObserver observer; |
| 389 manager->AddObserver(&observer); | 374 manager->AddObserver(&observer); |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1)); | 817 EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1)); |
| 833 { | 818 { |
| 834 base::RunLoop run_loop; | 819 base::RunLoop run_loop; |
| 835 run_loop.RunUntilIdle(); | 820 run_loop.RunUntilIdle(); |
| 836 } | 821 } |
| 837 EXPECT_TRUE(observer.gpu_info_updated()); | 822 EXPECT_TRUE(observer.gpu_info_updated()); |
| 838 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); | 823 EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount()); |
| 839 } | 824 } |
| 840 | 825 |
| 841 } // namespace content | 826 } // namespace content |
| OLD | NEW |