Re-land: content: Enable native GpuMemoryBuffers by default on MacOSX.

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/location.h"
 #include "base/logging.h"
@@ skipping 459 matching lines @@
   if (parsed_command_line_.HasSwitch(switches::kRendererProcessLimit)) {
     std::string limit_string = parsed_command_line_.GetSwitchValueASCII(
         switches::kRendererProcessLimit);
     size_t process_limit;
     if (base::StringToSizeT(limit_string, &process_limit)) {
       RenderProcessHost::SetMaxRendererProcessCount(process_limit);
     }
   }
 #endif  // !defined(OS_IOS)
 
-  if (parsed_command_line_.HasSwitch(switches::kEnableNativeGpuMemoryBuffers)) {
+#if defined(OS_MACOSX)
+  bool enable_native_gpu_memory_buffers =
+      !parsed_command_line_.HasSwitch(switches::kDisableNativeGpuMemoryBuffers);
+#else
+  bool enable_native_gpu_memory_buffers =
+      parsed_command_line_.HasSwitch(switches::kEnableNativeGpuMemoryBuffers);
+#endif
+  if (enable_native_gpu_memory_buffers) {
     BrowserGpuChannelHostFactory::EnableGpuMemoryBufferFactoryUsage(
         gfx::GpuMemoryBuffer::MAP);
     BrowserGpuChannelHostFactory::EnableGpuMemoryBufferFactoryUsage(
         gfx::GpuMemoryBuffer::PERSISTENT_MAP);
   }
 
 #if defined(USE_OZONE)
   BrowserGpuChannelHostFactory::EnableGpuMemoryBufferFactoryUsage(
       gfx::GpuMemoryBuffer::SCANOUT);
 #endif
@@ skipping 889 matching lines @@
   DCHECK(is_tracing_startup_);
 
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
 }  // namespace content