Index: content/renderer/media/renderer_gpu_video_accelerator_factories.h |
diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h |
index 0f3cd9c0012a6a2fce288e4a558f4fbe00f21c90..edc67596b1888743cbcec9aa27d512a22f6881ae 100644 |
--- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h |
+++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h |
@@ -27,8 +27,11 @@ class GpuChannelHost; |
class GpuMemoryBufferManager; |
} |
-namespace content { |
+namespace ui { |
class ContextProviderCommandBuffer; |
+} |
+ |
+namespace content { |
// Glue code to expose functionality needed by media::GpuVideoAccelerator to |
// RenderViewImpl. This class is entirely an implementation detail of |
@@ -48,7 +51,7 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories |
const scoped_refptr<base::SingleThreadTaskRunner>& |
main_thread_task_runner, |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
- const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
+ const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider, |
bool enable_gpu_memory_buffer_video_frames, |
const cc::BufferToTextureTargetMap& image_texture_targets, |
bool enable_video_accelerator); |
@@ -91,7 +94,7 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories |
GetVideoEncodeAcceleratorSupportedProfiles() override; |
void ReleaseContextProvider(); |
- scoped_refptr<ContextProviderCommandBuffer> ContextProviderMainThread(); |
+ scoped_refptr<ui::ContextProviderCommandBuffer> ContextProviderMainThread(); |
~RendererGpuVideoAcceleratorFactories() override; |
@@ -101,7 +104,7 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories |
const scoped_refptr<base::SingleThreadTaskRunner>& |
main_thread_task_runner, |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
- const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
+ const scoped_refptr<ui::ContextProviderCommandBuffer>& context_provider, |
bool enable_gpu_memory_buffer_video_frames, |
const cc::BufferToTextureTargetMap& image_texture_targets, |
bool enable_video_accelerator); |
@@ -112,10 +115,10 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories |
// Shared pointer to a shared context provider that should be accessed |
// and set only on the main thread. |
- scoped_refptr<ContextProviderCommandBuffer> context_provider_refptr_; |
+ scoped_refptr<ui::ContextProviderCommandBuffer> context_provider_refptr_; |
// Raw pointer to a context provider accessed from the media thread. |
- ContextProviderCommandBuffer* context_provider_; |
+ ui::ContextProviderCommandBuffer* context_provider_; |
base::UnguessableToken channel_token_; |