| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 97716dcbee1b496fe03def24fb903531ce9f486d..45fb5d1941eb367dac75c410cef061f0da5dfa40 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -425,6 +425,8 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
|
| target_tree->set_bottom_controls_height(bottom_controls_height_);
|
| target_tree->PushBrowserControls(nullptr);
|
|
|
| + target_tree->set_scroll_boundary_behavior(scroll_boundary_behavior_);
|
| +
|
| // The page scale factor update can affect scrolling which requires that
|
| // these ids are set, so this must be before PushPageScaleFactorAndLimits.
|
| target_tree->SetViewportLayersFromIds(viewport_layer_ids_);
|
| @@ -823,6 +825,11 @@ void LayerTreeImpl::set_bottom_controls_height(float bottom_controls_height) {
|
| layer_tree_host_impl_->UpdateViewportContainerSizes();
|
| }
|
|
|
| +void LayerTreeImpl::set_scroll_boundary_behavior(
|
| + const ScrollBoundaryBehavior& behavior) {
|
| + scroll_boundary_behavior_ = behavior;
|
| +}
|
| +
|
| bool LayerTreeImpl::ClampBrowserControlsShownRatio() {
|
| float ratio = top_controls_shown_ratio_->Current(true);
|
| ratio = std::max(ratio, 0.f);
|
|
|