| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index a0bda15ceac993388422374446e572f70283ca0a..c59317a49fb6f4f6b161e0f19d115c21d8c78502 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -19,7 +19,6 @@
|
| #include "content/common/gpu/client/gpu_channel_host.h"
|
| #include "content/common/gpu/gpu_process_launch_causes.h"
|
| #include "content/public/renderer/render_thread.h"
|
| -#include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| @@ -54,7 +53,7 @@ class ForwardingMessageFilter;
|
|
|
| namespace media {
|
| class AudioHardwareConfig;
|
| -class GpuVideoDecoderFactories;
|
| +class GpuVideoAcceleratorFactories;
|
| }
|
|
|
| namespace v8 {
|
| @@ -256,9 +255,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
| // not sent for at least one notification delay.
|
| void PostponeIdleNotification();
|
|
|
| - // Gets gpu factories, which will run on |factories_loop|. Returns NULL if VDA
|
| - // is disabled or a graphics context cannot be obtained.
|
| - scoped_refptr<RendererGpuVideoDecoderFactories> GetGpuFactories(
|
| + // Gets gpu factories, which will run on |factories_loop|.
|
| + scoped_refptr<media::GpuVideoAcceleratorFactories> GetGpuFactories(
|
| const scoped_refptr<base::MessageLoopProxy>& factories_loop);
|
|
|
| // Returns a graphics context shared among all
|
|
|