Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3462)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/ipc/quads_struct_traits.cc

Issue 2229553004: cc: Implement UnionTraits for DrawQuads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup according to Yuzhu's suggestion Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/ipc/quads.mojom ('K') | « cc/ipc/quads_struct_traits.h ('k') | cc/ipc/render_pass_struct_traits.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/ipc/quads_struct_traits.cc
diff --git a/cc/ipc/quads_struct_traits.cc b/cc/ipc/quads_struct_traits.cc
index 98edf8795efec10af2cc0d01f5843b56ad0631bc..24c2a336916ac6843000e6c96ad0edaa392ff29b 100644
--- a/cc/ipc/quads_struct_traits.cc
+++ b/cc/ipc/quads_struct_traits.cc
@@ -7,45 +7,40 @@
namespace mojo {
-cc::DrawQuad* AllocateAndConstruct(cc::mojom::Material material,
- cc::QuadList* list) {
+cc::DrawQuad* AllocateAndConstruct(
+ cc::mojom::DrawQuadState::DataView::Tag material,
+ cc::QuadList* list) {
cc::DrawQuad* quad = nullptr;
switch (material) {
- case cc::mojom::Material::INVALID:
- return nullptr;
- case cc::mojom::Material::DEBUG_BORDER:
+ case cc::mojom::DrawQuadState::DataView::Tag::DEBUG_BORDER_QUAD_STATE:
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:
+ case cc::mojom::DrawQuadState::DataView::Tag::RENDER_PASS_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::RenderPassDrawQuad>();
quad->material = cc::DrawQuad::RENDER_PASS;
return quad;
- case cc::mojom::Material::SOLID_COLOR:
+ case cc::mojom::DrawQuadState::DataView::Tag::SOLID_COLOR_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::SolidColorDrawQuad>();
quad->material = cc::DrawQuad::SOLID_COLOR;
return quad;
- case cc::mojom::Material::STREAM_VIDEO_CONTENT:
+ case cc::mojom::DrawQuadState::DataView::Tag::STREAM_VIDEO_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::StreamVideoDrawQuad>();
quad->material = cc::DrawQuad::STREAM_VIDEO_CONTENT;
return quad;
- case cc::mojom::Material::SURFACE_CONTENT:
+ case cc::mojom::DrawQuadState::DataView::Tag::SURFACE_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::SurfaceDrawQuad>();
quad->material = cc::DrawQuad::SURFACE_CONTENT;
return quad;
- case cc::mojom::Material::TEXTURE_CONTENT:
+ case cc::mojom::DrawQuadState::DataView::Tag::TEXTURE_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::TextureDrawQuad>();
quad->material = cc::DrawQuad::TEXTURE_CONTENT;
return quad;
- case cc::mojom::Material::TILED_CONTENT:
+ case cc::mojom::DrawQuadState::DataView::Tag::TILE_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::TileDrawQuad>();
quad->material = cc::DrawQuad::TILED_CONTENT;
return quad;
- case cc::mojom::Material::YUV_VIDEO_CONTENT:
+ case cc::mojom::DrawQuadState::DataView::Tag::YUV_VIDEO_QUAD_STATE:
quad = list->AllocateAndConstruct<cc::YUVVideoDrawQuad>();
quad->material = cc::DrawQuad::YUV_VIDEO_CONTENT;
return quad;
@@ -53,13 +48,10 @@ cc::DrawQuad* AllocateAndConstruct(cc::mojom::Material material,
NOTREACHED();
return nullptr;
}
+
namespace {
bool ReadDrawQuad(cc::mojom::DrawQuadDataView data, cc::DrawQuad* quad) {
- cc::DrawQuad::Material material;
- if (!data.ReadMaterial(&material) || material != quad->material) {
- return false;
- }
if (!data.ReadRect(&quad->rect) || !data.ReadOpaqueRect(&quad->opaque_rect) ||
!data.ReadVisibleRect(&quad->visible_rect)) {
return false;
@@ -71,74 +63,6 @@ bool ReadDrawQuad(cc::mojom::DrawQuadDataView data, cc::DrawQuad* quad) {
} // 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;
- case cc::DrawQuad::DEBUG_BORDER:
- return cc::mojom::Material::DEBUG_BORDER;
- case cc::DrawQuad::PICTURE_CONTENT:
- return cc::mojom::Material::PICTURE_CONTENT;
- 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;
-}
-
-// 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:
- *out = cc::DrawQuad::SURFACE_CONTENT;
- return true;
- case cc::mojom::Material::TEXTURE_CONTENT:
- *out = cc::DrawQuad::TEXTURE_CONTENT;
- return true;
- case cc::mojom::Material::TILED_CONTENT:
- *out = cc::DrawQuad::TILED_CONTENT;
- return true;
- case cc::mojom::Material::YUV_VIDEO_CONTENT:
- *out = cc::DrawQuad::YUV_VIDEO_CONTENT;
- return true;
- }
- return false;
-}
-
-// static
bool StructTraits<cc::mojom::DebugBorderQuadState, cc::DrawQuad>::Read(
cc::mojom::DebugBorderQuadStateDataView data,
cc::DrawQuad* out) {
@@ -312,32 +236,7 @@ bool StructTraits<cc::mojom::DrawQuad, cc::DrawQuad>::Read(
cc::DrawQuad* out) {
if (!ReadDrawQuad(data, out))
yzshen1 2016/08/09 18:29:53 optional nit: it may make sense to merge ReadDrawQ
Fady Samuel 2016/08/09 18:42:50 Done.
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
« cc/ipc/quads.mojom ('K') | « cc/ipc/quads_struct_traits.h ('k') | cc/ipc/render_pass_struct_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698