Enable android-specific fields of RenderFrameMetadata

Needed for root_layer_size.

Task-number: QTBUG-71885
Change-Id: I1d820c98c103ed5987dcf4d7b7aaea254894df2d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 14 insertions, 14 deletions

diff --git a/chromium/cc/trees/layer_tree_host_impl.cc b/chromium/cc/trees/layer_tree_host_impl.cc
index e24ce823e09..f11e5b09137 100644
--- a/chromium/cc/trees/layer_tree_host_impl.cc
+++ b/chromium/cc/trees/layer_tree_host_impl.cc
@@ -1977,7 +1977,7 @@ RenderFrameMetadata LayerTreeHostImpl::MakeRenderFrameMetadata(
       browser_controls_offset_manager_->TopControlsHeight();
   metadata.top_controls_shown_ratio =
       browser_controls_offset_manager_->TopControlsShownRatio();
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
   metadata.bottom_controls_height =
       browser_controls_offset_manager_->BottomControlsHeight();
   metadata.bottom_controls_shown_ratio =
diff --git a/chromium/cc/trees/render_frame_metadata.cc b/chromium/cc/trees/render_frame_metadata.cc
index b666e9c6633..36b12f30014 100644
--- a/chromium/cc/trees/render_frame_metadata.cc
+++ b/chromium/cc/trees/render_frame_metadata.cc
@@ -35,7 +35,7 @@ bool RenderFrameMetadata::operator==(const RenderFrameMetadata& other) const {
          external_page_scale_factor == other.external_page_scale_factor &&
          top_controls_height == other.top_controls_height &&
          top_controls_shown_ratio == other.top_controls_shown_ratio &&
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
          bottom_controls_height == other.bottom_controls_height &&
          bottom_controls_shown_ratio == other.bottom_controls_shown_ratio &&
          min_page_scale_factor == other.min_page_scale_factor &&
diff --git a/chromium/cc/trees/render_frame_metadata.h b/chromium/cc/trees/render_frame_metadata.h
index 400eeaefe0d..a6851470257 100644
--- a/chromium/cc/trees/render_frame_metadata.h
+++ b/chromium/cc/trees/render_frame_metadata.h
@@ -75,7 +75,7 @@ class CC_EXPORT RenderFrameMetadata {
   float top_controls_height = 0.f;
   float top_controls_shown_ratio = 0.f;
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
   // Used to position Android bottom bar, whose position is computed by the
   // renderer compositor.
   float bottom_controls_height = 0.f;
diff --git a/chromium/content/common/render_frame_metadata.mojom b/chromium/content/common/render_frame_metadata.mojom
index f1302d7d626..fb309ac48a5 100644
--- a/chromium/content/common/render_frame_metadata.mojom
+++ b/chromium/content/common/render_frame_metadata.mojom
@@ -60,28 +60,28 @@ struct RenderFrameMetadata {
 
   // Used to position Android bottom bar, whose position is computed by the
   // renderer compositor.
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   float bottom_controls_height;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   float bottom_controls_shown_ratio;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   float min_page_scale_factor;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   float max_page_scale_factor;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   bool root_overflow_y_hidden;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   gfx.mojom.SizeF scrollable_viewport_size;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   gfx.mojom.SizeF root_layer_size;
 
-  [EnableIf=is_android]
+  // [EnableIf=is_android]
   bool has_transparent_background;
 };
 
diff --git a/chromium/content/common/render_frame_metadata_struct_traits.cc b/chromium/content/common/render_frame_metadata_struct_traits.cc
index fc54c4724c7..46b4351595f 100644
--- a/chromium/content/common/render_frame_metadata_struct_traits.cc
+++ b/chromium/content/common/render_frame_metadata_struct_traits.cc
@@ -25,7 +25,7 @@ bool StructTraits<content::mojom::RenderFrameMetadataDataView,
   out->external_page_scale_factor = data.external_page_scale_factor();
   out->top_controls_height = data.top_controls_height();
   out->top_controls_shown_ratio = data.top_controls_shown_ratio();
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
   out->bottom_controls_height = data.bottom_controls_height();
   out->bottom_controls_shown_ratio = data.bottom_controls_shown_ratio();
   out->min_page_scale_factor = data.min_page_scale_factor();
@@ -35,7 +35,7 @@ bool StructTraits<content::mojom::RenderFrameMetadataDataView,
 #endif
   return data.ReadRootScrollOffset(&out->root_scroll_offset) &&
          data.ReadSelection(&out->selection) &&
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
          data.ReadScrollableViewportSize(&out->scrollable_viewport_size) &&
          data.ReadRootLayerSize(&out->root_layer_size) &&
 #endif
diff --git a/chromium/content/common/render_frame_metadata_struct_traits.h b/chromium/content/common/render_frame_metadata_struct_traits.h
index c11d4483d4f..fa986c288d7 100644
--- a/chromium/content/common/render_frame_metadata_struct_traits.h
+++ b/chromium/content/common/render_frame_metadata_struct_traits.h
@@ -72,7 +72,7 @@ struct StructTraits<content::mojom::RenderFrameMetadataDataView,
     return metadata.top_controls_shown_ratio;
   }
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_QT)
   static float bottom_controls_height(const cc::RenderFrameMetadata& metadata) {
     return metadata.bottom_controls_height;
   }