chromium/src
0
Fork 0
Code Activity

cc: Make FixedPositionWithInterveningRenderSurface use property trees

Browse Source 
Previously it was looking at draw_transform which doesn't get filled in
on the main thread by property trees.

Once main thread CDP is removed, Layer::draw_transform can do this work,
and this can be reverted.

R=weiliangc@chromium.org
BUG=502041
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1295203002

Cr-Commit-Position: refs/heads/master@{#343802}
This commit is contained in:
enne
2015-08-17 22:10:15 -07:00
committed by Commit bot
parent ee4c0b0c53
commit f6903539e8
1 changed files with 9 additions and 4 deletions

13
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) {