| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 87d4639119dfa529a083fca5da14c2bcd113434a..620beba26dce04d9dc281c1165dd64e12aabd1c1 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -418,6 +418,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(
|
| @@ -851,6 +853,11 @@ void LayerTreeImpl::set_bottom_controls_height(float bottom_controls_height) {
|
| layer_tree_host_impl_->UpdateViewportContainerSizes();
|
| }
|
|
|
| +void LayerTreeImpl::set_scroll_boundary_behavior(
|
| + ScrollBoundaryBehavior behavior) {
|
| + scroll_boundary_behavior_ = behavior;
|
| +}
|
| +
|
| bool LayerTreeImpl::ClampBrowserControlsShownRatio() {
|
| float ratio = top_controls_shown_ratio_->Current(true);
|
| ratio = std::max(ratio, 0.f);
|
|
|