Merge to M46 for BUG=510252

content/renderer/render_thread_impl.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/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 1338 matching lines @@
                 lose_context_when_out_of_memory,
                 GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D"),
                 WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
                 NULL)),
         GPU_VIDEO_ACCELERATOR_CONTEXT);
   }
   if (gpu_va_context_provider_.get()) {
     const bool enable_video_accelerator =
         !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
     const bool enable_gpu_memory_buffer_video_frames =
+#if defined(OS_MACOSX)
+        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
+#else
         cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
+#endif
     std::string image_texture_target_string =
         cmd_line->GetSwitchValueASCII(switches::kVideoImageTextureTarget);
     unsigned image_texture_target = 0;
     const bool parsed_image_texture_target =
         base::StringToUint(image_texture_target_string, &image_texture_target);
     DCHECK(parsed_image_texture_target);
     CHECK(gpu_channel_.get()) << "Have gpu_va_context_provider but no "
                                  "gpu_channel_. See crbug.com/495185.";
     CHECK(gpu_channel_host.get()) << "Have gpu_va_context_provider but lost "
                                      "gpu_channel_. See crbug.com/495185.";
@@ skipping 593 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content