Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2420)

Unified Diff: extensions/browser/api/app_window/app_window_apitest.cc

Issue 2124633002: Add new gpu driver bug workaround DISABLE_TRANSPARENT_VISUALS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just make sure the new gpu driver workaround exist in second test instead of using fake values Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/gpu/page_sets/gpu_process_tests.py ('k') | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/app_window/app_window_apitest.cc
diff --git a/extensions/browser/api/app_window/app_window_apitest.cc b/extensions/browser/api/app_window/app_window_apitest.cc
index 63ac734d842153fbe1796ac190c3da459112a44f..3d68f8626e6c0a2b07cb718e8542875fdd2eeb35 100644
--- a/extensions/browser/api/app_window/app_window_apitest.cc
+++ b/extensions/browser/api/app_window/app_window_apitest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
@@ -23,6 +24,10 @@
#include "ui/base/win/shell.h"
#endif
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+#include "ui/gfx/x/x11_switches.h"
+#endif
+
namespace extensions {
namespace {
@@ -130,20 +135,30 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiSetShapeNoPerm) {
IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
WindowsApiAlphaEnabledHasPermissions) {
- const char* no_alpha_dir =
+ const char kNoAlphaDir[] =
"platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha";
- const char* test_dir = no_alpha_dir;
+ const char kHasAlphaDir[] =
+ "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha";
+ ALLOW_UNUSED_LOCAL(kHasAlphaDir);
+ const char* test_dir = kNoAlphaDir;
#if defined(USE_AURA) && (defined(OS_CHROMEOS) || !defined(OS_LINUX))
- test_dir =
- "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha";
+ test_dir = kHasAlphaDir;
+
#if defined(OS_WIN)
if (!ui::win::IsAeroGlassEnabled()) {
- test_dir = no_alpha_dir;
+ test_dir = kNoAlphaDir;
}
#endif // OS_WIN
#endif // USE_AURA && (OS_CHROMEOS || !OS_LINUX)
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+ if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kWindowDepth) == "32") {
+ test_dir = kHasAlphaDir;
+ }
+#endif // USE_X11 && !OS_CHROMEOS
+
EXPECT_TRUE(RunPlatformAppTest(test_dir)) << message_;
}
« no previous file with comments | « content/test/gpu/page_sets/gpu_process_tests.py ('k') | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698