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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1295203002: cc: Make FixedPositionWithInterveningRenderSurface use property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | no next file » | 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 309348d11318b8b0eceadf2a2789c44683c42fd4..e1794b594bac1edd8ab59a1aa452bba336c85f7e 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -31,6 +31,7 @@
#include "cc/test/geometry_test_utils.h"
#include "cc/test/layer_tree_host_common_test.h"
#include "cc/test/test_task_graph_runner.h"
+#include "cc/trees/draw_property_utils.h"
#include "cc/trees/layer_tree_impl.h"
#include "cc/trees/proxy.h"
#include "cc/trees/single_thread_proxy.h"
@@ -5727,23 +5728,27 @@ TEST_F(LayerTreeHostCommonTest, FixedPositionWithInterveningRenderSurface) {
ExecuteCalculateDrawProperties(root.get());
+ TransformTree& tree = host()->property_trees()->transform_tree;
+
gfx::Transform expected_fixed_draw_transform;
expected_fixed_draw_transform.Translate(10.f, 15.f);
- EXPECT_EQ(expected_fixed_draw_transform, fixed->draw_transform());
+ EXPECT_EQ(expected_fixed_draw_transform,
+ DrawTransformFromPropertyTrees(fixed.get(), tree));
gfx::Transform expected_fixed_screen_space_transform;
expected_fixed_screen_space_transform.Translate(17.f, 24.f);
EXPECT_EQ(expected_fixed_screen_space_transform,
- fixed->screen_space_transform());
+ ScreenSpaceTransformFromPropertyTrees(fixed.get(), tree));
gfx::Transform expected_child_draw_transform;
expected_child_draw_transform.Translate(11.f, 17.f);
- EXPECT_EQ(expected_child_draw_transform, child->draw_transform());
+ EXPECT_EQ(expected_child_draw_transform,
+ DrawTransformFromPropertyTrees(child.get(), tree));
gfx::Transform expected_child_screen_space_transform;
expected_child_screen_space_transform.Translate(18.f, 26.f);
EXPECT_EQ(expected_child_screen_space_transform,
- child->screen_space_transform());
+ ScreenSpaceTransformFromPropertyTrees(child.get(), tree));
}
TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698