Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: components/viz/service/frame_sinks/gpu_root_compositor_frame_sink.h

Issue 2937233002: Use HitTestAggregator in GpuRootCompositorFrameSink (Closed)
Patch Set: remove unnecessary define and bracing Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/viz/service/frame_sinks/gpu_root_compositor_frame_sink.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ 5 #ifndef COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
6 #define COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ 6 #define COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "cc/ipc/compositor_frame_sink.mojom.h" 10 #include "cc/ipc/compositor_frame_sink.mojom.h"
11 #include "cc/ipc/frame_sink_manager.mojom.h" 11 #include "cc/ipc/frame_sink_manager.mojom.h"
12 #include "components/viz/common/surfaces/local_surface_id.h" 12 #include "components/viz/common/surfaces/local_surface_id.h"
13 #include "components/viz/common/surfaces/surface_id.h" 13 #include "components/viz/common/surfaces/surface_id.h"
14 #include "components/viz/service/display/display_client.h" 14 #include "components/viz/service/display/display_client.h"
15 #include "components/viz/service/frame_sinks/compositor_frame_sink_support_clien t.h" 15 #include "components/viz/service/frame_sinks/compositor_frame_sink_support_clien t.h"
16 #include "components/viz/service/frame_sinks/gpu_compositor_frame_sink_delegate. h" 16 #include "components/viz/service/frame_sinks/gpu_compositor_frame_sink_delegate. h"
17 #include "components/viz/service/hit_test/hit_test_aggregator.h"
17 #include "mojo/public/cpp/bindings/associated_binding.h" 18 #include "mojo/public/cpp/bindings/associated_binding.h"
18 #include "mojo/public/cpp/bindings/binding.h" 19 #include "mojo/public/cpp/bindings/binding.h"
19 20
20 namespace cc { 21 namespace cc {
21 class BeginFrameSource; 22 class BeginFrameSource;
22 } 23 }
23 24
24 namespace viz { 25 namespace viz {
25 class FrameSinkManager; 26 class FrameSinkManager;
26 class CompositorFrameSinkSupport; 27 class CompositorFrameSinkSupport;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_; 95 std::unique_ptr<cc::BeginFrameSource> display_begin_frame_source_;
95 std::unique_ptr<Display> display_; 96 std::unique_ptr<Display> display_;
96 97
97 cc::mojom::CompositorFrameSinkClientPtr client_; 98 cc::mojom::CompositorFrameSinkClientPtr client_;
98 mojo::AssociatedBinding<cc::mojom::CompositorFrameSink> 99 mojo::AssociatedBinding<cc::mojom::CompositorFrameSink>
99 compositor_frame_sink_binding_; 100 compositor_frame_sink_binding_;
100 mojo::Binding<cc::mojom::CompositorFrameSinkPrivate> 101 mojo::Binding<cc::mojom::CompositorFrameSinkPrivate>
101 compositor_frame_sink_private_binding_; 102 compositor_frame_sink_private_binding_;
102 mojo::AssociatedBinding<cc::mojom::DisplayPrivate> display_private_binding_; 103 mojo::AssociatedBinding<cc::mojom::DisplayPrivate> display_private_binding_;
103 104
105 HitTestAggregator hit_test_aggregator_;
106
104 DISALLOW_COPY_AND_ASSIGN(GpuRootCompositorFrameSink); 107 DISALLOW_COPY_AND_ASSIGN(GpuRootCompositorFrameSink);
105 }; 108 };
106 109
107 } // namespace viz 110 } // namespace viz
108 111
109 #endif // COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_ 112 #endif // COMPONENTS_VIZ_SERVICE_FRAME_SINKS_GPU_ROOT_COMPOSITOR_FRAME_SINK_H_
OLDNEW
« no previous file with comments | « no previous file | components/viz/service/frame_sinks/gpu_root_compositor_frame_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698