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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_position_constraint_unittest.cc

Issue 2857343002: Delete LayerImpl::GetRenderSurface. (Closed)
Patch Set: none Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_position_constraint_unittest.cc
diff --git a/cc/layers/layer_position_constraint_unittest.cc b/cc/layers/layer_position_constraint_unittest.cc
index 1afc4554cf0c29fca8eaa4bfa3178743e580d3cb..19e04f157e935abfd83b5d0fe1eb40c3f3176ae7 100644
--- a/cc/layers/layer_position_constraint_unittest.cc
+++ b/cc/layers/layer_position_constraint_unittest.cc
@@ -12,6 +12,7 @@
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_proxy.h"
#include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
#include "cc/test/test_task_graph_runner.h"
#include "cc/trees/layer_tree_host_common.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -451,12 +452,12 @@ TEST_F(LayerPositionConstraintTest,
gfx::Transform expected_grand_child_transform;
gfx::Transform expected_great_grand_child_transform;
expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
@@ -488,12 +489,12 @@ TEST_F(LayerPositionConstraintTest,
expected_great_grand_child_transform.Translate(10.0, 30.0);
expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
@@ -597,18 +598,18 @@ TEST_F(LayerPositionConstraintTest,
gfx::Transform expected_fixed_position_child_transform;
expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
- EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+ EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_grand_child_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_great_grand_child_surface_draw_transform,
- great_grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(great_grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
great_grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -637,18 +638,18 @@ TEST_F(LayerPositionConstraintTest,
expected_fixed_position_child_transform.Translate(10.0, 30.0);
expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
- EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+ EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_grand_child_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_great_grand_child_surface_draw_transform,
- great_grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(great_grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
great_grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -761,18 +762,18 @@ TEST_F(
gfx::Transform expected_fixed_position_child_transform;
expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
- EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+ EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_grand_child_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_great_grand_child_surface_draw_transform,
- great_grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(great_grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
great_grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -806,18 +807,18 @@ TEST_F(
expected_fixed_position_child_transform.Translate(10.0, 30.0);
expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
- EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
- EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+ EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_grand_child_surface_draw_transform,
- grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_great_grand_child_surface_draw_transform,
- great_grand_child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(great_grand_child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
great_grand_child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -844,10 +845,10 @@ TEST_F(LayerPositionConstraintTest,
gfx::Transform expected_surface_draw_transform;
gfx::Transform expected_child_transform;
gfx::Transform expected_grand_child_transform;
- EXPECT_TRUE(child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_surface_draw_transform,
- child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
@@ -865,10 +866,10 @@ TEST_F(LayerPositionConstraintTest,
expected_grand_child_transform.MakeIdentity();
expected_grand_child_transform.Translate(10.0, 10.0);
- EXPECT_TRUE(child_impl_->GetRenderSurface());
+ EXPECT_TRUE(GetRenderSurface(child_impl_));
EXPECT_TRANSFORMATION_MATRIX_EQ(
expected_surface_draw_transform,
- child_impl_->GetRenderSurface()->draw_transform());
+ GetRenderSurface(child_impl_)->draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
child_impl_->DrawTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698