Include root_layer_size in CompositorFrameMetadata againv5.13.0-beta3

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 <allan.jensen@qt.io>

5 files changed, 10 insertions, 11 deletions

diff --git a/chromium/cc/trees/layer_tree_host_impl.cc b/chromium/cc/trees/layer_tree_host_impl.cc
index 2782b23d66c..760d127029f 100644
--- a/chromium/cc/trees/layer_tree_host_impl.cc
+++ b/chromium/cc/trees/layer_tree_host_impl.cc
@@ -1909,6 +1909,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();
@@ -1921,7 +1922,7 @@ viz::CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() {
 
 #if defined(OS_ANDROID)
   metadata.max_page_scale_factor = active_tree_->max_page_scale_factor();
-  metadata.root_layer_size = active_tree_->ScrollableSize();
+
 
   if (const auto* outer_viewport_scroll_node = OuterViewportScrollNode()) {
     metadata.root_overflow_y_hidden =
diff --git a/chromium/components/viz/common/quads/compositor_frame_metadata.h b/chromium/components/viz/common/quads/compositor_frame_metadata.h
index e2f3fbca24f..4875c8c5ffd 100644
--- a/chromium/components/viz/common/quads/compositor_frame_metadata.h
+++ b/chromium/components/viz/common/quads/compositor_frame_metadata.h
@@ -140,6 +140,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.
@@ -152,7 +153,6 @@ class VIZ_COMMON_EXPORT CompositorFrameMetadata {
 
 #if defined(OS_ANDROID)
   float max_page_scale_factor = 0.f;
-  gfx::SizeF root_layer_size;
   bool root_overflow_y_hidden = false;
 
   // Used to position Android bottom bar, whose position is computed by the
diff --git a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
index 8175112c87d..bad05d45ac1 100644
--- a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
+++ b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
@@ -48,8 +48,8 @@ bool StructTraits<viz::mojom::CompositorFrameMetadataDataView,
          data.ReadReferencedSurfaces(&out->referenced_surfaces) &&
          data.ReadDeadline(&out->deadline) &&
          data.ReadActivationDependencies(&out->activation_dependencies) &&
-#if defined(OS_ANDROID)
          data.ReadRootLayerSize(&out->root_layer_size) &&
+#if defined(OS_ANDROID)
          data.ReadSelection(&out->selection) &&
 #endif  // defined(OS_ANDROID)
          data.ReadBeginFrameAck(&out->begin_frame_ack) &&
diff --git a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h
index 4c1f33e94c8..c7246ac3e46 100644
--- a/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h
+++ b/chromium/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h
@@ -97,6 +97,11 @@ struct StructTraits<viz::mojom::CompositorFrameMetadataDataView,
     return metadata.min_page_scale_factor;
   }
 
+  static const gfx::SizeF& root_layer_size(
+      const viz::CompositorFrameMetadata& metadata) {
+    return metadata.root_layer_size;
+  }
+
   static float top_controls_height(
       const viz::CompositorFrameMetadata& metadata) {
     return metadata.top_controls_height;
@@ -119,11 +124,6 @@ struct StructTraits<viz::mojom::CompositorFrameMetadataDataView,
     return metadata.max_page_scale_factor;
   }
 
-  static const gfx::SizeF& root_layer_size(
-      const viz::CompositorFrameMetadata& metadata) {
-    return metadata.root_layer_size;
-  }
-
   static bool root_overflow_y_hidden(
       const viz::CompositorFrameMetadata& metadata) {
     return metadata.root_overflow_y_hidden;
diff --git a/chromium/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom b/chromium/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
index c5ebc7708d6..d47fe8aa808 100644
--- a/chromium/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
+++ b/chromium/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
@@ -32,14 +32,12 @@ struct CompositorFrameMetadata {
   bool send_frame_token_to_embedder;
 
   float min_page_scale_factor;
+  gfx.mojom.SizeF root_layer_size;
 
   [EnableIf=is_android]
   float max_page_scale_factor;
 
   [EnableIf=is_android]
-  gfx.mojom.SizeF root_layer_size;
-
-  [EnableIf=is_android]
   bool root_overflow_y_hidden;
 
   float top_controls_height;