cc: Rename visible_content_rect and content stuff on quads.

mojo/converters/surfaces/tests/surface_unittest.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/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/command_buffer/common/mailbox.h"
@@ skipping 155 matching lines @@
   mojo_pass->id->index = 1u;
   mojo_pass->quads.push_back(mojo_texture_quad.Pass());
   SharedQuadStatePtr mojo_sqs = SharedQuadState::New();
   mojo_pass->shared_quad_states.push_back(mojo_sqs.Pass());
 
   scoped_ptr<cc::RenderPass> pass = mojo_pass.To<scoped_ptr<cc::RenderPass> >();
   EXPECT_FALSE(pass);
 }
 
 TEST(SurfaceLibTest, SharedQuadState) {
-  gfx::Transform content_to_target_transform;
-  content_to_target_transform.Scale3d(0.3f, 0.7f, 0.9f);
-  gfx::Size content_bounds(57, 39);
-  gfx::Rect visible_content_rect(3, 7, 28, 42);
+  gfx::Transform quad_to_target_transform;
+  quad_to_target_transform.Scale3d(0.3f, 0.7f, 0.9f);
+  gfx::Size quad_layer_bounds(57, 39);
+  gfx::Rect visible_quad_layer_rect(3, 7, 28, 42);
   gfx::Rect clip_rect(9, 12, 21, 31);
   bool is_clipped = true;
   float opacity = 0.65f;
   int sorting_context_id = 13;
   ::SkXfermode::Mode blend_mode = ::SkXfermode::kSrcOver_Mode;
   scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
-  sqs->SetAll(content_to_target_transform,
-              content_bounds,
-              visible_content_rect,
-              clip_rect,
-              is_clipped,
-              opacity,
-              blend_mode,
-              sorting_context_id);
+  sqs->SetAll(quad_to_target_transform, quad_layer_bounds,
+              visible_quad_layer_rect, clip_rect, is_clipped, opacity,
+              blend_mode, sorting_context_id);
 
   SharedQuadStatePtr mojo_sqs = SharedQuadState::From(*sqs);
   ASSERT_FALSE(mojo_sqs.is_null());
-  EXPECT_EQ(Transform::From(content_to_target_transform),
-            mojo_sqs->content_to_target_transform);
-  EXPECT_EQ(Size::From(content_bounds), mojo_sqs->content_bounds);
-  EXPECT_EQ(Rect::From(visible_content_rect), mojo_sqs->visible_content_rect);
+  EXPECT_EQ(Transform::From(quad_to_target_transform),
+            mojo_sqs->quad_to_target_transform);
+  EXPECT_EQ(Size::From(quad_layer_bounds), mojo_sqs->quad_layer_bounds);
+  EXPECT_EQ(Rect::From(visible_quad_layer_rect),
+            mojo_sqs->visible_quad_layer_rect);
   EXPECT_EQ(Rect::From(clip_rect), mojo_sqs->clip_rect);
   EXPECT_EQ(is_clipped, mojo_sqs->is_clipped);
   EXPECT_EQ(opacity, mojo_sqs->opacity);
   EXPECT_EQ(sorting_context_id, mojo_sqs->sorting_context_id);
 }
 
 TEST(SurfaceLibTest, RenderPass) {
   scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
   cc::RenderPassId pass_id(1, 6);
   gfx::Rect output_rect(4, 9, 13, 71);
   gfx::Rect damage_rect(9, 17, 41, 45);
   gfx::Transform transform_to_root_target;
   transform_to_root_target.SkewY(43.0);
   bool has_transparent_background = false;
   pass->SetAll(pass_id,
                output_rect,
                damage_rect,
                transform_to_root_target,
                has_transparent_background);
 
-  gfx::Transform content_to_target_transform;
-  content_to_target_transform.Scale3d(0.3f, 0.7f, 0.9f);
-  gfx::Size content_bounds(57, 39);
-  gfx::Rect visible_content_rect(3, 7, 28, 42);
+  gfx::Transform quad_to_target_transform;
+  quad_to_target_transform.Scale3d(0.3f, 0.7f, 0.9f);
+  gfx::Size quad_layer_bounds(57, 39);
+  gfx::Rect visible_quad_layer_rect(3, 7, 28, 42);
   gfx::Rect clip_rect(9, 12, 21, 31);
   bool is_clipped = true;
   float opacity = 0.65f;
   int sorting_context_id = 13;
   ::SkXfermode::Mode blend_mode = ::SkXfermode::kSrcOver_Mode;
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
-  sqs->SetAll(content_to_target_transform,
-              content_bounds,
-              visible_content_rect,
-              clip_rect,
-              is_clipped,
-              opacity,
-              blend_mode,
-              sorting_context_id);
+  sqs->SetAll(quad_to_target_transform, quad_layer_bounds,
+              visible_quad_layer_rect, clip_rect, is_clipped, opacity,
+              blend_mode, sorting_context_id);
 
   gfx::Rect rect(5, 7, 13, 19);
   gfx::Rect opaque_rect(rect);
   gfx::Rect visible_rect(9, 11, 5, 7);
   bool needs_blending = false;
 
   cc::SolidColorDrawQuad* color_quad =
       pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>();
   SkColor arbitrary_color = SK_ColorGREEN;
   bool force_anti_aliasing_off = true;
@@ skipping 49 matching lines @@
             round_trip_pass->transform_to_root_target);
   EXPECT_EQ(has_transparent_background,
             round_trip_pass->has_transparent_background);
   ASSERT_EQ(1u, round_trip_pass->shared_quad_state_list.size());
   ASSERT_EQ(3u, round_trip_pass->quad_list.size());
   EXPECT_EQ(round_trip_pass->shared_quad_state_list.front(),
             round_trip_pass->quad_list.front()->shared_quad_state);
 
   cc::SharedQuadState* round_trip_sqs =
       round_trip_pass->shared_quad_state_list.front();
-  EXPECT_EQ(content_to_target_transform,
-            round_trip_sqs->content_to_target_transform);
-  EXPECT_EQ(content_bounds, round_trip_sqs->content_bounds);
-  EXPECT_EQ(visible_content_rect, round_trip_sqs->visible_content_rect);
+  EXPECT_EQ(quad_to_target_transform, round_trip_sqs->quad_to_target_transform);
+  EXPECT_EQ(quad_layer_bounds, round_trip_sqs->quad_layer_bounds);
+  EXPECT_EQ(visible_quad_layer_rect, round_trip_sqs->visible_quad_layer_rect);
   EXPECT_EQ(clip_rect, round_trip_sqs->clip_rect);
   EXPECT_EQ(is_clipped, round_trip_sqs->is_clipped);
   EXPECT_EQ(opacity, round_trip_sqs->opacity);
   EXPECT_EQ(sorting_context_id, round_trip_sqs->sorting_context_id);
 
   cc::DrawQuad* round_trip_quad = round_trip_pass->quad_list.front();
   // First is solid color quad.
   ASSERT_EQ(cc::DrawQuad::SOLID_COLOR, round_trip_quad->material);
   EXPECT_EQ(rect, round_trip_quad->rect);
   EXPECT_EQ(opaque_rect, round_trip_quad->opaque_rect);
@@ skipping 126 matching lines @@
   cc::ReturnedResource round_trip_resource =
       mojo_resource.To<cc::ReturnedResource>();
   EXPECT_EQ(id, round_trip_resource.id);
   EXPECT_EQ(sync_point, round_trip_resource.sync_point);
   EXPECT_EQ(count, round_trip_resource.count);
   EXPECT_EQ(lost, round_trip_resource.lost);
 }
 
 }  // namespace
 }  // namespace mojo