cc: Rename visible_content_rect and content stuff on quads.

cc/test/layer_test_common.cc

 // Copyright 2012 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/test/layer_test_common.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
@@ skipping 24 matching lines @@
 
   return false;
 }
 
 void LayerTestCommon::VerifyQuadsExactlyCoverRect(const QuadList& quads,
                                                   const gfx::Rect& rect) {
   Region remaining = rect;
 
   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
     // rounding will not round the rect incorrectly.
     ASSERT_TRUE(CanRectFBeSafelyRoundedToRect(quad_rectf));
 
     gfx::Rect quad_rect = gfx::ToEnclosingRect(quad_rectf);
 
     EXPECT_TRUE(rect.Contains(quad_rect)) << quad_string << iter.index()
                                           << " rect: " << rect.ToString()
                                           << " quad: " << quad_rect.ToString();
     EXPECT_TRUE(remaining.Contains(quad_rect))
         << quad_string << iter.index() << " remaining: " << remaining.ToString()
         << " quad: " << quad_rect.ToString();
     remaining.Subtract(quad_rect);
   }
 
   EXPECT_TRUE(remaining.IsEmpty());
 }
 
 // static
 void LayerTestCommon::VerifyQuadsAreOccluded(const QuadList& quads,
                                              const gfx::Rect& occluded,
                                              size_t* partially_occluded_count) {
   // 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();
     bool fully_occluded_vertical = target_rect.y() >= occluded.y() &&
                                    target_rect.bottom() <= occluded.bottom();
     bool should_be_occluded =
         target_rect.Intersects(occluded) &&
         (fully_occluded_vertical || fully_occluded_horizontal);
     if (!should_be_occluded) {
       EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString());
@@ skipping 71 matching lines @@
   render_pass_->shared_quad_state_list.clear();
 
   surface_impl->AppendQuads(
       render_pass_.get(), gfx::Transform(),
       Occlusion(gfx::Transform(), SimpleEnclosedRegion(occluded),
                 SimpleEnclosedRegion()),
       SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1));
 }
 
 }  // namespace cc