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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2716733007: cc: Rename LayerImpl::render_surface to GetRenderSurface (Closed)
Patch Set: Created 3 years, 10 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/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_damage.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index ac7202ffb181831c59254a9c4b02694e169d2fb6..e5f4583ee5986b2ebb5ecd698c891a3405e141bf 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -1065,29 +1065,29 @@ class LayerTreeHostTestSurfaceDamage : public LayerTreeHostTest {
LayerImpl* child_impl = impl->active_tree()->LayerById(child_->id());
switch (impl->active_tree()->source_frame_number()) {
case 0:
- EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
- EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+ EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+ EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
PostSetNeedsCommitToMainThread();
break;
case 1:
- EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
- EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+ EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+ EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
PostSetNeedsCommitToMainThread();
break;
case 2:
- EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
- EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+ EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+ EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
PostSetNeedsCommitToMainThread();
break;
case 3:
- EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
- EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+ EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+ EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
EndTest();
PostSetNeedsCommitToMainThread();
break;
case 4:
- EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
- EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+ EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+ EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
EndTest();
break;
}
@@ -1518,13 +1518,13 @@ class LayerTreeHostTestSwitchMaskLayer : public LayerTreeHostTest {
index_++;
EXPECT_FALSE(impl->sync_tree()
->root_layer_for_testing()
- ->render_surface()
+ ->GetRenderSurface()
->MaskLayer());
break;
case 1:
EXPECT_TRUE(impl->sync_tree()
->root_layer_for_testing()
- ->render_surface()
+ ->GetRenderSurface()
->MaskLayer());
EndTest();
break;
@@ -2615,12 +2615,13 @@ class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers
// Both layers should be drawing into the root render surface.
ASSERT_EQ(1u, render_surface_layer_list.size());
- ASSERT_EQ(root->render_surface(),
- render_surface_layer_list[0]->render_surface());
- ASSERT_EQ(2u, root->render_surface()->layer_list().size());
+ ASSERT_EQ(root->GetRenderSurface(),
+ render_surface_layer_list[0]->GetRenderSurface());
+ ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
// The root render surface is the size of the viewport.
- EXPECT_EQ(gfx::Rect(0, 0, 60, 60), root->render_surface()->content_rect());
+ EXPECT_EQ(gfx::Rect(0, 0, 60, 60),
+ root->GetRenderSurface()->content_rect());
// The max tiling scale of the child should be scaled.
EXPECT_FLOAT_EQ(1.5f, child->MaximumTilingContentsScale());
@@ -5584,7 +5585,7 @@ class LayerTreeHostTestRenderSurfaceEffectTreeIndex : public LayerTreeHostTest {
LayerImpl* grand_child_impl =
host_impl->sync_tree()->LayerById(grand_child_->id());
EXPECT_EQ(grand_child_impl->effect_tree_index(),
- grand_child_impl->render_surface()->EffectTreeIndex());
+ grand_child_impl->GetRenderSurface()->EffectTreeIndex());
}
}
@@ -5598,12 +5599,12 @@ class LayerTreeHostTestRenderSurfaceEffectTreeIndex : public LayerTreeHostTest {
case 1:
case 2:
EXPECT_EQ(grand_child_impl->effect_tree_index(),
- grand_child_impl->render_surface()->EffectTreeIndex());
+ grand_child_impl->GetRenderSurface()->EffectTreeIndex());
PostSetNeedsCommitToMainThread();
break;
case 3:
EXPECT_EQ(grand_child_impl->effect_tree_index(),
- grand_child_impl->render_surface()->EffectTreeIndex());
+ grand_child_impl->GetRenderSurface()->EffectTreeIndex());
EndTest();
}
}
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_damage.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698