| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 0a02371dbabe3a326bde2fe762bc2e9c24647ab0..00f425965ecb02866f891f8cba8b1af116d3ed6b 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -635,6 +635,14 @@ float RenderWidgetHostViewAndroid::GetTopControlsHeight() const {
|
| 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.
|
| }
|
| @@ -1002,8 +1010,7 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
|
| }
|
| 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_ != frame.metadata.top_bar_shown ||
|
| current_viewport_selection_ != frame.metadata.selection) {
|
| RemoveLayers();
|
| if (!surface_id_.is_null())
|
| @@ -1015,8 +1022,7 @@ void RenderWidgetHostViewAndroid::SubmitCompositorFrame(
|
| DCHECK(layer_);
|
|
|
| current_surface_size_ = texture_size_in_layer_;
|
| - location_bar_content_translation_ =
|
| - frame.metadata.location_bar_content_translation;
|
| + top_bar_shown_ = frame.metadata.top_bar_shown;
|
| current_viewport_selection_ = frame.metadata.selection;
|
| AttachLayers();
|
| }
|
| @@ -1285,10 +1291,9 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
|
| // 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(frame_metadata.top_bar_shown.x(),
|
| + frame_metadata.top_bar_shown.y(),
|
| + viewport_size.width(), viewport_size.height());
|
| selection_controller_->OnViewportChanged(viewport_rect);
|
| }
|
|
|
| @@ -1302,8 +1307,10 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
|
| 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_bar_translate,
|
| + frame_metadata.top_bar_shown,
|
| + frame_metadata.bottom_bar_translate,
|
| + frame_metadata.bottom_bar_shown,
|
| is_mobile_optimized,
|
| frame_metadata.selection.start);
|
| #if defined(VIDEO_HOLE)
|
|
|