Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: cc/texture_layer_unittest.cc

Issue 12648005: cc: Chromify the LayerTreeHostImpl class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compl Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/layer_tree_test_common.cc ('k') | cc/thread_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_layer_unittest.cc
diff --git a/cc/texture_layer_unittest.cc b/cc/texture_layer_unittest.cc
index 5b08c5090392021526fb7906cf8d480f1467540b..195bf431ee5e5654d02f3c51e2f2d5469f91b973 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/texture_layer_unittest.cc
@@ -105,7 +105,7 @@ TEST_F(TextureLayerTest, syncImplWhenDrawing)
scoped_refptr<TextureLayer> testLayer = TextureLayer::Create(NULL);
ASSERT_TRUE(testLayer);
scoped_ptr<TextureLayerImpl> implLayer;
- implLayer = TextureLayerImpl::Create(m_hostImpl.activeTree(), 1, false);
+ implLayer = TextureLayerImpl::Create(m_hostImpl.active_tree(), 1, false);
ASSERT_TRUE(implLayer);
EXPECT_CALL(*m_layerTreeHost, AcquireLayerTextures()).Times(AnyNumber());
@@ -400,7 +400,7 @@ protected:
{
TextureLayerTest::SetUp();
m_layerTreeHost.reset(new MockLayerImplTreeHost);
- EXPECT_TRUE(m_hostImpl.initializeRenderer(createFakeOutputSurface()));
+ EXPECT_TRUE(m_hostImpl.InitializeRenderer(createFakeOutputSurface()));
}
CommonMailboxObjects m_testData;
@@ -408,13 +408,13 @@ protected:
TEST_F(TextureLayerImplWithMailboxTest, testImplLayerCallbacks)
{
- m_hostImpl.createPendingTree();
+ m_hostImpl.CreatePendingTree();
scoped_ptr<TextureLayerImpl> pendingLayer;
- pendingLayer = TextureLayerImpl::Create(m_hostImpl.pendingTree(), 1, true);
+ pendingLayer = TextureLayerImpl::Create(m_hostImpl.pending_tree(), 1, true);
ASSERT_TRUE(pendingLayer);
scoped_ptr<LayerImpl> activeLayer(pendingLayer->CreateLayerImpl(
- m_hostImpl.activeTree()));
+ m_hostImpl.active_tree()));
ASSERT_TRUE(activeLayer);
pendingLayer->setTextureMailbox(m_testData.m_mailbox1);
@@ -459,20 +459,20 @@ TEST_F(TextureLayerImplWithMailboxTest, testImplLayerCallbacks)
TEST_F(TextureLayerImplWithMailboxTest, testDestructorCallbackOnCreatedResource)
{
scoped_ptr<TextureLayerImpl> implLayer;
- implLayer = TextureLayerImpl::Create(m_hostImpl.activeTree(), 1, true);
+ implLayer = TextureLayerImpl::Create(m_hostImpl.active_tree(), 1, true);
ASSERT_TRUE(implLayer);
EXPECT_CALL(m_testData.m_mockCallback,
Release(m_testData.m_mailboxName1, _)).Times(1);
implLayer->setTextureMailbox(m_testData.m_mailbox1);
- implLayer->WillDraw(m_hostImpl.activeTree()->resource_provider());
- implLayer->DidDraw(m_hostImpl.activeTree()->resource_provider());
+ implLayer->WillDraw(m_hostImpl.active_tree()->resource_provider());
+ implLayer->DidDraw(m_hostImpl.active_tree()->resource_provider());
implLayer->setTextureMailbox(TextureMailbox());
}
TEST_F(TextureLayerImplWithMailboxTest, testCallbackOnInUseResource)
{
- ResourceProvider *provider = m_hostImpl.activeTree()->resource_provider();
+ ResourceProvider *provider = m_hostImpl.active_tree()->resource_provider();
ResourceProvider::ResourceId id =
provider->CreateResourceFromTextureMailbox(m_testData.m_mailbox1);
provider->AllocateForTesting(id);
« no previous file with comments | « cc/test/layer_tree_test_common.cc ('k') | cc/thread_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698