| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 797b46d6ce624c5c55a732df28e9ea864e8ae6f2..95d6052f37996d8a1d21995e79a8a25e67a2a55b 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -886,12 +886,12 @@ LayerImpl* LayerTreeHostImpl::rootLayer() const
|
|
|
| LayerImpl* LayerTreeHostImpl::rootScrollLayer() const
|
| {
|
| - return m_activeTree->root_scroll_layer();
|
| + return m_activeTree->RootScrollLayer();
|
| }
|
|
|
| LayerImpl* LayerTreeHostImpl::currentlyScrollingLayer() const
|
| {
|
| - return m_activeTree->currently_scrolling_layer();
|
| + return m_activeTree->CurrentlyScrollingLayer();
|
| }
|
|
|
| // Content layers can be either directly scrollable or contained in an outer
|
| @@ -911,11 +911,6 @@ static LayerImpl* findScrollLayerForContentLayer(LayerImpl* layerImpl)
|
| return 0;
|
| }
|
|
|
| -LayerTreeImpl* LayerTreeHostImpl::activeTree()
|
| -{
|
| - return m_activeTree.get();
|
| -}
|
| -
|
| void LayerTreeHostImpl::createPendingTree()
|
| {
|
| CHECK(!m_pendingTree);
|
| @@ -1425,7 +1420,7 @@ void LayerTreeHostImpl::makeScrollAndScaleSet(ScrollAndScaleSet* scrollInfo, gfx
|
| scroll.layerId = rootScrollLayer()->id();
|
| scroll.scrollDelta = scrollOffset - rootScrollLayer()->scrollOffset();
|
| scrollInfo->scrolls.push_back(scroll);
|
| - activeTree()->root_scroll_layer()->setSentScrollDelta(scroll.scrollDelta);
|
| + activeTree()->RootScrollLayer()->setSentScrollDelta(scroll.scrollDelta);
|
| scrollInfo->pageScaleDelta = pageScale / m_pinchZoomViewport.page_scale_factor();
|
| m_pinchZoomViewport.set_sent_page_scale_delta(scrollInfo->pageScaleDelta);
|
| }
|
|
|