| Index: components/viz/client/client_layer_tree_frame_sink.h
|
| diff --git a/components/viz/client/client_layer_tree_frame_sink.h b/components/viz/client/client_layer_tree_frame_sink.h
|
| index 5a380bbbb41c2b950a38284a0166e56d0997c149..6d0f72d8ee7f4fc3d346ee65ad35d5aaa4267c42 100644
|
| --- a/components/viz/client/client_layer_tree_frame_sink.h
|
| +++ b/components/viz/client/client_layer_tree_frame_sink.h
|
| @@ -15,8 +15,13 @@
|
| #include "cc/surfaces/surface_id.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
|
|
| +namespace aura {
|
| +class HitTestDataProviderMusTest;
|
| +}
|
| +
|
| namespace viz {
|
|
|
| +class HitTestDataProvider;
|
| class LocalSurfaceIdProvider;
|
|
|
| class ClientLayerTreeFrameSink : public cc::LayerTreeFrameSink,
|
| @@ -32,6 +37,7 @@ class ClientLayerTreeFrameSink : public cc::LayerTreeFrameSink,
|
| synthetic_begin_frame_source,
|
| cc::mojom::CompositorFrameSinkPtrInfo compositor_frame_sink_info,
|
| cc::mojom::CompositorFrameSinkClientRequest client_request,
|
| + std::unique_ptr<HitTestDataProvider> hit_test_data_provider,
|
| std::unique_ptr<LocalSurfaceIdProvider> local_surface_id_provider,
|
| bool enable_surface_synchronization);
|
|
|
| @@ -41,6 +47,7 @@ class ClientLayerTreeFrameSink : public cc::LayerTreeFrameSink,
|
| synthetic_begin_frame_source,
|
| cc::mojom::CompositorFrameSinkPtrInfo compositor_frame_sink_info,
|
| cc::mojom::CompositorFrameSinkClientRequest client_request,
|
| + std::unique_ptr<HitTestDataProvider> hit_test_data_provider,
|
| std::unique_ptr<LocalSurfaceIdProvider> local_surface_id_provider,
|
| bool enable_surface_synchronization);
|
|
|
| @@ -56,6 +63,8 @@ class ClientLayerTreeFrameSink : public cc::LayerTreeFrameSink,
|
| void DidNotProduceFrame(const cc::BeginFrameAck& ack) override;
|
|
|
| private:
|
| + friend class aura::HitTestDataProviderMusTest;
|
| +
|
| // cc::mojom::CompositorFrameSinkClient implementation:
|
| void DidReceiveCompositorFrameAck(
|
| const std::vector<cc::ReturnedResource>& resources) override;
|
| @@ -70,6 +79,7 @@ class ClientLayerTreeFrameSink : public cc::LayerTreeFrameSink,
|
| const std::string& description);
|
|
|
| cc::LocalSurfaceId local_surface_id_;
|
| + std::unique_ptr<HitTestDataProvider> hit_test_data_provider_;
|
| std::unique_ptr<LocalSurfaceIdProvider> local_surface_id_provider_;
|
| std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
|
| std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
|
|
|