From e40b0554775698a22dcba1ca8b5b884d5a72e00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Tue, 9 Apr 2019 22:30:16 +0200 Subject: Include root_layer_size in CompositorFrameMetadata again Chromium 70 made this Android-only, but we are using it for the user to access the contents size. Should be safe to include again. Change-Id: I059ec953b11a76fdc7078a0e228977fa0bced5d0 Reviewed-by: Allan Sandfeld Jensen --- chromium/cc/trees/layer_tree_host_impl.cc | 1 + chromium/components/viz/common/quads/compositor_frame_metadata.h | 1 + .../public/cpp/compositing/compositor_frame_metadata_mojom_traits.h | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/chromium/cc/trees/layer_tree_host_impl.cc b/chromium/cc/trees/layer_tree_host_impl.cc index 4fa1598dade..925dc328573 100644 --- a/chromium/cc/trees/layer_tree_host_impl.cc +++ b/chromium/cc/trees/layer_tree_host_impl.cc @@ -2134,6 +2134,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() { last_draw_referenced_surfaces_ = referenced_surfaces; metadata.min_page_scale_factor = active_tree_->min_page_scale_factor(); + metadata.root_layer_size = active_tree_->ScrollableSize(); metadata.top_controls_height = browser_controls_offset_manager_->TopControlsHeight(); diff --git a/chromium/components/viz/common/quads/compositor_frame_metadata.h b/chromium/components/viz/common/quads/compositor_frame_metadata.h index 48f7881c72d..92e5ec0d798 100644 --- a/chromium/components/viz/common/quads/compositor_frame_metadata.h +++ b/chromium/components/viz/common/quads/compositor_frame_metadata.h @@ -132,6 +132,7 @@ class VIZ_COMMON_EXPORT CompositorFrameMetadata { // These limits can be used together with the scroll/scale fields above to // determine if scrolling/scaling in a particular direction is possible. float min_page_scale_factor = 0.f; + gfx::SizeF root_layer_size; // Used to position the location top bar and page content, whose precise // position is computed by the renderer compositor. diff --git a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h index ae0cd7347f7..3b836201ae8 100644 --- a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h +++ b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h @@ -93,6 +93,11 @@ struct StructTraits