cc: Rename visible_content_rect and content stuff on quads.

content/common/cc_messages_unittest.cc

 // Copyright (c) 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 "content/common/cc_messages.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 39 matching lines @@
  protected:
   void Compare(const RenderPass* a, const RenderPass* b) {
     EXPECT_EQ(a->id, b->id);
     EXPECT_EQ(a->output_rect.ToString(), b->output_rect.ToString());
     EXPECT_EQ(a->damage_rect.ToString(), b->damage_rect.ToString());
     EXPECT_EQ(a->transform_to_root_target, b->transform_to_root_target);
     EXPECT_EQ(a->has_transparent_background, b->has_transparent_background);
   }
 
   void Compare(const SharedQuadState* a, const SharedQuadState* b) {
-    EXPECT_EQ(a->content_to_target_transform, b->content_to_target_transform);
-    EXPECT_EQ(a->content_bounds, b->content_bounds);
-    EXPECT_EQ(a->visible_content_rect, b->visible_content_rect);
+    EXPECT_EQ(a->quad_to_target_transform, b->quad_to_target_transform);
+    EXPECT_EQ(a->quad_layer_bounds, b->quad_layer_bounds);
+    EXPECT_EQ(a->visible_quad_layer_rect, b->visible_quad_layer_rect);
     EXPECT_EQ(a->clip_rect, b->clip_rect);
     EXPECT_EQ(a->is_clipped, b->is_clipped);
     EXPECT_EQ(a->opacity, b->opacity);
     EXPECT_EQ(a->blend_mode, b->blend_mode);
     EXPECT_EQ(a->sorting_context_id, b->sorting_context_id);
   }
 
   void Compare(const DrawQuad* a, const DrawQuad* b) {
     ASSERT_NE(DrawQuad::INVALID, a->material);
     ASSERT_EQ(a->material, b->material);
@@ skipping 547 matching lines @@
       IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out));
 
   scoped_ptr<RenderPass> pass_out =
       frame_out.render_pass_list.take(frame_out.render_pass_list.begin());
 
   // 2 SharedQuadStates come out. The first and fourth SharedQuadStates were
   // used by quads, and so serialized. Others were not.
   ASSERT_EQ(2u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(2u, pass_out->quad_list.size());
 
-  EXPECT_EQ(
-      gfx::Size(1, 1).ToString(),
-      pass_out->shared_quad_state_list.ElementAt(0)->content_bounds.ToString());
-  EXPECT_EQ(
-      gfx::Size(4, 4).ToString(),
-      pass_out->shared_quad_state_list.ElementAt(1)->content_bounds.ToString());
+  EXPECT_EQ(gfx::Size(1, 1).ToString(),
+            pass_out->shared_quad_state_list.ElementAt(0)
+                ->quad_layer_bounds.ToString());
+  EXPECT_EQ(gfx::Size(4, 4).ToString(),
+            pass_out->shared_quad_state_list.ElementAt(1)
+                ->quad_layer_bounds.ToString());
 }
 
 TEST_F(CCMessagesTest, Resources) {
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   gfx::Size arbitrary_size(757, 1281);
   unsigned int arbitrary_uint1 = 71234838;
   unsigned int arbitrary_uint2 = 53589793;
 
   GLbyte arbitrary_mailbox1[GL_MAILBOX_SIZE_CHROMIUM] = {
       1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2,
@@ skipping 106 matching lines @@
     SoftwareFrameData frame_out;
     base::PickleIterator iter(msg);
     EXPECT_EQ(
         expect_read,
         IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   }
 }
 
 }  // namespace
 }  // namespace content