cc: Implement UnionTraits for DrawQuads

cc/ipc/quads.mojom

Index: cc/ipc/quads.mojom
diff --git a/cc/ipc/quads.mojom b/cc/ipc/quads.mojom
index 772525891325f0c5383b46c25f3a047483a19508..b338e71e50aae8877279574343dface0b3fcb8ee 100644
--- a/cc/ipc/quads.mojom
+++ b/cc/ipc/quads.mojom
@@ -98,9 +98,7 @@ struct YUVVideoQuadState {
 };
 
 enum Material {
-  INVALID,
   DEBUG_BORDER,
-  PICTURE_CONTENT,
   RENDER_PASS,
   SOLID_COLOR,
   STREAM_VIDEO_CONTENT,
@@ -110,6 +108,17 @@ enum Material {
   YUV_VIDEO_CONTENT,
 };
 
+union DrawQuadState {
+  DebugBorderQuadState debug_border_quad_state;
+  RenderPassQuadState render_pass_quad_state;
+  SolidColorQuadState solid_color_quad_state;
+  SurfaceQuadState surface_quad_state;
+  TextureQuadState texture_quad_state;
+  TileQuadState tile_quad_state;
+  StreamVideoQuadState stream_video_quad_state;
+  YUVVideoQuadState yuv_video_quad_state;
+};
+
 struct DrawQuad {
   Material material;

[yzshen1, 2016/08/09 17:42:04]

Could we remove this enum entirely?

[Fady Samuel, 2016/08/09 18:23:09]

Done.

 
@@ -133,13 +142,5 @@ struct DrawQuad {
   // quads.
   SharedQuadState? sqs;
 
-  // Only one of the following will be set, depending on the material.
-  DebugBorderQuadState? debug_border_quad_state;
-  RenderPassQuadState? render_pass_quad_state;
-  SolidColorQuadState? solid_color_quad_state;
-  SurfaceQuadState? surface_quad_state;
-  TextureQuadState? texture_quad_state;
-  TileQuadState? tile_quad_state;
-  StreamVideoQuadState? stream_video_quad_state;
-  YUVVideoQuadState? yuv_video_quad_state;
+  DrawQuadState draw_quad_state;
 };