cc: Chromify the LayerTreeHostImpl class.

cc/scrollbar_layer_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scrollbar_layer.h"
 
 #include "cc/append_quads_data.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/priority_calculator.h"
 #include "cc/resource_update_queue.h"
@@ skipping 23 matching lines @@
 scoped_ptr<LayerImpl> layerImplForScrollAreaAndScrollbar(
     FakeLayerTreeHostImpl* host_impl,
     scoped_ptr<WebKit::WebScrollbar> scrollbar,
     bool reverse_order)
 {
     scoped_refptr<Layer> layerTreeRoot = Layer::Create();
     scoped_refptr<Layer> child1 = Layer::Create();
     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();
 }
 
 TEST(ScrollbarLayerTest, resolveScrollLayerPointer)
 {
     FakeImplProxy proxy;
     FakeLayerTreeHostImpl hostImpl(&proxy);
 
     {
@@ skipping 55 matching lines @@
     scoped_refptr<Layer> contentLayer = Layer::Create();
     scoped_refptr<Layer> scrollbarLayer = ScrollbarLayer::Create(scrollbar.Pass(), FakeScrollbarThemePainter::Create(false).PassAs<ScrollbarThemePainter>(), FakeWebScrollbarThemeGeometry::create(true), layerTreeRoot->id());
     layerTreeRoot->AddChild(contentLayer);
     layerTreeRoot->AddChild(scrollbarLayer);
 
     layerTreeRoot->SetScrollOffset(gfx::Vector2d(10, 20));
     layerTreeRoot->SetMaxScrollOffset(gfx::Vector2d(30, 50));
     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]);
 
     EXPECT_EQ(10, ccScrollbarLayer->CurrentPos());
     EXPECT_EQ(100, ccScrollbarLayer->TotalSize());
     EXPECT_EQ(30, ccScrollbarLayer->Maximum());
 
     layerTreeRoot->SetScrollOffset(gfx::Vector2d(100, 200));
     layerTreeRoot->SetMaxScrollOffset(gfx::Vector2d(300, 500));
     layerTreeRoot->SetBounds(gfx::Size(1000, 2000));
     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());
 
     EXPECT_EQ(100, ccScrollbarLayer->CurrentPos());
     EXPECT_EQ(1000, ccScrollbarLayer->TotalSize());
     EXPECT_EQ(300, ccScrollbarLayer->Maximum());
 
     layerImplTreeRoot->ScrollBy(gfx::Vector2d(12, 34));
 
     EXPECT_EQ(112, ccScrollbarLayer->CurrentPos());
@@ skipping 63 matching lines @@
 
         m_scrollLayer = Layer::Create();
         m_scrollbarLayer->SetScrollLayerId(m_scrollLayer->id());
         m_layerTreeHost->root_layer()->AddChild(m_scrollLayer);
 
         postSetNeedsCommitToMainThread();
     }
 
     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);
 
         EXPECT_EQ(m_scrollbarLayer->content_bounds().width(), kMaxTextureSize - 1);
         EXPECT_EQ(m_scrollbarLayer->content_bounds().height(), kMaxTextureSize - 1);
 
         endTest();
     }
 
@@ skipping 88 matching lines @@
 }
 
 TEST_F(ScrollbarLayerTestResourceCreation, solidColorNoResourceUpload)
 {
     m_layerTreeSettings.solidColorScrollbars = true;
     testResourceUpload(0);
 }
 
 }  // namespace
 }  // namespace cc