| Index: mojo/public/cpp/bindings/lib/array_serialization.h
|
| diff --git a/mojo/public/cpp/bindings/lib/array_serialization.h b/mojo/public/cpp/bindings/lib/array_serialization.h
|
| index 83d94ce1fbcd351acbac03f86271aa21dbc8277c..83a69fecac22a924320d7c8a4229d4e248277220 100644
|
| --- a/mojo/public/cpp/bindings/lib/array_serialization.h
|
| +++ b/mojo/public/cpp/bindings/lib/array_serialization.h
|
| @@ -113,7 +113,7 @@ struct ArraySerializer<MojomType,
|
| static void SerializeElements(UserTypeReader* input,
|
| Buffer* buf,
|
| Data* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| DCHECK(!validate_params->element_is_nullable)
|
| << "Primitive type should be non-nullable";
|
| @@ -173,7 +173,7 @@ struct ArraySerializer<MojomType,
|
| static void SerializeElements(UserTypeReader* input,
|
| Buffer* buf,
|
| Data* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| DCHECK(!validate_params->element_is_nullable)
|
| << "Primitive type should be non-nullable";
|
| @@ -219,7 +219,7 @@ struct ArraySerializer<MojomType,
|
| static void SerializeElements(UserTypeReader* input,
|
| Buffer* buf,
|
| Data* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| DCHECK(!validate_params->element_validate_params)
|
| << "Handle type should not have array validate params";
|
| @@ -278,7 +278,7 @@ struct ArraySerializer<MojomType,
|
| static void SerializeElements(UserTypeReader* input,
|
| Buffer* buf,
|
| Data* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| size_t size = input->GetSize();
|
| for (size_t i = 0; i < size; ++i) {
|
| @@ -320,7 +320,7 @@ struct ArraySerializer<MojomType,
|
| static void Run(InputElementType&& input,
|
| Buffer* buf,
|
| DataElement* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| Serialize<T>(std::forward<InputElementType>(input), buf, output, context);
|
| }
|
| @@ -332,7 +332,7 @@ struct ArraySerializer<MojomType,
|
| static void Run(InputElementType&& input,
|
| Buffer* buf,
|
| DataElement* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| Serialize<T>(std::forward<InputElementType>(input), buf, output,
|
| validate_params, context);
|
| @@ -372,7 +372,7 @@ struct ArraySerializer<MojomType,
|
| static void SerializeElements(UserTypeReader* input,
|
| Buffer* buf,
|
| Data* output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| size_t size = input->GetSize();
|
| for (size_t i = 0; i < size; ++i) {
|
| @@ -424,7 +424,7 @@ struct Serializer<Array<Element>, MaybeConstUserType> {
|
| static void Serialize(MaybeConstUserType& input,
|
| Buffer* buf,
|
| Data** output,
|
| - const ArrayValidateParams* validate_params,
|
| + const ContainerValidateParams* validate_params,
|
| SerializationContext* context) {
|
| if (!CallIsNullIfExists<Traits>(input)) {
|
| MOJO_INTERNAL_DLOG_SERIALIZATION_WARNING(
|
|
|