Reland 193431 "CrOS: Enable threaded UI compositor by default."

Reverted here:  https://codereview.chromium.org/14157002
Original CL here:  https://chromiumcodereview.appspot.com/12088092

BUG=173417

Review URL: https://codereview.chromium.org/13975006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194175 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 20 insertions, 12 deletions

diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 86dbf57..33a6b01 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -91,9 +91,7 @@ void Env::Init() {
   base::MessagePumpAuraX11::Current()->AddObserver(
       &device_list_updater_aurax11_);
 #endif
-  ui::Compositor::Initialize(
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUIEnableThreadedCompositing));
+  ui::Compositor::Initialize();
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 9a02d92..683562a 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -518,7 +518,17 @@ Compositor::~Compositor() {
 }
 
 // static
-void Compositor::Initialize(bool use_thread) {
+void Compositor::Initialize() {
+#if defined(OS_CHROMEOS)
+  bool use_thread = !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kUIDisableThreadedCompositing);
+#else
+  bool use_thread =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUIEnableThreadedCompositing) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUIDisableThreadedCompositing);
+#endif
   if (use_thread) {
     g_compositor_thread = new base::Thread("Browser Compositor");
     g_compositor_thread->Start();
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index a3c3f71..19f5869 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -257,7 +257,7 @@ class COMPOSITOR_EXPORT Compositor
              gfx::AcceleratedWidget widget);
   virtual ~Compositor();
 
-  static void Initialize(bool useThread);
+  static void Initialize();
   static bool WasInitializedWithThread();
   static void Terminate();
 
diff --git a/ui/compositor/compositor_switches.cc b/ui/compositor/compositor_switches.cc
index d5176a2..7f1bd23 100644
--- a/ui/compositor/compositor_switches.cc
+++ b/ui/compositor/compositor_switches.cc
@@ -8,10 +8,12 @@ namespace switches {
 
 const char kDisableTestCompositor[] = "disable-test-compositor";
 
-const char kUIEnableThreadedCompositing[] = "ui-enable-threaded-compositing";
+const char kUIDisableThreadedCompositing[] = "ui-disable-threaded-compositing";
 
 const char kUIEnableSoftwareCompositing[] = "ui-enable-software-compositing";
 
+const char kUIEnableThreadedCompositing[] = "ui-enable-threaded-compositing";
+
 const char kUIMaxFramesPending[] = "ui-max-frames-pending";
 
 const char kUIShowPaintRects[] = "ui-show-paint-rects";
diff --git a/ui/compositor/compositor_switches.h b/ui/compositor/compositor_switches.h
index 69711bd..5b59477 100644
--- a/ui/compositor/compositor_switches.h
+++ b/ui/compositor/compositor_switches.h
@@ -10,8 +10,9 @@
 namespace switches {
 
 COMPOSITOR_EXPORT extern const char kDisableTestCompositor[];
-COMPOSITOR_EXPORT extern const char kUIEnableThreadedCompositing[];
+COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[];
 COMPOSITOR_EXPORT extern const char kUIEnableSoftwareCompositing[];
+COMPOSITOR_EXPORT extern const char kUIEnableThreadedCompositing[];
 COMPOSITOR_EXPORT extern const char kUIMaxFramesPending[];
 COMPOSITOR_EXPORT extern const char kUIShowPaintRects[];
 
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index 8e3fdb2..4340bfd 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -26,11 +26,8 @@ CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
 CompositorTestSuite::~CompositorTestSuite() {}
 
 void CompositorTestSuite::Initialize() {
-  bool use_threaded_compositing = CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kUIEnableThreadedCompositing);
 #if defined(USE_X11)
-  if (use_threaded_compositing)
-    XInitThreads();
+  XInitThreads();
 #endif
 #if defined(OS_LINUX)
   gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
@@ -41,7 +38,7 @@ void CompositorTestSuite::Initialize() {
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
   CompositorTestSupport::Initialize();
-  Compositor::Initialize(use_threaded_compositing);
+  Compositor::Initialize();
 }
 
 void CompositorTestSuite::Shutdown() {