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

Unified Diff: cc/test/layer_tree_test_common.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings 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_json_parser.cc ('k') | cc/test/mock_quad_culler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index 2147acf596587d2999fd06134d6d7dc201c3f612..4af56b692663376b5b71edb59a47e599b6dee0a5 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -202,7 +202,7 @@ private:
// Implementation of LayerTreeHost callback interface.
class ThreadedMockLayerTreeHostClient : public MockLayerImplTreeHostClient {
public:
- static scoped_ptr<ThreadedMockLayerTreeHostClient> create(TestHooks* testHooks)
+ static scoped_ptr<ThreadedMockLayerTreeHostClient> Create(TestHooks* testHooks)
{
return make_scoped_ptr(new ThreadedMockLayerTreeHostClient(testHooks));
}
@@ -354,13 +354,13 @@ void ThreadedTest::postSetVisibleToMainThread(bool visible)
void ThreadedTest::doBeginTest()
{
- m_client = ThreadedMockLayerTreeHostClient::create(this);
+ m_client = ThreadedMockLayerTreeHostClient::Create(this);
scoped_ptr<cc::Thread> implCCThread(NULL);
if (m_implThread)
implCCThread = cc::ThreadImpl::createForDifferentThread(m_implThread->message_loop_proxy());
m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), m_settings, implCCThread.Pass());
- ASSERT_TRUE(m_layerTreeHost.get());
+ ASSERT_TRUE(m_layerTreeHost);
m_started = true;
m_beginning = true;
@@ -380,8 +380,8 @@ void ThreadedTest::doBeginTest()
void ThreadedTest::setupTree()
{
if (!m_layerTreeHost->rootLayer()) {
- scoped_refptr<Layer> rootLayer = Layer::create();
- rootLayer->setBounds(gfx::Size(1, 1));
+ scoped_refptr<Layer> rootLayer = Layer::Create();
+ rootLayer->SetBounds(gfx::Size(1, 1));
m_layerTreeHost->setRootLayer(rootLayer);
}
@@ -506,7 +506,7 @@ void ThreadedTest::runTest(bool threaded)
m_mainCCThread->postDelayedTask(m_timeout.callback(), 5000);
MessageLoop::current()->Run();
if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
- m_layerTreeHost->rootLayer()->setLayerTreeHost(0);
+ m_layerTreeHost->rootLayer()->SetLayerTreeHost(0);
m_layerTreeHost.reset();
m_timeout.Cancel();
« no previous file with comments | « cc/test/layer_tree_json_parser.cc ('k') | cc/test/mock_quad_culler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698