cc/trees/occlusion_tracker_unittest.cc - Issue 12854010: cc: Chromify animation_test_common

Unified Diff: cc/trees/occlusion_tracker_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

Index: cc/trees/occlusion_tracker_unittest.cc

diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc

index 651468cfd8132bb6f8d4c6f006f4a13e63dbd16c..7e44febb7e986d632edb0acdcaa5d36484c54334 100644

--- a/cc/trees/occlusion_tracker_unittest.cc

+++ b/cc/trees/occlusion_tracker_unittest.cc

@@ -1913,8 +1913,8 @@ protected:

typename Types::ContentLayerType* parent2 = this->createDrawingLayer(parent, this->identityMatrix, gfx::PointF(0, 0), gfx::Size(300, 300), false);

typename Types::ContentLayerType* topmost = this->createDrawingLayer(parent, this->identityMatrix, gfx::PointF(250, 0), gfx::Size(50, 300), true);

- addOpacityTransitionToController(*layer->layer_animation_controller(), 10, 0, 1, false);

- addOpacityTransitionToController(*surface->layer_animation_controller(), 10, 0, 1, false);

+ AddOpacityTransitionToController(layer->layer_animation_controller(), 10, 0, 1, false);

+ AddOpacityTransitionToController(surface->layer_animation_controller(), 10, 0, 1, false);

this->calcDrawEtc(parent);

EXPECT_TRUE(layer->draw_opacity_is_animating());

@@ -1978,8 +1978,8 @@ protected:

typename Types::ContentLayerType* parent2 = this->createDrawingLayer(parent, this->identityMatrix, gfx::PointF(0, 0), gfx::Size(300, 300), false);

typename Types::ContentLayerType* topmost = this->createDrawingLayer(parent, this->identityMatrix, gfx::PointF(250, 0), gfx::Size(50, 300), true);

- addOpacityTransitionToController(*layer->layer_animation_controller(), 10, 1, 0, false);

- addOpacityTransitionToController(*surface->layer_animation_controller(), 10, 1, 0, false);

+ AddOpacityTransitionToController(layer->layer_animation_controller(), 10, 1, 0, false);

+ AddOpacityTransitionToController(surface->layer_animation_controller(), 10, 1, 0, false);

this->calcDrawEtc(parent);

EXPECT_TRUE(layer->draw_opacity_is_animating());

@@ -2042,9 +2042,9 @@ protected:

typename Types::ContentLayerType* surfaceChild2 = this->createDrawingLayer(surface, this->identityMatrix, gfx::PointF(0, 0), gfx::Size(100, 300), true);

typename Types::ContentLayerType* surface2 = this->createDrawingSurface(parent, this->identityMatrix, gfx::PointF(0, 0), gfx::Size(50, 300), true);

- addAnimatedTransformToController(*layer->layer_animation_controller(), 10, 30, 0);

- addAnimatedTransformToController(*surface->layer_animation_controller(), 10, 30, 0);

- addAnimatedTransformToController(*surfaceChild->layer_animation_controller(), 10, 30, 0);

+ AddAnimatedTransformToController(layer->layer_animation_controller(), 10, 30, 0);

+ AddAnimatedTransformToController(surface->layer_animation_controller(), 10, 30, 0);

+ AddAnimatedTransformToController(surfaceChild->layer_animation_controller(), 10, 30, 0);

this->calcDrawEtc(parent);

EXPECT_TRUE(layer->draw_transform_is_animating());

« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »