Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3064)

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2106753004: Introduce bottom controls to CC and let it respond to scrolling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: findbug Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl.h ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index dc170e3bf02559317e314c27d39c3ec70b2a5830..e8348462663420c8cacdd4407214991975fc40d6 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1623,10 +1623,13 @@ CompositorFrameMetadata LayerTreeHostImpl::MakeCompositorFrameMetadata() const {
metadata.root_layer_size = active_tree_->ScrollableSize();
metadata.min_page_scale_factor = active_tree_->min_page_scale_factor();
metadata.max_page_scale_factor = active_tree_->max_page_scale_factor();
- metadata.location_bar_offset =
- gfx::Vector2dF(0.f, top_controls_manager_->ControlsTopOffset());
- metadata.location_bar_content_translation =
- gfx::Vector2dF(0.f, top_controls_manager_->ContentTopOffset());
+ metadata.top_controls_height = top_controls_manager_->TopControlsHeight();
+ metadata.top_controls_shown_ratio =
+ top_controls_manager_->TopControlsShownRatio();
+ metadata.bottom_controls_height =
+ top_controls_manager_->BottomControlsHeight();
+ metadata.bottom_controls_shown_ratio =
+ top_controls_manager_->BottomControlsShownRatio();
metadata.root_background_color = active_tree_->background_color();
active_tree_->GetViewportSelection(&metadata.selection);
@@ -1943,6 +1946,12 @@ void LayerTreeHostImpl::UpdateViewportContainerSizes() {
: 0.f;
float delta_from_top_controls =
top_controls_layout_height - top_controls_manager_->ContentTopOffset();
+ float bottom_controls_layout_height =
+ active_tree_->top_controls_shrink_blink_size()
+ ? active_tree_->bottom_controls_height()
+ : 0.f;
+ delta_from_top_controls += bottom_controls_layout_height -
+ top_controls_manager_->ContentBottomOffset();
// Adjust the viewport layers by shrinking/expanding the container to account
// for changes in the size (e.g. top controls) since the last resize from
@@ -2472,6 +2481,10 @@ float LayerTreeHostImpl::TopControlsHeight() const {
return active_tree_->top_controls_height();
}
+float LayerTreeHostImpl::BottomControlsHeight() const {
+ return active_tree_->bottom_controls_height();
+}
+
void LayerTreeHostImpl::SetCurrentTopControlsShownRatio(float ratio) {
if (active_tree_->SetCurrentTopControlsShownRatio(ratio))
DidChangeTopControlsPosition();
« no previous file with comments | « cc/trees/layer_tree_host_impl.h ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698