| Index: cc/ipc/cc_param_traits_macros.h
|
| diff --git a/cc/ipc/cc_param_traits_macros.h b/cc/ipc/cc_param_traits_macros.h
|
| index e560b5285700252f778c28360aaca3dfc2c73d19..3de1ca2bc7a734eeb3e605528181047ff99776f7 100644
|
| --- a/cc/ipc/cc_param_traits_macros.h
|
| +++ b/cc/ipc/cc_param_traits_macros.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
|
| #define CC_IPC_CC_PARAM_TRAITS_MACROS_H_
|
|
|
| -#include "cc/input/selection_bound_type.h"
|
| #include "cc/output/begin_frame_args.h"
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/output/filter_operation.h"
|
| @@ -36,7 +35,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(cc::DrawQuad::Material, cc::DrawQuad::MATERIAL_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(cc::FilterOperation::FilterType,
|
| cc::FilterOperation::FILTER_TYPE_LAST)
|
| IPC_ENUM_TRAITS_MAX_VALUE(cc::ResourceFormat, cc::RESOURCE_FORMAT_MAX)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(cc::SelectionBoundType, cc::SELECTION_BOUND_TYPE_LAST)
|
|
|
| // TODO(fsamuel): This trait belongs with skia code.
|
| IPC_ENUM_TRAITS_MAX_VALUE(SkXfermode::Mode, SkXfermode::kLastMode)
|
| @@ -160,14 +158,7 @@ IPC_STRUCT_TRAITS_BEGIN(cc::ReturnedResource)
|
| IPC_STRUCT_TRAITS_MEMBER(lost)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(cc::ViewportSelectionBound)
|
| - IPC_STRUCT_TRAITS_MEMBER(type)
|
| - IPC_STRUCT_TRAITS_MEMBER(edge_top)
|
| - IPC_STRUCT_TRAITS_MEMBER(edge_bottom)
|
| - IPC_STRUCT_TRAITS_MEMBER(visible)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| -IPC_STRUCT_TRAITS_BEGIN(cc::ViewportSelection)
|
| +IPC_STRUCT_TRAITS_BEGIN(cc::Selection<gfx::SelectionBound>)
|
| IPC_STRUCT_TRAITS_MEMBER(start)
|
| IPC_STRUCT_TRAITS_MEMBER(end)
|
| IPC_STRUCT_TRAITS_MEMBER(is_editable)
|
|
|