Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 320dd018cf7c24bcf34f2bd4d27e8a9fee89d7ae..9d954fc476e2692fbc3eb2455d460c124b1fc485 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -35,6 +35,7 @@ |
#include "cc/debug/rendering_stats_instrumentation.h" |
#include "cc/input/layer_selection_bound.h" |
#include "cc/input/page_scale_animation.h" |
+#include "cc/input/scroll_boundary_behavior.h" |
#include "cc/layers/heads_up_display_layer.h" |
#include "cc/layers/heads_up_display_layer_impl.h" |
#include "cc/layers/layer.h" |
@@ -956,6 +957,13 @@ void LayerTreeHost::SetBottomControlsHeight(float height) { |
SetNeedsCommit(); |
} |
+void LayerTreeHost::SetScrollBoundaryBehavior(ScrollBoundaryBehavior behavior) { |
+ if (scroll_boundary_behavior_ == behavior) |
+ return; |
+ scroll_boundary_behavior_ = behavior; |
+ SetNeedsCommit(); |
+} |
+ |
void LayerTreeHost::SetPageScaleFactorAndLimits(float page_scale_factor, |
float min_page_scale_factor, |
float max_page_scale_factor) { |
@@ -1182,6 +1190,7 @@ void LayerTreeHost::PushPropertiesTo(LayerTreeImpl* tree_impl) { |
browser_controls_shrink_blink_size_); |
tree_impl->set_top_controls_height(top_controls_height_); |
tree_impl->set_bottom_controls_height(bottom_controls_height_); |
+ tree_impl->set_scroll_boundary_behavior(scroll_boundary_behavior_); |
tree_impl->PushBrowserControlsFromMainThread(top_controls_shown_ratio_); |
tree_impl->elastic_overscroll()->PushFromMainThread(elastic_overscroll_); |
if (tree_impl->IsActiveTree()) |