cc: Rename visible_content_rect and content stuff on quads.

cc/surfaces/surface_aggregator_test_helpers.cc

 // Copyright 2014 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/surfaces/surface_aggregator_test_helpers.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/render_pass_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 
 namespace cc {
 namespace test {
 
 void AddTestSurfaceQuad(TestRenderPass* pass,
                         const gfx::Size& surface_size,
                         float opacity,
                         SurfaceId surface_id) {
-  gfx::Transform content_to_target_transform;
-  gfx::Size content_bounds = surface_size;
-  gfx::Rect visible_content_rect = gfx::Rect(surface_size);
+  gfx::Transform layer_to_target_transform;
+  gfx::Size layer_bounds = surface_size;
+  gfx::Rect visible_layer_rect = gfx::Rect(surface_size);
   gfx::Rect clip_rect = gfx::Rect(surface_size);
   bool is_clipped = false;
   SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode;
 
   SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState();
-  shared_quad_state->SetAll(content_to_target_transform,
-                            content_bounds,
-                            visible_content_rect,
-                            clip_rect,
-                            is_clipped,
-                            opacity,
-                            blend_mode,
-                            0);
+  shared_quad_state->SetAll(layer_to_target_transform, layer_bounds,
+                            visible_layer_rect, clip_rect, is_clipped, opacity,
+                            blend_mode, 0);
 
   SurfaceDrawQuad* surface_quad =
       pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   gfx::Rect quad_rect = gfx::Rect(surface_size);
   surface_quad->SetNew(pass->shared_quad_state_list.back(),
                        gfx::Rect(surface_size),
                        gfx::Rect(surface_size),
                        surface_id);
 }
 void AddTestRenderPassQuad(TestRenderPass* pass, RenderPassId render_pass_id) {
@@ skipping 94 matching lines @@
 
   for (size_t i = 0; i < passes->size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("Pass number %" PRIuS, i));
     RenderPass* pass = passes->at(i);
     TestPassMatchesExpectations(expected_passes[i], pass);
   }
 }
 
 }  // namespace test
 }  // namespace cc