| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index c266cab00d88d6f98300dfbc2609ba23833c9937..33b1991fbdb5a6d251d3907b3d2fb9d55f86ed33 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -77,6 +77,7 @@
|
| #include "content/renderer/media/media_stream_dependency_factory.h"
|
| #include "content/renderer/media/midi_message_filter.h"
|
| #include "content/renderer/media/peer_connection_tracker.h"
|
| +#include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
|
| #include "content/renderer/media/video_capture_impl_manager.h"
|
| #include "content/renderer/media/video_capture_message_filter.h"
|
| #include "content/renderer/media/webrtc_identity_service.h"
|
| @@ -888,13 +889,13 @@ void RenderThreadImpl::PostponeIdleNotification() {
|
| idle_notifications_to_skip_ = 2;
|
| }
|
|
|
| -scoped_refptr<RendererGpuVideoAcceleratorFactories>
|
| +scoped_refptr<media::GpuVideoAcceleratorFactories>
|
| RenderThreadImpl::GetGpuFactories() {
|
| DCHECK(IsMainThread());
|
|
|
| scoped_refptr<GpuChannelHost> gpu_channel_host = GetGpuChannel();
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| - scoped_refptr<RendererGpuVideoAcceleratorFactories> gpu_factories;
|
| + scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories;
|
| scoped_refptr<base::MessageLoopProxy> media_loop_proxy =
|
| GetMediaThreadMessageLoopProxy();
|
| if (!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) {
|
| @@ -913,13 +914,6 @@ RenderThreadImpl::GetGpuFactories() {
|
| WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(),
|
| NULL)),
|
| "GPU-VideoAccelerator-Offscreen");
|
| - if (gpu_va_context_provider_) {
|
| - media_loop_proxy->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(
|
| - base::IgnoreResult(&cc::ContextProvider::BindToCurrentThread),
|
| - gpu_va_context_provider_));
|
| - }
|
| }
|
| }
|
| if (gpu_va_context_provider_) {
|
|
|