gl_surface_egl: ensure off and on screen surfaces use the same EGLConfig

content/gpu/gpu_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #if defined(OS_WIN)
 #include <dwmapi.h>
 #include <windows.h>
 #endif
@@ skipping 43 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "base/win/scoped_com_initializer.h"
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #include "sandbox/win/src/sandbox.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
+#include "ui/gfx/x/x11_switches.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "content/public/common/sandbox_init.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/message_loop/message_pump_mac.h"
 #include "content/common/sandbox_mac.h"
 #endif
@@ skipping 66 matching lines @@
 
 #if defined(OS_WIN)
   // Prevent Windows from displaying a modal dialog on failures like not being
   // able to load a DLL.
   SetErrorMode(
       SEM_FAILCRITICALERRORS |
       SEM_NOGPFAULTERRORBOX |
       SEM_NOOPENFILEERRORBOX);
 #elif defined(USE_X11)
   ui::SetDefaultX11ErrorHandlers();
+
+#if !defined(OS_CHROMEOS)
+  DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kWindowDepth));
+#endif
+
 #endif
 
   logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
   if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
     std::string types = command_line.GetSwitchValueASCII(
         switches::kGpuDriverBugWorkarounds);
     std::set<int> workarounds;
     gpu::StringToFeatureSet(types, &workarounds);
     if (workarounds.count(gpu::FORCE_DISCRETE_GPU) == 1)
@@ skipping 409 matching lines @@
     return true;
   }
 
   return false;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace.
 
 }  // namespace content