| Index: services/ui/surfaces/display_compositor.h
|
| diff --git a/services/ui/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
|
| index 950250de087f2d69bfe6ba422f540a298c40a18c..16c8c788e1631661bd0a174ca0718bd39c8f8ace 100644
|
| --- a/services/ui/surfaces/display_compositor.h
|
| +++ b/services/ui/surfaces/display_compositor.h
|
| @@ -7,6 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +#include <unordered_map>
|
| +#include <vector>
|
| +
|
| #include "base/macros.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "cc/ipc/display_compositor.mojom.h"
|
| @@ -34,6 +38,10 @@ class SurfaceManager;
|
|
|
| namespace ui {
|
|
|
| +namespace test {
|
| +class DisplayCompositorTest;
|
| +}
|
| +
|
| class DisplayCompositorClient;
|
| class GpuCompositorFrameSink;
|
|
|
| @@ -80,6 +88,9 @@ class DisplayCompositor : public cc::SurfaceObserver,
|
| bool destroy_compositor_frame_sink);
|
|
|
| private:
|
| + friend class test::DisplayCompositorTest;
|
| +
|
| + const cc::SurfaceId& GetRootSurfaceId() const;
|
|
|
| // cc::SurfaceObserver implementation.
|
| void OnSurfaceCreated(const cc::SurfaceId& surface_id,
|
| @@ -101,6 +112,10 @@ class DisplayCompositor : public cc::SurfaceObserver,
|
| gpu::ImageFactory* image_factory_;
|
| cc::mojom::DisplayCompositorClientPtr client_;
|
|
|
| + // Will normally point to |manager_| as it provides the interface. For tests
|
| + // it will be swapped out with a mock implementation.
|
| + cc::SurfaceReferenceManager* reference_manager_;
|
| +
|
| // SurfaceIds that have temporary references from top level root so they
|
| // aren't GC'd before DisplayCompositorClient can add a real reference. This
|
| // is basically a collection of surface ids, for example:
|
|
|