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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 12854010: cc: Chromify animation_test_common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing, rebased 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.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 922a1f88796e5f9dade817c86e7ddc493dfce32e..4e1c4dcba9eac4a4992c34875098b6088a5d2b44 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -1627,7 +1627,7 @@ TEST(LayerTreeHostCommonTest, verifyClipRectCullsSurfaceWithoutVisibleContent)
EXPECT_EQ(parent->id(), renderSurfaceLayerList[0]->id());
// Now put an animating transform on child.
- addAnimatedTransformToController(*child->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(child->layer_animation_controller(), 10, 30, 0);
parent->ClearRenderSurface();
child->ClearRenderSurface();
@@ -1909,17 +1909,17 @@ TEST(LayerTreeHostCommonTest, verifyAnimationsForRenderSurfaceHierarchy)
setLayerPropertiesForTesting(grandChildOfRS2.get(), layerTransform, sublayerTransform, gfx::PointF(0.25, 0), gfx::PointF(2.5, 0), gfx::Size(10, 10), false);
// Put an animated opacity on the render surface.
- addOpacityTransitionToController(*renderSurface1->layer_animation_controller(), 10, 1, 0, false);
+ AddOpacityTransitionToController(renderSurface1->layer_animation_controller(), 10, 1, 0, false);
// Also put an animated opacity on a layer without descendants.
- addOpacityTransitionToController(*grandChildOfRoot->layer_animation_controller(), 10, 1, 0, false);
+ AddOpacityTransitionToController(grandChildOfRoot->layer_animation_controller(), 10, 1, 0, false);
// Put a transform animation on the render surface.
- addAnimatedTransformToController(*renderSurface2->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(renderSurface2->layer_animation_controller(), 10, 30, 0);
// Also put transform animations on grandChildOfRoot, and grandChildOfRS2
- addAnimatedTransformToController(*grandChildOfRoot->layer_animation_controller(), 10, 30, 0);
- addAnimatedTransformToController(*grandChildOfRS2->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(grandChildOfRoot->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(grandChildOfRS2->layer_animation_controller(), 10, 30, 0);
executeCalculateDrawProperties(parent.get());
@@ -2858,9 +2858,9 @@ TEST(LayerTreeHostCommonTest, verifyBackFaceCullingWithAnimatingTransforms)
animatingSurface->SetForceRenderSurface(true);
// Animate the transform on the render surface.
- addAnimatedTransformToController(*animatingSurface->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(animatingSurface->layer_animation_controller(), 10, 30, 0);
// This is just an animating layer, not a surface.
- addAnimatedTransformToController(*animatingChild->layer_animation_controller(), 10, 30, 0);
+ AddAnimatedTransformToController(animatingChild->layer_animation_controller(), 10, 30, 0);
setLayerPropertiesForTesting(parent.get(), identityMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(100, 100), false);
setLayerPropertiesForTesting(child.get(), backfaceMatrix, identityMatrix, gfx::PointF(0, 0), gfx::PointF(0, 0), gfx::Size(100, 100), false);
@@ -4823,7 +4823,7 @@ TEST(LayerTreeHostCommonTest, verifyContentsScaleForAnimatingLayer)
parent->AddChild(childScale);
// Now put an animating transform on child.
- int animationId = addAnimatedTransformToController(*childScale->layer_animation_controller(), 10, 30, 0);
+ int animationId = AddAnimatedTransformToController(childScale->layer_animation_controller(), 10, 30, 0);
std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
int dummyMaxTextureSize = 512;
@@ -5132,7 +5132,7 @@ TEST_P(LCDTextTest, verifycan_use_lcd_textWithAnimation)
// Add opacity animation.
m_child->SetOpacity(0.9f);
- addOpacityTransitionToController(*(m_child->layer_animation_controller()), 10, 0.9f, 0.1f, false);
+ AddOpacityTransitionToController(m_child->layer_animation_controller(), 10, 0.9f, 0.1f, false);
executeCalculateDrawProperties(m_root, 1, 1, m_canUseLCDText);
// Text AA should not be adjusted while animation is active.
« no previous file with comments | « cc/test/layer_tree_test.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698