Make --enable-delegated-renderer show stuff on Mac

content/browser/browser_main_loop.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 "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
@@ skipping 66 matching lines @@
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "content/browser/theme_helper_mac.h"
+#include "ui/compositor/compositor.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "content/browser/system_message_window_win.h"
 #include "content/common/sandbox_win.h"
 #include "net/base/winsock_init.h"
@@ skipping 650 matching lines @@
     TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:GPUProcessHostShim");
     GpuProcessHostUIShim::DestroyAll();
   }
   // Cancel pending requests and prevent new requests.
   if (resource_dispatcher_host_) {
     TRACE_EVENT0("shutdown",
                  "BrowserMainLoop::Subsystem:ResourceDispatcherHost");
     resource_dispatcher_host_.get()->Shutdown();
   }
 
-#if defined(USE_AURA)
-  {
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  if (IsDelegatedRendererEnabled())
+    ui::Compositor::Terminate();
+#endif
+
+#if defined(USE_AURA) || defined(OS_MACOSX)
+  if (ShouldInitializeBrowserGpuChannelAndTransportSurface()) {
     TRACE_EVENT0("shutdown",
                  "BrowserMainLoop::Subsystem:ImageTransportFactory");
     ImageTransportFactory::Terminate();
   }
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   ZygoteHostImpl::GetInstance()->TearDownAfterLastChild();
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
@@ skipping 297 matching lines @@
 #if defined(USE_X11)
   if (!gfx::GetXDisplay())
     return false;
 #endif
 
   // Env creates the compositor. Aura widgets need the compositor to be created
   // before they can be initialized by the browser.
   aura::Env::CreateInstance(true);
 #endif  // defined(USE_AURA)
 
+  // Create the compositor for the non-Aura delegated renderer on Mac.
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  if (IsDelegatedRendererEnabled())
+    ui::Compositor::Initialize();
+#endif
+
   if (parts_)
     parts_->ToolkitInitialized();
 
   return true;
 }
 
 void BrowserMainLoop::MainMessageLoopRun() {
 #if defined(OS_ANDROID)
   // Android's main message loop is the Java message loop.
   NOTREACHED();
@@ skipping 44 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) {
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       trace_file, base::Bind(&OnStoppedStartupTracing));
 }
 
 }  // namespace content