viz: Remove unused bottom-controls data from compositor frame.

The bottom_controls_height and bottom_controls_shown_ratio fields
in CompositorFrameMetadata are currently unused. Their usage has been
replaced by the same fields in RenderFrameMetadata. So remove these
fields.

BUG=none

Change-Id: I96af75cc5f933821cfb486fdeb1e314daa2a7030
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1927973
Auto-Submit: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717874}

cc/trees/layer_tree_host_impl.cc

@@ -2196,10 +2196,6 @@ RenderFrameMetadata LayerTreeHostImpl::MakeRenderFrameMetadata(
   metadata.top_controls_shown_ratio =
       browser_controls_offset_manager_->TopControlsShownRatio();
 #if defined(OS_ANDROID)
-  metadata.bottom_controls_height =
-      browser_controls_offset_manager_->BottomControlsHeight();
-  metadata.bottom_controls_shown_ratio =
-      browser_controls_offset_manager_->BottomControlsShownRatio();
   metadata.scrollable_viewport_size = active_tree_->ScrollableViewportSize();
   metadata.min_page_scale_factor = active_tree_->min_page_scale_factor();
   metadata.max_page_scale_factor = active_tree_->max_page_scale_factor();
@@ -2257,10 +2253,6 @@ RenderFrameMetadata LayerTreeHostImpl::MakeRenderFrameMetadata(
            metadata.top_controls_height ||
        last_draw_render_frame_metadata_->top_controls_shown_ratio !=
            metadata.top_controls_shown_ratio ||
-       last_draw_render_frame_metadata_->bottom_controls_height !=
-           metadata.bottom_controls_height ||
-       last_draw_render_frame_metadata_->bottom_controls_shown_ratio !=
-           metadata.bottom_controls_shown_ratio ||
        last_draw_render_frame_metadata_->selection != metadata.selection ||
        last_draw_render_frame_metadata_->has_transparent_background !=
            metadata.has_transparent_background);

components/viz/common/quads/compositor_frame_metadata.h

@@ -138,13 +138,6 @@ class VIZ_COMMON_EXPORT CompositorFrameMetadata {
   float top_controls_height = 0.f;
   float top_controls_shown_ratio = 0.f;
 
-#if defined(OS_ANDROID)
-  // Used to position Android bottom bar, whose position is computed by the
-  // renderer compositor.
-  float bottom_controls_height = 0.f;
-  float bottom_controls_shown_ratio = 0.f;
-#endif
-
   // The time at which the LocalSurfaceId used to submit this CompositorFrame
   // was allocated.
   base::TimeTicks local_surface_id_allocation_time;

services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.cc

@@ -40,10 +40,6 @@ bool StructTraits<viz::mojom::CompositorFrameMetadataDataView,
   out->min_page_scale_factor = data.min_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)
-  out->bottom_controls_height = data.bottom_controls_height();
-  out->bottom_controls_shown_ratio = data.bottom_controls_shown_ratio();
-#endif
 
   return data.ReadLatencyInfo(&out->latency_info) &&
          data.ReadReferencedSurfaces(&out->referenced_surfaces) &&

services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h

@@ -103,18 +103,6 @@ struct StructTraits<viz::mojom::CompositorFrameMetadataDataView,
     return metadata.top_controls_shown_ratio;
   }
 
-#if defined(OS_ANDROID)
-  static float bottom_controls_height(
-      const viz::CompositorFrameMetadata& metadata) {
-    return metadata.bottom_controls_height;
-  }
-
-  static float bottom_controls_shown_ratio(
-      const viz::CompositorFrameMetadata& metadata) {
-    return metadata.bottom_controls_shown_ratio;
-  }
-#endif  // defined(OS_ANDROID)
-
   static base::TimeTicks local_surface_id_allocation_time(
       const viz::CompositorFrameMetadata& metadata) {
     DCHECK(!metadata.local_surface_id_allocation_time.is_null());

services/viz/public/mojom/compositing/compositor_frame_metadata.mojom

@@ -36,12 +36,6 @@ struct CompositorFrameMetadata {
 
   float top_controls_shown_ratio;
 
-  [EnableIf=is_android]
-  float bottom_controls_height;
-
-  [EnableIf=is_android]
-  float bottom_controls_shown_ratio;
-
   mojo_base.mojom.TimeTicks local_surface_id_allocation_time;
 
   // Specifies the interval at which the client's content is updated. This can