| Index: cc/layer_tree_host_perftest.cc
|
| diff --git a/cc/layer_tree_host_perftest.cc b/cc/layer_tree_host_perftest.cc
|
| index 7682593bed6c0d60eb484eaa548d334ae01226df..ae97301c5633665945f8dbb837cf8ee522a092f8 100644
|
| --- a/cc/layer_tree_host_perftest.cc
|
| +++ b/cc/layer_tree_host_perftest.cc
|
| @@ -85,11 +85,11 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
|
|
|
| virtual void buildTree() OVERRIDE {
|
| gfx::Size viewport = gfx::Size(720, 1038);
|
| - m_layerTreeHost->setViewportSize(viewport, viewport);
|
| + layer_tree_host_->setViewportSize(viewport, viewport);
|
| scoped_refptr<Layer> root = ParseTreeFromJson(json_,
|
| &fake_content_layer_client_);
|
| ASSERT_TRUE(root.get());
|
| - m_layerTreeHost->setRootLayer(root);
|
| + layer_tree_host_->setRootLayer(root);
|
| }
|
|
|
| private:
|
| @@ -111,17 +111,17 @@ class ScrollingLayerTreePerfTest : public LayerTreeHostPerfTestJsonReader {
|
|
|
| virtual void buildTree() OVERRIDE {
|
| LayerTreeHostPerfTestJsonReader::buildTree();
|
| - m_scrollable = m_layerTreeHost->rootLayer()->children()[1];
|
| - ASSERT_TRUE(m_scrollable);
|
| + scrollable_ = layer_tree_host_->RootLayer()->Children()[1];
|
| + ASSERT_TRUE(scrollable_);
|
| }
|
|
|
| virtual void layout() OVERRIDE {
|
| static const gfx::Vector2d delta = gfx::Vector2d(0, 10);
|
| - m_scrollable->setScrollOffset(m_scrollable->scrollOffset() + delta);
|
| + scrollable_->SetScrollOffset(scrollable_->ScrollOffset() + delta);
|
| }
|
|
|
| private:
|
| - scoped_refptr<Layer> m_scrollable;
|
| + scoped_refptr<Layer> scrollable_;
|
| };
|
|
|
| TEST_F(ScrollingLayerTreePerfTest, LongScrollablePage) {
|
|
|