cc: Implement UnionTraits for DrawQuads

cc/ipc/quads_struct_traits.cc

 // Copyright 2016 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/ipc/quads_struct_traits.h"
 #include "ui/gfx/mojo/transform_struct_traits.h"
 
 namespace mojo {
 
 cc::DrawQuad* AllocateAndConstruct(cc::mojom::Material material,
                                    cc::QuadList* list) {
   cc::DrawQuad* quad = nullptr;
   switch (material) {
-    case cc::mojom::Material::INVALID:
-      return nullptr;
     case cc::mojom::Material::DEBUG_BORDER:
       quad = list->AllocateAndConstruct<cc::DebugBorderDrawQuad>();
       quad->material = cc::DrawQuad::DEBUG_BORDER;
       return quad;
-    case cc::mojom::Material::PICTURE_CONTENT:
-      quad = list->AllocateAndConstruct<cc::PictureDrawQuad>();
-      quad->material = cc::DrawQuad::PICTURE_CONTENT;
-      return quad;
     case cc::mojom::Material::RENDER_PASS:
       quad = list->AllocateAndConstruct<cc::RenderPassDrawQuad>();
       quad->material = cc::DrawQuad::RENDER_PASS;
       return quad;
     case cc::mojom::Material::SOLID_COLOR:
       quad = list->AllocateAndConstruct<cc::SolidColorDrawQuad>();
       quad->material = cc::DrawQuad::SOLID_COLOR;
       return quad;
     case cc::mojom::Material::STREAM_VIDEO_CONTENT:
       quad = list->AllocateAndConstruct<cc::StreamVideoDrawQuad>();
@@ skipping 35 matching lines @@
 }
 
 }  // namespace
 
 // static
 cc::mojom::Material
 EnumTraits<cc::mojom::Material, cc::DrawQuad::Material>::ToMojom(
     cc::DrawQuad::Material material) {
   switch (material) {
     case cc::DrawQuad::INVALID:
-      return cc::mojom::Material::INVALID;
+      break;
     case cc::DrawQuad::DEBUG_BORDER:
       return cc::mojom::Material::DEBUG_BORDER;
     case cc::DrawQuad::PICTURE_CONTENT:
-      return cc::mojom::Material::PICTURE_CONTENT;
+      break;
     case cc::DrawQuad::RENDER_PASS:
       return cc::mojom::Material::RENDER_PASS;
     case cc::DrawQuad::SOLID_COLOR:
       return cc::mojom::Material::SOLID_COLOR;
     case cc::DrawQuad::STREAM_VIDEO_CONTENT:
       return cc::mojom::Material::STREAM_VIDEO_CONTENT;
     case cc::DrawQuad::SURFACE_CONTENT:
       return cc::mojom::Material::SURFACE_CONTENT;
     case cc::DrawQuad::TEXTURE_CONTENT:
       return cc::mojom::Material::TEXTURE_CONTENT;
     case cc::DrawQuad::TILED_CONTENT:
       return cc::mojom::Material::TILED_CONTENT;
     case cc::DrawQuad::YUV_VIDEO_CONTENT:
       return cc::mojom::Material::YUV_VIDEO_CONTENT;
   }
-  return cc::mojom::Material::INVALID;
+  // We cannot serialize PictureDrawQuads or Invalid Quads.
+  NOTREACHED();
+  return cc::mojom::Material::DEBUG_BORDER;
 }
 
 // static
 bool EnumTraits<cc::mojom::Material, cc::DrawQuad::Material>::FromMojom(
     cc::mojom::Material input,
     cc::DrawQuad::Material* out) {
   switch (input) {
-    case cc::mojom::Material::INVALID:
-      *out = cc::DrawQuad::INVALID;
-      return true;
     case cc::mojom::Material::DEBUG_BORDER:
       *out = cc::DrawQuad::DEBUG_BORDER;
       return true;
-    case cc::mojom::Material::PICTURE_CONTENT:
-      *out = cc::DrawQuad::PICTURE_CONTENT;
-      return true;
     case cc::mojom::Material::RENDER_PASS:
       *out = cc::DrawQuad::RENDER_PASS;
       return true;
     case cc::mojom::Material::SOLID_COLOR:
       *out = cc::DrawQuad::SOLID_COLOR;
       return true;
     case cc::mojom::Material::STREAM_VIDEO_CONTENT:
       *out = cc::DrawQuad::STREAM_VIDEO_CONTENT;
       return true;
     case cc::mojom::Material::SURFACE_CONTENT:
@@ skipping 179 matching lines @@
   }
   return true;
 }
 
 // static
 bool StructTraits<cc::mojom::DrawQuad, cc::DrawQuad>::Read(
     cc::mojom::DrawQuadDataView data,
     cc::DrawQuad* out) {
   if (!ReadDrawQuad(data, out))
     return false;
-  switch (data.material()) {
-    case cc::mojom::Material::INVALID:
-      break;
-    case cc::mojom::Material::DEBUG_BORDER:
-      return data.ReadDebugBorderQuadState(out);
-    case cc::mojom::Material::PICTURE_CONTENT:
-      // TODO(fsamuel): Implement PictureDrawQuad
-      // serialization/deserialization.
-      break;
-    case cc::mojom::Material::RENDER_PASS:
-      return data.ReadRenderPassQuadState(out);
-    case cc::mojom::Material::SOLID_COLOR:
-      return data.ReadSolidColorQuadState(out);
-    case cc::mojom::Material::STREAM_VIDEO_CONTENT:
-      return data.ReadStreamVideoQuadState(out);
-    case cc::mojom::Material::SURFACE_CONTENT:
-      return data.ReadSurfaceQuadState(out);
-    case cc::mojom::Material::TEXTURE_CONTENT:
-      return data.ReadTextureQuadState(out);
-    case cc::mojom::Material::TILED_CONTENT:
-      return data.ReadTileQuadState(out);
-    case cc::mojom::Material::YUV_VIDEO_CONTENT:
-      return data.ReadYuvVideoQuadState(out);
-  }
-  NOTREACHED();
-  return false;
+  return data.ReadDrawQuadState(out);
 }
 
 }  // namespace mojo