Index: media/mojo/services/mojo_renderer_factory.h |
diff --git a/media/mojo/services/mojo_renderer_factory.h b/media/mojo/services/mojo_renderer_factory.h |
index 597fc99986950596748c1704d01a8176dc965fe5..3e13970260770573ce05cd4d87a6aaf7bbf2c922 100644 |
--- a/media/mojo/services/mojo_renderer_factory.h |
+++ b/media/mojo/services/mojo_renderer_factory.h |
@@ -10,21 +10,16 @@ |
#include "base/macros.h" |
#include "media/base/renderer_factory.h" |
#include "media/mojo/interfaces/renderer.mojom.h" |
- |
-namespace mojo { |
-namespace shell { |
-namespace mojom { |
-class InterfaceProvider; |
-} |
-} |
-} |
+#include "mojo/shell/public/interfaces/interface_provider.mojom.h" |
xhwang
2016/04/12 19:40:37
Why this change? Don't we prefer forward declarati
alokp
2016/04/19 00:16:07
restored.
|
namespace media { |
+class GpuVideoAcceleratorFactories; |
// The default factory class for creating MojoRendererImpl. |
class MojoRendererFactory : public RendererFactory { |
public: |
explicit MojoRendererFactory( |
xhwang
2016/04/12 19:40:37
nit: no explicit
alokp
2016/04/19 00:16:07
Done.
|
+ GpuVideoAcceleratorFactories* gpu_factories, |
xhwang
2016/04/12 19:40:37
You probably want GetGpuFactoriesCB as used in Def
alokp
2016/04/19 00:16:07
I am curious why this callback exists. Does it nee
xhwang
2016/04/20 16:58:47
Good point. It seems this is the reason:
https://
sandersd (OOO until July 31)
2016/04/20 18:50:06
Any Renderer that needs GpuFactories should use th
xhwang
2016/04/20 21:33:39
I guess this is the easiest way to do for now. Can
sandersd (OOO until July 31)
2016/04/20 21:48:05
Sorry, I was imprecise. I believe that in the gene
|
mojo::shell::mojom::InterfaceProvider* interface_provider); |
~MojoRendererFactory() final; |
@@ -36,6 +31,7 @@ class MojoRendererFactory : public RendererFactory { |
const RequestSurfaceCB& request_surface_cb) final; |
private: |
+ GpuVideoAcceleratorFactories* gpu_factories_; |
mojo::shell::mojom::InterfaceProvider* interface_provider_; |
DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory); |