Index: cc/test/layer_test_common.cc |
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc |
index 2bedaf8ad7385867976ab214f822c7bfdad8d18e..e992c438bae342bc3f91a56f2e36a387098ef160 100644 |
--- a/cc/test/layer_test_common.cc |
+++ b/cc/test/layer_test_common.cc |
@@ -42,7 +42,7 @@ void LayerTestCommon::VerifyQuadsExactlyCoverRect(const QuadList& quads, |
for (auto iter = quads.cbegin(); iter != quads.cend(); ++iter) { |
gfx::RectF quad_rectf = MathUtil::MapClippedRect( |
- iter->shared_quad_state->content_to_target_transform, |
+ iter->shared_quad_state->quad_to_target_transform, |
gfx::RectF(iter->rect)); |
// Before testing for exact coverage in the integer world, assert that |
@@ -70,29 +70,27 @@ void LayerTestCommon::VerifyQuadsAreOccluded(const QuadList& quads, |
// No quad should exist if it's fully occluded. |
for (const auto& quad : quads) { |
gfx::Rect target_visible_rect = MathUtil::MapEnclosingClippedRect( |
- quad->shared_quad_state->content_to_target_transform, |
- quad->visible_rect); |
+ quad->shared_quad_state->quad_to_target_transform, quad->visible_rect); |
EXPECT_FALSE(occluded.Contains(target_visible_rect)); |
} |
// Quads that are fully occluded on one axis only should be shrunken. |
for (const auto& quad : quads) { |
gfx::Rect target_rect = MathUtil::MapEnclosingClippedRect( |
- quad->shared_quad_state->content_to_target_transform, quad->rect); |
- if (!quad->shared_quad_state->content_to_target_transform |
+ quad->shared_quad_state->quad_to_target_transform, quad->rect); |
+ if (!quad->shared_quad_state->quad_to_target_transform |
.IsIdentityOrIntegerTranslation()) { |
- DCHECK(quad->shared_quad_state->content_to_target_transform |
+ DCHECK(quad->shared_quad_state->quad_to_target_transform |
.IsPositiveScaleOrTranslation()) |
- << quad->shared_quad_state->content_to_target_transform.ToString(); |
+ << quad->shared_quad_state->quad_to_target_transform.ToString(); |
gfx::RectF target_rectf = MathUtil::MapClippedRect( |
- quad->shared_quad_state->content_to_target_transform, quad->rect); |
+ quad->shared_quad_state->quad_to_target_transform, quad->rect); |
// Scale transforms allowed, as long as the final transformed rect |
// ends up on integer boundaries for ease of testing. |
DCHECK_EQ(target_rectf.ToString(), gfx::RectF(target_rect).ToString()); |
} |
gfx::Rect target_visible_rect = MathUtil::MapEnclosingClippedRect( |
- quad->shared_quad_state->content_to_target_transform, |
- quad->visible_rect); |
+ quad->shared_quad_state->quad_to_target_transform, quad->visible_rect); |
bool fully_occluded_horizontal = target_rect.x() >= occluded.x() && |
target_rect.right() <= occluded.right(); |