Chromium Code Reviews| Index: ui/views/test/views_test_base.cc |
| diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc |
| index d3dbd71dbcaa2e47e6c4579b74da0be2069fcb7e..ca691771cdbdaa4e47a073c96396fca05f2f9835 100644 |
| --- a/ui/views/test/views_test_base.cc |
| +++ b/ui/views/test/views_test_base.cc |
| @@ -23,8 +23,9 @@ namespace { |
| bool InitializeVisuals() { |
| #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| - static int depth = 0; |
| - static bool has_compositing_manager = false; |
| + bool has_compositing_manager = false; |
| + int depth = 0; |
| + bool using_argb_visual; |
| if (depth > 0) |
| return has_compositing_manager; |
| @@ -32,12 +33,13 @@ bool InitializeVisuals() { |
| // testing/xvfb.py runs xvfb and xcompmgr. |
| std::unique_ptr<base::Environment> env(base::Environment::Create()); |
| has_compositing_manager = env->HasVar("_CHROMIUM_INSIDE_XVFB"); |
| - ui::ChooseVisualForWindow(has_compositing_manager, NULL, &depth); |
| + ui::XVisualManager::GetInstance()->ChooseVisualForWindow( |
| + has_compositing_manager, nullptr, &depth, nullptr, &using_argb_visual); |
|
Julien Isorce Samsung
2016/09/28 17:42:52
Has it really a chance to return depth 32 since XV
Tom (Use chromium acct)
2016/09/28 18:36:01
The views tests are not failing, so it would appea
|
| - if (has_compositing_manager) |
| + if (using_argb_visual) |
| EXPECT_EQ(32, depth); |
| - return has_compositing_manager; |
| + return using_argb_visual; |
| #else |
| return false; |
| #endif |