Chromium Code Reviews| Index: content/renderer/render_thread_impl.h |
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h |
| index 5b3dac04b9a03cd7994a8ec7ec7e17b2afb65a7d..12f660ac48dadfc692d96e0ac00fee1c9c884951 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|. |
|
Ami GONE FROM CHROMIUM
2013/07/31 23:01:12
I think the NULL return value should be restored (
sheu
2013/08/02 01:27:49
If VDA is disabled, we still might want VEA (which
|
| + scoped_refptr<media::GpuVideoAcceleratorFactories> GetGpuFactories( |
| const scoped_refptr<base::MessageLoopProxy>& factories_loop); |
| // Returns a graphics context shared among all |