| Index: ui/aura/mus/mus_context_factory.h
|
| diff --git a/ui/aura/mus/mus_context_factory.h b/ui/aura/mus/mus_context_factory.h
|
| index 14ed82e48bf9b6c1424f29b91f2d41213536fcfa..6d023943e68c80ac861aa114c2fddd8f32bb804f 100644
|
| --- a/ui/aura/mus/mus_context_factory.h
|
| +++ b/ui/aura/mus/mus_context_factory.h
|
| @@ -30,10 +30,6 @@ class AURA_EXPORT MusContextFactory : public ui::ContextFactory {
|
| // ContextFactory:
|
| void CreateCompositorFrameSink(
|
| base::WeakPtr<ui::Compositor> compositor) override;
|
| - std::unique_ptr<ui::Reflector> CreateReflector(
|
| - ui::Compositor* mirrored_compositor,
|
| - ui::Layer* mirroring_layer) override;
|
| - void RemoveReflector(ui::Reflector* reflector) override;
|
| scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
|
| void RemoveCompositor(ui::Compositor* compositor) override;
|
| bool DoesCreateTestContexts() override;
|
| @@ -41,24 +37,9 @@ class AURA_EXPORT MusContextFactory : public ui::ContextFactory {
|
| gfx::BufferUsage usage) override;
|
| gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
|
| cc::TaskGraphRunner* GetTaskGraphRunner() override;
|
| - cc::FrameSinkId AllocateFrameSinkId() override;
|
| - cc::SurfaceManager* GetSurfaceManager() override;
|
| - void SetDisplayVisible(ui::Compositor* compositor, bool visible) override;
|
| - void ResizeDisplay(ui::Compositor* compositor,
|
| - const gfx::Size& size) override;
|
| - void SetDisplayColorSpace(ui::Compositor* compositor,
|
| - const gfx::ColorSpace& color_space) override {}
|
| - void SetAuthoritativeVSyncInterval(ui::Compositor* compositor,
|
| - base::TimeDelta interval) override {}
|
| - void SetDisplayVSyncParameters(ui::Compositor* compositor,
|
| - base::TimeTicks timebase,
|
| - base::TimeDelta interval) override {}
|
| - void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
|
| void AddObserver(ui::ContextFactoryObserver* observer) override {}
|
| void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
|
|
|
| - cc::SurfaceManager surface_manager_;
|
| - uint32_t next_sink_id_;
|
| ui::RasterThreadHelper raster_thread_helper_;
|
| ui::GpuService* gpu_service_;
|
|
|
|
|