cc: Make FixedPositionWithInterveningRenderSurface use property trees

cc/trees/layer_tree_host_common_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_common.h"
 
 #include <algorithm>
 #include <set>
 
 #include "cc/animation/keyframed_animation_curve.h"
@@ skipping 13 matching lines @@
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
@@ skipping 5676 matching lines @@
                                gfx::PointF(10.f, 15.f), gfx::Size(50, 50), true,
                                false);
   SetLayerPropertiesForTesting(child.get(), gfx::Transform(), gfx::Point3F(),
                                gfx::PointF(1.f, 2.f), gfx::Size(50, 50), true,
                                false);
 
   host()->SetRootLayer(root);
 
   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) {
   // This test verifies that a scrolling layer that gets snapped to
   // integer coordinates doesn't move a fixed position child.
   //
   // + root
   //   + container
   //     + scroller
   //       + fixed
@@ skipping 2145 matching lines @@
                                gfx::PointF(), gfx::Size(30, 30), true, false,
                                false);
 
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(test_layer->clip_rect(), gfx::RectF(-4, -4, 30, 30));
 }
 
 }  // namespace
 }  // namespace cc