Chromium Code Reviews| Index: cc/layers/layer_impl.cc |
| diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc |
| index 29bdfe778fdf522fc9a3a8f97d74ef4adb90b71c..9638c9559107e6760abc8f72b9f07dc92199bcf0 100644 |
| --- a/cc/layers/layer_impl.cc |
| +++ b/cc/layers/layer_impl.cc |
| @@ -782,7 +782,7 @@ void LayerImpl::SetBounds(const gfx::Size& bounds) { |
| bounds_ = bounds; |
| - ScrollbarParametersDidChange(); |
| + ScrollbarParametersDidChange(true); |
| if (masks_to_bounds()) |
| NoteLayerPropertyChangedForSubtree(); |
| else |
| @@ -1226,7 +1226,8 @@ gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { |
| } |
| void LayerImpl::SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer, |
| - LayerImpl* scrollbar_clip_layer) const { |
| + LayerImpl* scrollbar_clip_layer, |
| + bool on_resize) const { |
|
aelias_OOO_until_Jul13
2014/09/30 18:55:27
I don't think the new argument is needed here. Yo
MuVen
2014/10/01 16:45:51
Done.
|
| DCHECK(scrollbar_layer); |
| LayerImpl* page_scale_layer = layer_tree_impl()->page_scale_layer(); |
| @@ -1311,7 +1312,7 @@ void LayerImpl::SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer, |
| layer_tree_impl()->min_page_scale_factor()) || |
| !layer_tree_impl()->settings().use_pinch_zoom_scrollbars); |
| if (is_animatable_scrollbar) |
| - scrollbar_animation_controller_->DidScrollUpdate(); |
| + scrollbar_animation_controller_->DidScrollUpdate(on_resize); |
| } |
| } |
| } |
| @@ -1374,14 +1375,14 @@ bool LayerImpl::HasScrollbar(ScrollbarOrientation orientation) const { |
| return false; |
| } |
| -void LayerImpl::ScrollbarParametersDidChange() { |
| +void LayerImpl::ScrollbarParametersDidChange(bool on_resize) { |
| if (!scrollbars_) |
| return; |
| for (ScrollbarSet::iterator it = scrollbars_->begin(); |
| it != scrollbars_->end(); |
| ++it) |
| - (*it)->ScrollbarParametersDidChange(); |
| + (*it)->ScrollbarParametersDidChange(on_resize); |
| } |
| void LayerImpl::SetNeedsPushProperties() { |