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

Unified Diff: cc/trees/layer_tree_host_unittest_occlusion.cc

Issue 1868003002: cc: Move RenderTarget Information to Effect Tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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_common_unittest.cc ('k') | cc/trees/layer_tree_impl.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_occlusion.cc
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc
index 9f35bd90bd390375dae6eae5a1f8a3c270158979..41d91da8152130e619b269ff2f8b57fdb2181f76 100644
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc
@@ -108,7 +108,8 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnSurface
// Verify the draw properties are valid.
EXPECT_TRUE(root->IsDrawnRenderSurfaceLayerListMember());
EXPECT_TRUE(child->IsDrawnRenderSurfaceLayerListMember());
- EXPECT_EQ(child, child->render_target());
+ EXPECT_TRUE(child->has_render_surface());
+ EXPECT_EQ(child->render_surface(), child->render_target());
EXPECT_OCCLUSION_EQ(
Occlusion(surface->draw_transform(), SimpleEnclosedRegion(),
@@ -172,7 +173,8 @@ class LayerTreeHostOcclusionTestDrawPropertiesOnMask
// Verify the draw properties are valid.
EXPECT_TRUE(root->IsDrawnRenderSurfaceLayerListMember());
EXPECT_TRUE(child->IsDrawnRenderSurfaceLayerListMember());
- EXPECT_EQ(child, child->render_target());
+ EXPECT_TRUE(child->has_render_surface());
+ EXPECT_EQ(child->render_surface(), child->render_target());
gfx::Transform transform = surface->draw_transform();
transform.PreconcatTransform(child->DrawTransform());
@@ -309,7 +311,8 @@ class LayerTreeHostOcclusionTestDrawPropertiesInsideReplica
// Verify the draw properties are valid.
EXPECT_TRUE(root->IsDrawnRenderSurfaceLayerListMember());
EXPECT_TRUE(child->IsDrawnRenderSurfaceLayerListMember());
- EXPECT_EQ(child, child->render_target());
+ EXPECT_TRUE(child->has_render_surface());
+ EXPECT_EQ(child->render_surface(), child->render_target());
// No occlusion from on child, which is part of the replica.
EXPECT_OCCLUSION_EQ(Occlusion(),
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698