Add gpu::MailboxHolder to hold state for a gpu::Mailbox

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 171 matching lines @@
   void Compare(const YUVVideoDrawQuad* a, const YUVVideoDrawQuad* b) {
     EXPECT_EQ(a->tex_scale, b->tex_scale);
     EXPECT_EQ(a->y_plane_resource_id, b->y_plane_resource_id);
     EXPECT_EQ(a->u_plane_resource_id, b->u_plane_resource_id);
     EXPECT_EQ(a->v_plane_resource_id, b->v_plane_resource_id);
     EXPECT_EQ(a->a_plane_resource_id, b->a_plane_resource_id);
   }
 
   void Compare(const TransferableResource& a, const TransferableResource& b) {
     EXPECT_EQ(a.id, b.id);
-    EXPECT_EQ(a.sync_point, b.sync_point);
     EXPECT_EQ(a.format, b.format);
-    EXPECT_EQ(a.target, b.target);
     EXPECT_EQ(a.filter, b.filter);
     EXPECT_EQ(a.size.ToString(), b.size.ToString());
-    for (size_t i = 0; i < arraysize(a.mailbox.name); ++i)
-      EXPECT_EQ(a.mailbox.name[i], b.mailbox.name[i]);
+    for (size_t i = 0; i < arraysize(a.mailbox_holder.mailbox.name); ++i) {
+      EXPECT_EQ(a.mailbox_holder.mailbox.name[i],
+                b.mailbox_holder.mailbox.name[i]);
+    }
+    EXPECT_EQ(a.mailbox_holder.texture_target, b.mailbox_holder.texture_target);
+    EXPECT_EQ(a.mailbox_holder.sync_point, b.mailbox_holder.sync_point);
   }
 };
 
 TEST_F(CCMessagesTest, AllQuads) {
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
 
   Transform arbitrary_matrix;
   arbitrary_matrix.Scale(3, 3);
   arbitrary_matrix.Translate(-5, 20);
   arbitrary_matrix.Rotate(15);
@@ skipping 417 matching lines @@
 
   GLbyte arbitrary_mailbox2[64] = {
     0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 2, 4, 6, 8, 0,
     0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 2, 4, 6, 8, 0,
     0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9, 7, 5, 3, 1, 2, 4, 6, 8, 0,
     0, 9, 8, 7
   };
 
   TransferableResource arbitrary_resource1;
   arbitrary_resource1.id = 2178312;
-  arbitrary_resource1.sync_point = arbitrary_uint1;
   arbitrary_resource1.format = cc::RGBA_8888;
-  arbitrary_resource1.target = GL_TEXTURE_2D;
   arbitrary_resource1.filter = 53;
   arbitrary_resource1.size = gfx::Size(37189, 123123);
-  arbitrary_resource1.mailbox.SetName(arbitrary_mailbox1);
+  arbitrary_resource1.mailbox_holder.mailbox.SetName(arbitrary_mailbox1);
+  arbitrary_resource1.mailbox_holder.texture_target = GL_TEXTURE_2D;
+  arbitrary_resource1.mailbox_holder.sync_point = arbitrary_uint1;
 
   TransferableResource arbitrary_resource2;
   arbitrary_resource2.id = 789132;
-  arbitrary_resource2.sync_point = arbitrary_uint2;
   arbitrary_resource2.format = cc::RGBA_4444;
-  arbitrary_resource2.target = GL_TEXTURE_EXTERNAL_OES;
   arbitrary_resource2.filter = 47;
   arbitrary_resource2.size = gfx::Size(89123, 23789);
-  arbitrary_resource2.mailbox.SetName(arbitrary_mailbox2);
+  arbitrary_resource2.mailbox_holder.mailbox.SetName(arbitrary_mailbox2);
+  arbitrary_resource2.mailbox_holder.texture_target = GL_TEXTURE_EXTERNAL_OES;
+  arbitrary_resource2.mailbox_holder.sync_point = arbitrary_uint2;
 
   scoped_ptr<RenderPass> renderpass_in = RenderPass::Create();
   renderpass_in->SetNew(
       RenderPass::Id(1, 1), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
   DelegatedFrameData frame_in;
   frame_in.resource_list.push_back(arbitrary_resource1);
   frame_in.resource_list.push_back(arbitrary_resource2);
   frame_in.render_pass_list.push_back(renderpass_in.Pass());
 
@@ skipping 53 matching lines @@
   }
 
   // Verify the largest DrawQuad type is RenderPassDrawQuad. If this ever
   // changes, then the ReserveSizeForRenderPassWrite() method needs to be
   // updated as well to use the new largest quad.
   EXPECT_EQ(sizeof(RenderPassDrawQuad), largest);
 }
 
 }  // namespace
 }  // namespace content