Implement RenderPassId StructTrait

components/mus/public/cpp/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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "cc/quads/debug_border_draw_quad.h"
@@ skipping 17 matching lines @@
 using mus::mojom::CompositorFrame;
 using mus::mojom::CompositorFramePtr;
 using mus::mojom::CompositorFrameMetadata;
 using mus::mojom::CompositorFrameMetadataPtr;
 using mus::mojom::DebugBorderQuadState;
 using mus::mojom::DebugBorderQuadStatePtr;
 using mus::mojom::Pass;
 using mus::mojom::PassPtr;
 using mus::mojom::Quad;
 using mus::mojom::QuadPtr;
-using mus::mojom::RenderPassId;
-using mus::mojom::RenderPassIdPtr;
 using mus::mojom::RenderPassQuadState;
 using mus::mojom::RenderPassQuadStatePtr;
 using mus::mojom::ResourceFormat;
 using mus::mojom::ReturnedResource;
 using mus::mojom::ReturnedResourcePtr;
 using mus::mojom::SharedQuadState;
 using mus::mojom::SharedQuadStatePtr;
 using mus::mojom::SolidColorQuadState;
 using mus::mojom::SolidColorQuadStatePtr;
 using mus::mojom::SurfaceQuadState;
@@ skipping 116 matching lines @@
   EXPECT_EQ(secure_output_only, mus_texture_state->secure_output_only);
 }
 
 TEST_F(SurfaceLibQuadTest, TextureQuadEmptyVertexOpacity) {
   QuadPtr mus_texture_quad = Quad::New();
   mus_texture_quad->material = mus::mojom::Material::TEXTURE_CONTENT;
   TextureQuadStatePtr mus_texture_state = TextureQuadState::New();
   mus_texture_state->background_color = Color::New();
   mus_texture_quad->texture_quad_state = std::move(mus_texture_state);
   PassPtr mus_pass = Pass::New();
-  mus_pass->id = RenderPassId::New();
-  mus_pass->id->layer_id = 1;
-  mus_pass->id->index = 1u;
+  mus_pass->id.layer_id = 1;
+  mus_pass->id.index = 1u;
   mus_pass->quads.push_back(std::move(mus_texture_quad));
   SharedQuadStatePtr mus_sqs = SharedQuadState::New();
   mus_pass->shared_quad_states.push_back(std::move(mus_sqs));
 
   std::unique_ptr<cc::RenderPass> pass =
       mus_pass.To<std::unique_ptr<cc::RenderPass>>();
 
   EXPECT_FALSE(pass);
 }
 
 TEST_F(SurfaceLibQuadTest, TextureQuadEmptyBackgroundColor) {
   QuadPtr mus_texture_quad = Quad::New();
   mus_texture_quad->material = mus::mojom::Material::TEXTURE_CONTENT;
   TextureQuadStatePtr mus_texture_state = TextureQuadState::New();
   mus_texture_state->vertex_opacity = mojo::Array<float>::New(4);
   mus_texture_quad->texture_quad_state = std::move(mus_texture_state);
   PassPtr mus_pass = Pass::New();
-  mus_pass->id = RenderPassId::New();
-  mus_pass->id->layer_id = 1;
-  mus_pass->id->index = 1u;
+  mus_pass->id.layer_id = 1;
+  mus_pass->id.index = 1u;
   mus_pass->quads.push_back(std::move(mus_texture_quad));
   SharedQuadStatePtr mus_sqs = SharedQuadState::New();
   mus_pass->shared_quad_states.push_back(std::move(mus_sqs));
 
   std::unique_ptr<cc::RenderPass> pass =
       mus_pass.To<std::unique_ptr<cc::RenderPass>>();
   EXPECT_FALSE(pass);
 }
 
 TEST(SurfaceLibTest, SharedQuadState) {
@@ skipping 88 matching lines @@
   bool nearest_neighbor = false;
   bool secure_output_only = false;
   texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
                        resource_id, gfx::Size(), premultiplied_alpha,
                        uv_top_left, uv_bottom_right, background_color,
                        vertex_opacity, y_flipped, nearest_neighbor,
                        secure_output_only);
 
   PassPtr mus_pass = Pass::From(*pass);
   ASSERT_FALSE(mus_pass.is_null());
-  EXPECT_EQ(6u, mus_pass->id->index);
+  EXPECT_EQ(6u, mus_pass->id.index);
   EXPECT_TRUE(Rect::From(output_rect).Equals(mus_pass->output_rect));
   EXPECT_TRUE(Rect::From(damage_rect).Equals(mus_pass->damage_rect));
   EXPECT_TRUE(Transform::From(transform_to_root_target)
                   .Equals(mus_pass->transform_to_root_target));
   EXPECT_EQ(has_transparent_background, mus_pass->has_transparent_background);
   ASSERT_EQ(1u, mus_pass->shared_quad_states.size());
   ASSERT_EQ(3u, mus_pass->quads.size());
   EXPECT_EQ(0u, mus_pass->quads[0]->shared_quad_state_index);
 
   std::unique_ptr<cc::RenderPass> round_trip_pass =
@@ skipping 144 matching lines @@
   ASSERT_TRUE(mus_quad->debug_border_quad_state);
   DebugBorderQuadStatePtr& mus_debug_border_state =
       mus_quad->debug_border_quad_state;
   EXPECT_TRUE(
       Color::From(arbitrary_color).Equals(mus_debug_border_state->color));
   EXPECT_EQ(width, mus_debug_border_state->width);
 }
 
 }  // namespace
 }  // namespace mojo