| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1416 if (!media_context_provider->BindToCurrentThread()) | 1416 if (!media_context_provider->BindToCurrentThread()) |
| 1417 return nullptr; | 1417 return nullptr; |
| 1418 media_context_provider->SetupLock(); | 1418 media_context_provider->SetupLock(); |
| 1419 | 1419 |
| 1420 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner = | 1420 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner = |
| 1421 GetMediaThreadTaskRunner(); | 1421 GetMediaThreadTaskRunner(); |
| 1422 const bool enable_video_accelerator = | 1422 const bool enable_video_accelerator = |
| 1423 !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); | 1423 !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); |
| 1424 const bool enable_gpu_memory_buffer_video_frames = | 1424 const bool enable_gpu_memory_buffer_video_frames = |
| 1425 #if defined(OS_MACOSX) || defined(OS_LINUX) | 1425 #if defined(OS_MACOSX) || defined(OS_LINUX) |
| 1426 !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); | 1426 !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && |
| 1427 !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && |
| 1428 !gpu_channel_host->gpu_info().software_rendering; |
| 1427 #else | 1429 #else |
| 1428 cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); | 1430 cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); |
| 1429 #endif | 1431 #endif |
| 1430 std::vector<unsigned> image_texture_targets; | 1432 std::vector<unsigned> image_texture_targets; |
| 1431 std::string video_frame_image_texture_target_string = | 1433 std::string video_frame_image_texture_target_string = |
| 1432 cmd_line->GetSwitchValueASCII(switches::kVideoImageTextureTarget); | 1434 cmd_line->GetSwitchValueASCII(switches::kVideoImageTextureTarget); |
| 1433 StringToUintVector(video_frame_image_texture_target_string, | 1435 StringToUintVector(video_frame_image_texture_target_string, |
| 1434 &image_texture_targets); | 1436 &image_texture_targets); |
| 1435 | 1437 |
| 1436 gpu_factories_.push_back(RendererGpuVideoAcceleratorFactories::Create( | 1438 gpu_factories_.push_back(RendererGpuVideoAcceleratorFactories::Create( |
| (...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2070 } | 2072 } |
| 2071 | 2073 |
| 2072 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2074 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2073 size_t erased = | 2075 size_t erased = |
| 2074 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2076 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2075 routing_id_); | 2077 routing_id_); |
| 2076 DCHECK_EQ(1u, erased); | 2078 DCHECK_EQ(1u, erased); |
| 2077 } | 2079 } |
| 2078 | 2080 |
| 2079 } // namespace content | 2081 } // namespace content |
| OLD | NEW |