summaryrefslogtreecommitdiffstats
path: root/chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-20 13:40:20 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-22 12:41:23 +0000
commit7961cea6d1041e3e454dae6a1da660b453efd238 (patch)
treec0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h
parentb7034d0803538058e5c9d904ef03cf5eab34f6ef (diff)
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h')
-rw-r--r--chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h b/chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h
index 1b176d0d9da..d32489d3f19 100644
--- a/chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h
+++ b/chromium/cc/mojo_embedder/async_layer_tree_frame_sink.h
@@ -20,7 +20,7 @@
#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
#include "components/viz/common/surfaces/surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace base {
class HistogramBase;
@@ -28,7 +28,6 @@ class HistogramBase;
namespace viz {
class HitTestDataProvider;
-class LocalSurfaceIdProvider;
} // namespace viz
namespace cc {
@@ -92,9 +91,7 @@ class CC_MOJO_EMBEDDER_EXPORT AsyncLayerTreeFrameSink
std::unique_ptr<viz::SyntheticBeginFrameSource>
synthetic_begin_frame_source;
std::unique_ptr<viz::HitTestDataProvider> hit_test_data_provider;
- std::unique_ptr<viz::LocalSurfaceIdProvider> local_surface_id_provider;
UnboundMessagePipes pipes;
- bool enable_surface_synchronization = false;
bool wants_animate_only_begin_frames = false;
const char* client_name = nullptr;
};
@@ -127,7 +124,6 @@ class CC_MOJO_EMBEDDER_EXPORT AsyncLayerTreeFrameSink
void DidAllocateSharedBitmap(base::ReadOnlySharedMemoryRegion region,
const viz::SharedBitmapId& id) override;
void DidDeleteSharedBitmap(const viz::SharedBitmapId& id) override;
- void ForceAllocateNewId() override;
const viz::HitTestRegionList& get_last_hit_test_data_for_testing() const {
return last_hit_test_data_;
@@ -153,7 +149,6 @@ class CC_MOJO_EMBEDDER_EXPORT AsyncLayerTreeFrameSink
bool needs_begin_frames_ = false;
viz::LocalSurfaceId local_surface_id_;
std::unique_ptr<viz::HitTestDataProvider> hit_test_data_provider_;
- std::unique_ptr<viz::LocalSurfaceIdProvider> local_surface_id_provider_;
std::unique_ptr<viz::ExternalBeginFrameSource> begin_frame_source_;
std::unique_ptr<viz::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
@@ -170,7 +165,6 @@ class CC_MOJO_EMBEDDER_EXPORT AsyncLayerTreeFrameSink
mojo::Binding<viz::mojom::CompositorFrameSinkClient> client_binding_;
THREAD_CHECKER(thread_checker_);
- const bool enable_surface_synchronization_;
const bool wants_animate_only_begin_frames_;
viz::HitTestRegionList last_hit_test_data_;