Introduce bottom controls to CC and let it respond to scrolling

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 402 matching lines @@
 
 // All positions and sizes are in CSS pixels.
 // Note that viewport_width/height is a best effort based.
 // ContentViewCore has the actual information about the physical viewport size.
 void ContentViewCoreImpl::UpdateFrameInfo(
     const gfx::Vector2dF& scroll_offset,
     float page_scale_factor,
     const gfx::Vector2dF& page_scale_factor_limits,
     const gfx::SizeF& content_size,
     const gfx::SizeF& viewport_size,
-    const gfx::Vector2dF& controls_offset,
-    const gfx::Vector2dF& content_offset,
+    const float top_controls_height,
+    const float top_controls_shown_ratio,
+    const float bottom_controls_height,
+    const float bottom_controls_shown_ratio,
     bool is_mobile_optimized_hint,
     const gfx::SelectionBound& selection_start) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null() || !view_.GetWindowAndroid())
     return;
 
-  view_.GetWindowAndroid()->set_content_offset(
-      gfx::ScaleVector2d(content_offset, dpi_scale_));
+  view_.GetWindowAndroid()->set_content_offset(gfx::ScaleVector2d(
+      gfx::Vector2dF(0.0f, top_controls_height * top_controls_shown_ratio),
+      dpi_scale_));
 
   page_scale_ = page_scale_factor;
 
   // The CursorAnchorInfo API in Android only supports zero width selection
   // bounds.
   const jboolean has_insertion_marker =
       selection_start.type() == gfx::SelectionBound::CENTER;
   const jboolean is_insertion_marker_visible = selection_start.visible();
   const jfloat insertion_marker_horizontal =
       has_insertion_marker ? selection_start.edge_top().x() : 0.0f;
   const jfloat insertion_marker_top =
       has_insertion_marker ? selection_start.edge_top().y() : 0.0f;
   const jfloat insertion_marker_bottom =
       has_insertion_marker ? selection_start.edge_bottom().y() : 0.0f;
 
   Java_ContentViewCore_updateFrameInfo(
       env, obj.obj(),
       scroll_offset.x(),
       scroll_offset.y(),
       page_scale_factor,
       page_scale_factor_limits.x(),
       page_scale_factor_limits.y(),
       content_size.width(),
       content_size.height(),
       viewport_size.width(),
       viewport_size.height(),
-      controls_offset.y(),
-      content_offset.y(),
+      top_controls_height,
+      top_controls_shown_ratio,
+      bottom_controls_height,
+      bottom_controls_shown_ratio,
       is_mobile_optimized_hint,
       has_insertion_marker,
       is_insertion_marker_visible,
       insertion_marker_horizontal,
       insertion_marker_top,
       insertion_marker_bottom);
 }
 
 void ContentViewCoreImpl::SetTitle(const base::string16& title) {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 305 matching lines @@
 
   gfx::Size size_dip = gfx::ScaleToCeiledSize(size_pix, 1.0f / dpi_scale());
   if (DoTopControlsShrinkBlinkSize())
     size_dip.Enlarge(0, -GetTopControlsHeightDip());
   return size_dip;
 }
 
 gfx::Size ContentViewCoreImpl::GetViewSize() const {
   gfx::Size size = GetViewportSizeDip();
   if (DoTopControlsShrinkBlinkSize())
-    size.Enlarge(0, -GetTopControlsHeightDip());
+    size.Enlarge(0, -GetTopControlsHeightDip() - GetBottomControlsHeightDip());
   return size;
 }
 
 gfx::Size ContentViewCoreImpl::GetPhysicalBackingSize() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return gfx::Size();
   return gfx::Size(
       Java_ContentViewCore_getPhysicalBackingWidthPix(env, j_obj.obj()),
@@ skipping 11 matching lines @@
 }
 
 int ContentViewCoreImpl::GetTopControlsHeightPix() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return 0;
   return Java_ContentViewCore_getTopControlsHeightPix(env, j_obj.obj());
 }
 
+int ContentViewCoreImpl::GetBottomControlsHeightPix() const {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return 0;
+  return Java_ContentViewCore_getBottomControlsHeightPix(env, j_obj.obj());
+}
+
 gfx::Size ContentViewCoreImpl::GetViewportSizeDip() const {
   return gfx::ScaleToCeiledSize(GetViewportSizePix(), 1.0f / dpi_scale());
 }
 
 bool ContentViewCoreImpl::DoTopControlsShrinkBlinkSize() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return false;
   return Java_ContentViewCore_doTopControlsShrinkBlinkSize(env, j_obj.obj());
 }
 
 float ContentViewCoreImpl::GetTopControlsHeightDip() const {
   return GetTopControlsHeightPix() / dpi_scale();
 }
 
+float ContentViewCoreImpl::GetBottomControlsHeightDip() const {
+  return GetBottomControlsHeightPix() / dpi_scale();
+}
+
 void ContentViewCoreImpl::AttachLayer(scoped_refptr<cc::Layer> layer) {
   view_.GetLayer()->InsertChild(layer, 0);
   view_.GetLayer()->SetIsDrawable(false);
 }
 
 void ContentViewCoreImpl::RemoveLayer(scoped_refptr<cc::Layer> layer) {
   layer->RemoveFromParent();
 
   if (view_.GetLayer()->children().empty())
     view_.GetLayer()->SetIsDrawable(true);
@@ skipping 793 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content