| Index: cc/scrollbar_layer_unittest.cc
|
| diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
|
| index bf37810e972f8c400373fe6edb9267bbdb03daf4..cdb4cc93f862c3fb7eea5aedea5a67e7ed5e9c74 100644
|
| --- a/cc/scrollbar_layer_unittest.cc
|
| +++ b/cc/scrollbar_layer_unittest.cc
|
| @@ -41,7 +41,7 @@ scoped_ptr<LayerImpl> layerImplForScrollAreaAndScrollbar(
|
| scoped_refptr<Layer> child2 = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), child1->id());
|
| layerTreeRoot->AddChild(child1);
|
| layerTreeRoot->InsertChild(child2, reverse_order ? 0 : 1);
|
| - scoped_ptr<LayerImpl> layerImpl = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), host_impl->activeTree());
|
| + scoped_ptr<LayerImpl> layerImpl = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), host_impl->active_tree());
|
| TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImpl.get());
|
| return layerImpl.Pass();
|
| }
|
| @@ -117,7 +117,7 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
|
| layerTreeRoot->SetBounds(gfx::Size(100, 200));
|
| contentLayer->SetBounds(gfx::Size(100, 200));
|
|
|
| - scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.activeTree());
|
| + scoped_ptr<LayerImpl> layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<LayerImpl>(), hostImpl.active_tree());
|
| TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImplTreeRoot.get());
|
|
|
| ScrollbarLayerImpl* ccScrollbarLayer = static_cast<ScrollbarLayerImpl*>(layerImplTreeRoot->children()[1]);
|
| @@ -132,7 +132,7 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization)
|
| contentLayer->SetBounds(gfx::Size(1000, 2000));
|
|
|
| ScrollbarAnimationController* scrollbarController = layerImplTreeRoot->scrollbar_animation_controller();
|
| - layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), layerImplTreeRoot.Pass(), hostImpl.activeTree());
|
| + layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), layerImplTreeRoot.Pass(), hostImpl.active_tree());
|
| TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImplTreeRoot.get());
|
| EXPECT_EQ(scrollbarController, layerImplTreeRoot->scrollbar_animation_controller());
|
|
|
| @@ -216,7 +216,7 @@ public:
|
|
|
| virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE
|
| {
|
| - const int kMaxTextureSize = impl->rendererCapabilities().max_texture_size;
|
| + const int kMaxTextureSize = impl->GetRendererCapabilities().max_texture_size;
|
|
|
| // Check first that we're actually testing something.
|
| EXPECT_GT(m_scrollbarLayer->bounds().width(), kMaxTextureSize);
|
|
|