diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 15:06:33 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-14 15:06:33 +0000 |
| commit | b5651c24642703469ea7059a59af72acbc5520c5 (patch) | |
| tree | 5d423a3ce6f6dbdd46673b01fe9d6fce6bc5a4ab /cc/scrollbar_layer_unittest.cc | |
| parent | 2f67b439d86916fad3abd6dc6d4a55a32d2596f6 (diff) | |
| download | chromium_src-b5651c24642703469ea7059a59af72acbc5520c5.zip chromium_src-b5651c24642703469ea7059a59af72acbc5520c5.tar.gz chromium_src-b5651c24642703469ea7059a59af72acbc5520c5.tar.bz2 | |
cc: Chromify tree synchronizer and test
R=danakj@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/12837004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scrollbar_layer_unittest.cc')
| -rw-r--r-- | cc/scrollbar_layer_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc index cdb4cc9..77d206a 100644 --- a/cc/scrollbar_layer_unittest.cc +++ b/cc/scrollbar_layer_unittest.cc @@ -41,8 +41,8 @@ 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->active_tree()); - TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImpl.get()); + 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,8 +117,8 @@ 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.active_tree()); - TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImplTreeRoot.get()); + 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,8 +132,8 @@ TEST(ScrollbarLayerTest, scrollOffsetSynchronization) contentLayer->SetBounds(gfx::Size(1000, 2000)); ScrollbarAnimationController* scrollbarController = layerImplTreeRoot->scrollbar_animation_controller(); - layerImplTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), layerImplTreeRoot.Pass(), hostImpl.active_tree()); - TreeSynchronizer::pushProperties(layerTreeRoot.get(), layerImplTreeRoot.get()); + layerImplTreeRoot = TreeSynchronizer::SynchronizeTrees(layerTreeRoot.get(), layerImplTreeRoot.Pass(), hostImpl.active_tree()); + TreeSynchronizer::PushProperties(layerTreeRoot.get(), layerImplTreeRoot.get()); EXPECT_EQ(scrollbarController, layerImplTreeRoot->scrollbar_animation_controller()); EXPECT_EQ(100, ccScrollbarLayer->CurrentPos()); |