| 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 d71a51ae29a6a592fe9e5e36d5284ed7dbb0060b..babca4790a3998713dfb172dc30581dd5b699340 100644
|
| --- a/ui/aura/mus/mus_context_factory.h
|
| +++ b/ui/aura/mus/mus_context_factory.h
|
| @@ -8,12 +8,18 @@
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| #include "services/ui/public/cpp/raster_thread_helper.h"
|
| #include "services/ui/public/interfaces/window_tree.mojom.h"
|
| #include "ui/aura/aura_export.h"
|
| #include "ui/compositor/compositor.h"
|
|
|
| +namespace gpu {
|
| +class GpuChannelHost;
|
| +}
|
| +
|
| namespace ui {
|
| class Gpu;
|
| }
|
| @@ -27,6 +33,10 @@ class AURA_EXPORT MusContextFactory : public ui::ContextFactory {
|
| ~MusContextFactory() override;
|
|
|
| private:
|
| + // Callback function for Gpu::EstablishGpuChannel().
|
| + void OnEstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor,
|
| + scoped_refptr<gpu::GpuChannelHost> gpu_channel);
|
| +
|
| // ContextFactory:
|
| void CreateCompositorFrameSink(
|
| base::WeakPtr<ui::Compositor> compositor) override;
|
| @@ -42,6 +52,7 @@ class AURA_EXPORT MusContextFactory : public ui::ContextFactory {
|
|
|
| ui::RasterThreadHelper raster_thread_helper_;
|
| ui::Gpu* gpu_;
|
| + base::WeakPtrFactory<MusContextFactory> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MusContextFactory);
|
| };
|
|
|