Disable Direct Composition for views_examples_exe and demo (aura_demo)

InProcessContextFactory isn't set up to properly support Direct
Composition.

BUG=936249

Change-Id: I34877fad76a40d8f141fb16c7a1d6d826d6c231a
Reviewed-on: https://chromium-review.googlesource.com/c/1492482
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636530}

ui/aura/BUILD.gn

@@ -375,6 +375,7 @@ executable("demo") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/gl/init",
   ]
 

ui/aura/demo/DEPS

@@ -2,5 +2,6 @@ include_rules = [
   "+components/viz/host",
   "+components/viz/service",  # In-process viz service.
   "+ui/display",          # Windows DPI Initialization.
+  "+ui/gl/gl_switches.h",  # Disable Direct Composition Workaround.
   "+ui/gl/init/gl_factory.h",  # To initialize GL bindings.
 ]

ui/aura/demo/demo_main.cc

@@ -35,6 +35,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
+#include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
 
 #if defined(USE_X11)
@@ -212,6 +213,12 @@ int DemoMain() {
 int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
 
+  // Disabling Direct Composition works around the limitation that
+  // InProcessContextFactory doesn't work with Direct Composition, causing the
+  // window to not render. See http://crbug.com/936249.
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisableDirectComposition);
+
   // The exit manager is in charge of calling the dtors of singleton objects.
   base::AtExitManager exit_manager;
 

ui/views/examples/BUILD.gn

@@ -124,6 +124,7 @@ executable("views_examples_exe") {
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/gfx",
+    "//ui/gl",
     "//ui/gl/init",
     "//ui/resources:ui_test_pak",
     "//ui/views",

ui/views/examples/DEPS

@@ -4,6 +4,7 @@ include_rules = [
   "+content/public",
   "+content/shell",
   "+sandbox",
+  "+ui/gl/gl_switches.h",  # Disable Direct Composition Workaround.
   "+ui/gl/init/gl_factory.h",  # To initialize GL bindings.
   "+ui/views_content_client",
 ]

ui/views/examples/examples_main.cc

@@ -26,6 +26,7 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/display/screen.h"
+#include "ui/gl/gl_switches.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/examples/examples_window.h"
@@ -59,6 +60,12 @@ int main(int argc, char** argv) {
 
   base::CommandLine::Init(argc, argv);
 
+  // Disabling Direct Composition works around the limitation that
+  // InProcessContextFactory doesn't work with Direct Composition, causing the
+  // window to not render. See http://crbug.com/936249.
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kDisableDirectComposition);
+
   base::AtExitManager at_exit;
 
 #if defined(USE_X11)