diff options
| author | aelias <aelias@chromium.org> | 2015-07-14 13:18:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 20:19:01 +0000 |
| commit | c26b50b7a31fba4ed053e390e5719fac7bbbb907 (patch) | |
| tree | 0780ac3d935a33f90bad26229003ce234f571209 /cc/layers/layer_impl.cc | |
| parent | 3b8aaab5c89babfc235946f40a542def8fb8ce20 (diff) | |
| download | chromium_src-c26b50b7a31fba4ed053e390e5719fac7bbbb907.zip chromium_src-c26b50b7a31fba4ed053e390e5719fac7bbbb907.tar.gz chromium_src-c26b50b7a31fba4ed053e390e5719fac7bbbb907.tar.bz2 | |
Switch scrolling state from layer pointers to IDs.
Also, delete PushPersistedState and scrolling_layer_id_from_previous_tree_,
since that logic doesn't seem to do anything useful now.
BUG=476553
NOTRY=true
Review URL: https://codereview.chromium.org/1235823004
Cr-Commit-Position: refs/heads/master@{#338728}
Diffstat (limited to 'cc/layers/layer_impl.cc')
| -rw-r--r-- | cc/layers/layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 0a98733..1f6c199 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -1427,7 +1427,7 @@ gfx::ScrollOffset LayerImpl::MaxScrollOffset() const { if (!scroll_clip_layer_ || bounds().IsEmpty()) return gfx::ScrollOffset(); - LayerImpl const* page_scale_layer = layer_tree_impl()->page_scale_layer(); + LayerImpl const* page_scale_layer = layer_tree_impl()->PageScaleLayer(); DCHECK(this != page_scale_layer); DCHECK(this != layer_tree_impl()->InnerViewportScrollLayer() || IsContainerForFixedPositionLayers()); @@ -1473,7 +1473,7 @@ void LayerImpl::SetScrollbarPosition(ScrollbarLayerImplBase* scrollbar_layer, LayerImpl* scrollbar_clip_layer, bool on_resize) const { DCHECK(scrollbar_layer); - LayerImpl* page_scale_layer = layer_tree_impl()->page_scale_layer(); + LayerImpl* page_scale_layer = layer_tree_impl()->PageScaleLayer(); DCHECK(this != page_scale_layer); DCHECK(scrollbar_clip_layer); |