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

Unified Diff: cc/layers/layer_unittest.cc

Issue 2118993002: Detemplatize cc property nodes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 6f9dfbfefb38bc8bc0a85236e23949dde5561f37..8fe964304169ad1eaa6325c9ddb94ea5ebb9d7d2 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -30,6 +30,7 @@
#include "cc/test/test_task_graph_runner.h"
#include "cc/trees/layer_tree_host.h"
#include "cc/trees/single_thread_proxy.h"
+#include "cc/trees/transform_node.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -1138,41 +1139,41 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
root->SetPosition(arbitrary_point_f);
TransformNode* node = layer_tree_host_->property_trees()->transform_tree.Node(
root->transform_tree_index());
- EXPECT_TRUE(node->data.transform_changed);
+ EXPECT_TRUE(node->transform_changed);
EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET(
root->PushPropertiesTo(root_impl.get());
child->PushPropertiesTo(child_impl.get());
child2->PushPropertiesTo(child2_impl.get());
grand_child->PushPropertiesTo(grand_child_impl.get());
layer_tree_host_->property_trees()->ResetAllChangeTracking());
- EXPECT_FALSE(node->data.transform_changed);
+ EXPECT_FALSE(node->transform_changed);
EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1);
child->SetPosition(arbitrary_point_f);
node = layer_tree_host_->property_trees()->transform_tree.Node(
child->transform_tree_index());
- EXPECT_TRUE(node->data.transform_changed);
+ EXPECT_TRUE(node->transform_changed);
// child2 is not in the subtree of child, but its scroll parent is. So, its
// to_screen will be effected by change in position of child2.
layer_tree_host_->property_trees()->transform_tree.UpdateTransforms(
child2->transform_tree_index());
node = layer_tree_host_->property_trees()->transform_tree.Node(
child2->transform_tree_index());
- EXPECT_TRUE(node->data.transform_changed);
+ EXPECT_TRUE(node->transform_changed);
EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET(
child->PushPropertiesTo(child_impl.get());
grand_child->PushPropertiesTo(grand_child_impl.get());
layer_tree_host_->property_trees()->ResetAllChangeTracking());
node = layer_tree_host_->property_trees()->transform_tree.Node(
child->transform_tree_index());
- EXPECT_FALSE(node->data.transform_changed);
+ EXPECT_FALSE(node->transform_changed);
gfx::Point3F arbitrary_point_3f = gfx::Point3F(0.125f, 0.25f, 0.f);
EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1);
root->SetTransformOrigin(arbitrary_point_3f);
node = layer_tree_host_->property_trees()->transform_tree.Node(
root->transform_tree_index());
- EXPECT_TRUE(node->data.transform_changed);
+ EXPECT_TRUE(node->transform_changed);
EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET(
root->PushPropertiesTo(root_impl.get());
child->PushPropertiesTo(child_impl.get());
@@ -1186,7 +1187,7 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
root->SetTransform(arbitrary_transform);
node = layer_tree_host_->property_trees()->transform_tree.Node(
root->transform_tree_index());
- EXPECT_TRUE(node->data.transform_changed);
+ EXPECT_TRUE(node->transform_changed);
}
TEST_F(LayerTest, AddAndRemoveChild) {
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/layer_utils.cc » ('j') | ui/gfx/transform.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698