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

Side by Side Diff: cc/layers/layer_unittest.cc

Issue 1922393002: CC Animation: Unify ElementId in Blink Compositor Worker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@player
Patch Set: Remove NextElementId. Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/trees/element_id.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/layer.h" 5 #include "cc/layers/layer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "cc/animation/animation_host.h" 10 #include "cc/animation/animation_host.h"
(...skipping 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2484 LayerImpl::Create(host_impl_.active_tree(), 1); 2484 LayerImpl::Create(host_impl_.active_tree(), 1);
2485 2485
2486 EXPECT_SET_NEEDS_FULL_TREE_SYNC(1, 2486 EXPECT_SET_NEEDS_FULL_TREE_SYNC(1,
2487 layer_tree_host_->SetRootLayer(test_layer)); 2487 layer_tree_host_->SetRootLayer(test_layer));
2488 2488
2489 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(2); 2489 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(2);
2490 2490
2491 test_layer->SetElementId(2); 2491 test_layer->SetElementId(2);
2492 test_layer->SetMutableProperties(MutableProperty::kTransform); 2492 test_layer->SetMutableProperties(MutableProperty::kTransform);
2493 2493
2494 EXPECT_EQ(0lu, impl_layer->element_id()); 2494 EXPECT_EQ(0, impl_layer->element_id());
2495 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); 2495 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties());
2496 2496
2497 test_layer->PushPropertiesTo(impl_layer.get()); 2497 test_layer->PushPropertiesTo(impl_layer.get());
2498 2498
2499 EXPECT_EQ(2lu, impl_layer->element_id()); 2499 EXPECT_EQ(2, impl_layer->element_id());
2500 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); 2500 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
2501 } 2501 }
2502 2502
2503 } // namespace 2503 } // namespace
2504 } // namespace cc 2504 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/trees/element_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698