summaryrefslogtreecommitdiffstats
path: root/cc/layer_impl_unittest.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 20:58:10 +0000
commit184fac5add06d5f4670fa6be4a4d3b39232d51bb (patch)
tree7efc1d20146fcafdbe408fa67292117c41e9393f /cc/layer_impl_unittest.cc
parentfb7ffba75e81a79436434bab0715be0d6e67bc07 (diff)
downloadchromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.zip
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.gz
chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.bz2
cc: Rename cc classes and members to match filenames
BUG=155413 Review URL: https://codereview.chromium.org/11189043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl_unittest.cc')
-rw-r--r--cc/layer_impl_unittest.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/cc/layer_impl_unittest.cc b/cc/layer_impl_unittest.cc
index 2a1c3a0..fbccb4b 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layer_impl_unittest.cc
@@ -50,7 +50,7 @@ namespace {
EXPECT_FALSE(grandChild->layerPropertyChanged()); \
EXPECT_TRUE(root->layerSurfacePropertyChanged())
-TEST(CCLayerImplTest, verifyLayerChangesAreTrackedProperly)
+TEST(LayerImplTest, verifyLayerChangesAreTrackedProperly)
{
//
// This test checks that layerPropertyChanged() has the correct behavior.
@@ -59,12 +59,12 @@ TEST(CCLayerImplTest, verifyLayerChangesAreTrackedProperly)
// The constructor on this will fake that we are on the correct thread.
DebugScopedSetImplThread setImplThread;
- // Create a simple CCLayerImpl tree:
- scoped_ptr<CCLayerImpl> root = CCLayerImpl::create(1);
- root->addChild(CCLayerImpl::create(2));
- CCLayerImpl* child = root->children()[0];
- child->addChild(CCLayerImpl::create(3));
- CCLayerImpl* grandChild = child->children()[0];
+ // Create a simple LayerImpl tree:
+ scoped_ptr<LayerImpl> root = LayerImpl::create(1);
+ root->addChild(LayerImpl::create(2));
+ LayerImpl* child = root->children()[0];
+ child->addChild(LayerImpl::create(3));
+ LayerImpl* grandChild = child->children()[0];
// Adding children is an internal operation and should not mark layers as changed.
EXPECT_FALSE(root->layerPropertyChanged());
@@ -98,10 +98,10 @@ TEST(CCLayerImplTest, verifyLayerChangesAreTrackedProperly)
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPoint(arbitraryFloatPoint));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setAnchorPointZ(arbitraryNumber));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setFilters(arbitraryFilters));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMaskLayer(CCLayerImpl::create(4)));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMaskLayer(LayerImpl::create(4)));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setMasksToBounds(true));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setContentsOpaque(true));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setReplicaLayer(CCLayerImpl::create(5)));
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setReplicaLayer(LayerImpl::create(5)));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPosition(arbitraryFloatPoint));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPreserves3D(true));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setDoubleSided(false)); // constructor initializes it to "true".