Introduce bottom controls to CC and let it respond to scrolling

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 608 matching lines @@
 }
 
 float RenderWidgetHostViewAndroid::GetTopControlsHeight() const {
   if (!content_view_core_)
     return 0.f;
 
   // The height of the top controls.
   return content_view_core_->GetTopControlsHeightDip();
 }
 
+float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const {
+  if (!content_view_core_)
+    return 0.f;
+
+  // The height of the top controls.
+  return content_view_core_->GetBottomControlsHeightDip();
+}
+
 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) {
   // There are no cursors on Android.
 }
 
 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) {
   // Do nothing. The UI notification is handled through ContentViewClient which
   // is TabContentsDelegate.
 }
 
 long RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
@@ skipping 346 matching lines @@
 
 void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   cc::SurfaceManager* manager =
       ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   if (!surface_factory_) {
     surface_factory_ = base::WrapUnique(new cc::SurfaceFactory(manager, this));
   }
   if (surface_id_.is_null() ||
       texture_size_in_layer_ != current_surface_size_ ||
-      location_bar_content_translation_ !=
-          frame.metadata.location_bar_content_translation ||
+      top_bar_shown_ratio_ != frame.metadata.top_controls_shown_ratio ||
+      bottom_bar_shown_ratio_ != frame.metadata.bottom_controls_shown_ratio ||

[no sievers, 2016/08/16 20:29:16]

This is for pixel-perfect scrolling where tearing down the Surface causes a
browser-composite dependency (for repositioning the omnibox *texture* layer
correctly). But your cl description says you don't need this.

The layer bounds are already getting correctly updated from the call site.

[Ian Wen, 2016/08/17 00:20:46]

Done. I removed #1004, but kept #1017 as is.

       current_viewport_selection_ != frame.metadata.selection) {
     RemoveLayers();
     if (!surface_id_.is_null())
       surface_factory_->Destroy(surface_id_);
     surface_id_ = id_allocator_->GenerateId();
     surface_factory_->Create(surface_id_);
     view_.SetLayer(CreateSurfaceLayer(surface_id_, texture_size_in_layer_));
 
     DCHECK(view_.GetLayer());
 
     current_surface_size_ = texture_size_in_layer_;
-    location_bar_content_translation_ =
-        frame.metadata.location_bar_content_translation;
+    top_bar_shown_ratio_ = frame.metadata.top_controls_shown_ratio;
+    bottom_bar_shown_ratio_ = frame.metadata.bottom_controls_shown_ratio;
     current_viewport_selection_ = frame.metadata.selection;
     AttachLayers();
   }
 
   cc::SurfaceFactory::DrawCallback ack_callback =
       base::Bind(&RenderWidgetHostViewAndroid::RunAckCallbacks,
                  weak_ptr_factory_.GetWeakPtr());
   surface_factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
                                           ack_callback);
 }
@@ skipping 219 matching lines @@
     selection_controller_->OnSelectionEditable(
         frame_metadata.selection.is_editable);
     selection_controller_->OnSelectionEmpty(
         frame_metadata.selection.is_empty_text_form_control);
     selection_controller_->OnSelectionBoundsChanged(
         frame_metadata.selection.start, frame_metadata.selection.end);
 
     // Set parameters for adaptive handle orientation.
     gfx::SizeF viewport_size(frame_metadata.scrollable_viewport_size);
     viewport_size.Scale(frame_metadata.page_scale_factor);
-    gfx::RectF viewport_rect(
-        frame_metadata.location_bar_content_translation.x(),
-        frame_metadata.location_bar_content_translation.y(),
-        viewport_size.width(), viewport_size.height());
+    gfx::RectF viewport_rect(0.0f, frame_metadata.top_controls_height *
+                                       frame_metadata.top_controls_shown_ratio,
+                             viewport_size.width(), viewport_size.height());
     selection_controller_->OnViewportChanged(viewport_rect);
   }
 
   UpdateBackgroundColor(frame_metadata.root_background_color);
 
   // All offsets and sizes are in CSS pixels.
   content_view_core_->UpdateFrameInfo(
       frame_metadata.root_scroll_offset,
       frame_metadata.page_scale_factor,
       gfx::Vector2dF(frame_metadata.min_page_scale_factor,
                      frame_metadata.max_page_scale_factor),
       frame_metadata.root_layer_size,
       frame_metadata.scrollable_viewport_size,
-      frame_metadata.location_bar_offset,
-      frame_metadata.location_bar_content_translation,
+      frame_metadata.top_controls_height,
+      frame_metadata.top_controls_shown_ratio,
+      frame_metadata.bottom_controls_height,
+      frame_metadata.bottom_controls_shown_ratio,
       is_mobile_optimized,
       frame_metadata.selection.start);
 #if defined(VIDEO_HOLE)
   if (host_) {
     WebContents* web_contents =
         WebContents::FromRenderViewHost(RenderViewHostImpl::From(host_));
     if (web_contents) {
       MediaWebContentsObserverAndroid::FromWebContents(web_contents)
           ->OnFrameInfoUpdated();
     }
@@ skipping 715 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content