diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc')
-rw-r--r-- | chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc b/chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc index ac084ea4666..bb147945b45 100644 --- a/chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc +++ b/chromium/components/viz/service/frame_sinks/frame_sink_manager_impl.cc @@ -144,11 +144,13 @@ void FrameSinkManagerImpl::CreateRootCompositorFrameSink( std::move(params->external_begin_frame_controller_client))); } + mojom::DisplayClientPtr display_client(std::move(params->display_client)); + std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source; auto display = display_provider_->CreateDisplay( params->frame_sink_id, params->widget, params->gpu_compositing, - external_begin_frame_controller.get(), params->renderer_settings, - &begin_frame_source); + display_client.get(), external_begin_frame_controller.get(), + params->renderer_settings, &begin_frame_source); // Creating display failed. Drop the CompositorFrameSink message pipes here // and let host send a new request, potential with a different compositing @@ -164,8 +166,7 @@ void FrameSinkManagerImpl::CreateRootCompositorFrameSink( std::move(params->compositor_frame_sink), mojom::CompositorFrameSinkClientPtr( std::move(params->compositor_frame_sink_client)), - std::move(params->display_private), - mojom::DisplayClientPtr(std::move(params->display_client))); + std::move(params->display_private), std::move(display_client)); } void FrameSinkManagerImpl::CreateCompositorFrameSink( @@ -352,25 +353,10 @@ void FrameSinkManagerImpl::OnSurfaceDamageExpected(const SurfaceId& surface_id, void FrameSinkManagerImpl::OnAggregatedHitTestRegionListUpdated( const FrameSinkId& frame_sink_id, - mojo::ScopedSharedBufferHandle active_handle, - uint32_t active_handle_size, - mojo::ScopedSharedBufferHandle idle_handle, - uint32_t idle_handle_size) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (client_) { - client_->OnAggregatedHitTestRegionListUpdated( - frame_sink_id, std::move(active_handle), active_handle_size, - std::move(idle_handle), idle_handle_size); - } -} - -void FrameSinkManagerImpl::SwitchActiveAggregatedHitTestRegionList( - const FrameSinkId& frame_sink_id, - uint8_t active_handle_index) { + const std::vector<AggregatedHitTestRegion>& hit_test_data) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); if (client_) { - client_->SwitchActiveAggregatedHitTestRegionList(frame_sink_id, - active_handle_index); + client_->OnAggregatedHitTestRegionListUpdated(frame_sink_id, hit_test_data); } } @@ -526,7 +512,7 @@ bool FrameSinkManagerImpl::ChildContains( void FrameSinkManagerImpl::SubmitHitTestRegionList( const SurfaceId& surface_id, uint64_t frame_index, - mojom::HitTestRegionListPtr hit_test_region_list) { + base::Optional<HitTestRegionList> hit_test_region_list) { hit_test_manager_.SubmitHitTestRegionList(surface_id, frame_index, std::move(hit_test_region_list)); } |