cc/trees/layer_tree_host_unittest.cc - Issue 2762123004: cc: LayerTreeHostImpl uses element id to tick animations

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2762123004: cc: LayerTreeHostImpl uses element id to tick animations (Closed)

Patch Set: rebase Created 3 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/layer_tree_host_unittest.cc

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

index b463e066c419dc8c7671a6db3084fbfb4ae9c93f..8729864ceef0f4d1734f10605d92558d983af648 100644

--- a/cc/trees/layer_tree_host_unittest.cc

+++ b/cc/trees/layer_tree_host_unittest.cc

@@ -1128,8 +1128,7 @@ class LayerTreeHostTestPropertyTreesChangedSync : public LayerTreeHostTest {

case OPACITY:

index_++;

impl->active_tree()->ResetAllChangeTracking();

- impl->active_tree()->property_trees()->effect_tree.OnOpacityAnimated(

- 0.5f, root->effect_tree_index(), impl->active_tree());

+ impl->active_tree()->SetOpacityMutated(root->element_id(), 0.5f);

PostSetNeedsCommitToMainThread();

break;

case TRANSFORM:

@@ -1145,10 +1144,7 @@ class LayerTreeHostTestPropertyTreesChangedSync : public LayerTreeHostTest {

->LayerById(child_->id())

->LayerPropertyChanged());

transform.Translate(10, 10);

- impl->active_tree()

- ->property_trees()

- ->transform_tree.OnTransformAnimated(

- transform, root->transform_tree_index(), impl->active_tree());

+ impl->active_tree()->SetTransformMutated(root->element_id(), transform);

PostSetNeedsCommitToMainThread();

break;

case FILTER:

@@ -1163,8 +1159,7 @@ class LayerTreeHostTestPropertyTreesChangedSync : public LayerTreeHostTest {

->LayerById(child_->id())

->LayerPropertyChanged());

filters.Append(FilterOperation::CreateOpacityFilter(0.5f));

- impl->active_tree()->property_trees()->effect_tree.OnFilterAnimated(

- filters, root->effect_tree_index(), impl->active_tree());

+ impl->active_tree()->SetFilterMutated(root->element_id(), filters);

PostSetNeedsCommitToMainThread();

break;

case END:

@@ -1238,8 +1233,7 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {

EffectNode* node = effect_tree.Node(root->effect_tree_index());

switch (impl->sync_tree()->source_frame_number()) {

case 0:

- effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),

- impl->sync_tree());

+ impl->sync_tree()->SetOpacityMutated(root->element_id(), 0.75f);

PostSetNeedsCommitToMainThread();

break;

case 1:

@@ -1248,8 +1242,7 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {

break;

case 2:

EXPECT_EQ(node->opacity, 0.75f);

- effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),

- impl->sync_tree());

+ impl->sync_tree()->SetOpacityMutated(root->element_id(), 0.75f);

PostSetNeedsCommitToMainThread();

break;

case 3:

@@ -1258,8 +1251,8 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {

break;

case 4:

EXPECT_EQ(node->opacity, 0.25f);

- impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(

- brightness_filter_, root->effect_tree_index(), impl->sync_tree());

+ impl->sync_tree()->SetFilterMutated(root->element_id(),

+ brightness_filter_);

PostSetNeedsCommitToMainThread();

break;

case 5:

@@ -1268,8 +1261,8 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {

break;

case 6:

EXPECT_EQ(node->filters, brightness_filter_);

- impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(

- brightness_filter_, root->effect_tree_index(), impl->sync_tree());

+ impl->sync_tree()->SetFilterMutated(root->element_id(),

+ brightness_filter_);

PostSetNeedsCommitToMainThread();

break;

case 7:

@@ -1331,16 +1324,17 @@ class LayerTreeHostTestTransformTreeSync : public LayerTreeHostTest {

void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {

TransformTree& transform_tree =

impl->sync_tree()->property_trees()->transform_tree;

- TransformNode* node = transform_tree.Node(

- impl->sync_tree()->root_layer_for_testing()->transform_tree_index());

+ const LayerImpl* root_layer = impl->sync_tree()->root_layer_for_testing();

+ const TransformNode* node =

+ transform_tree.FindNodeFromOwningLayerId(root_layer->id());

pdr. 2017/03/27 21:21:27 Do we need to add an owning layer id dependency he

weiliangc 2017/03/28 20:21:28 Done.

gfx::Transform rotate10;

rotate10.Rotate(10.f);

gfx::Transform rotate20;

rotate20.Rotate(20.f);

switch (impl->sync_tree()->source_frame_number()) {

case 0:

- impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(

- rotate20, node->id, impl->sync_tree());

+ impl->sync_tree()->SetTransformMutated(root_layer->element_id(),

+ rotate20);

PostSetNeedsCommitToMainThread();

break;

case 1:

@@ -1349,8 +1343,8 @@ class LayerTreeHostTestTransformTreeSync : public LayerTreeHostTest {

break;

case 2:

EXPECT_EQ(node->local, rotate20);

- impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(

- rotate20, node->id, impl->sync_tree());

+ impl->sync_tree()->SetTransformMutated(root_layer->element_id(),

+ rotate20);

PostSetNeedsCommitToMainThread();

break;

case 3:

@@ -1434,8 +1428,7 @@ class LayerTreeHostTestTransformTreeDamageIsUpdated : public LayerTreeHostTest {

if (impl->active_tree()->source_frame_number() == 0) {

gfx::Transform scale;

scale.Scale(2.0, 2.0);

- impl->active_tree()->property_trees()->transform_tree.OnTransformAnimated(

- scale, child_->transform_tree_index(), impl->active_tree());

+ impl->active_tree()->SetTransformMutated(child_->element_id(), scale);

}

« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | cc/trees/layer_tree_impl.cc » ('J')