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

Unified Diff: content/gpu/gpu_main.cc

Issue 1429083002: gl_surface_egl: ensure off and on screen surfaces use the same EGLConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/browser/gpu/gpu_process_host.cc ('k') | ui/base/x/x11_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index d21c88dad9617bd88a78849e119b66c00bd0ff57..6c7e8af26afce5240b455126371febb60e6976e1 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -61,6 +61,7 @@
#if defined(USE_X11)
#include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_switches.h"
#endif
#if defined(OS_LINUX)
@@ -147,6 +148,12 @@ int GpuMain(const MainFunctionParams& parameters) {
SEM_NOOPENFILEERRORBOX);
#elif defined(USE_X11)
ui::SetDefaultX11ErrorHandlers();
+
+#if !defined(OS_CHROMEOS)
+ DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kWindowDepth));
+#endif
+
#endif
logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/base/x/x11_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698