| Index: mojo/public/cpp/bindings/lib/array_internal.h
|
| diff --git a/mojo/public/cpp/bindings/lib/array_internal.h b/mojo/public/cpp/bindings/lib/array_internal.h
|
| index 00ae00b70114f7ecb1acc2aa96c8e6b73db962ac..624070202be1cf7bac8067f1ec75d07e907dd09a 100644
|
| --- a/mojo/public/cpp/bindings/lib/array_internal.h
|
| +++ b/mojo/public/cpp/bindings/lib/array_internal.h
|
| @@ -144,7 +144,7 @@ struct ArraySerializationHelper<T, false> {
|
| static bool ValidateElements(const ArrayHeader* header,
|
| const ElementType* elements,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| DCHECK(!validate_params->element_is_nullable)
|
| << "Primitive type should be non-nullable";
|
| DCHECK(!validate_params->element_validate_params)
|
| @@ -175,7 +175,7 @@ struct ArraySerializationHelper<Handle_Data, false> {
|
| static bool ValidateElements(const ArrayHeader* header,
|
| const ElementType* elements,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| DCHECK(!validate_params->element_validate_params)
|
| << "Handle type should not have array validate params";
|
|
|
| @@ -215,7 +215,7 @@ struct ArraySerializationHelper<P*, false> {
|
| static bool ValidateElements(const ArrayHeader* header,
|
| const ElementType* elements,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| for (uint32_t i = 0; i < header->num_elements; ++i) {
|
| if (!validate_params->element_is_nullable && !elements[i].offset) {
|
| ReportValidationError(
|
| @@ -243,7 +243,7 @@ struct ArraySerializationHelper<P*, false> {
|
| struct ValidateCaller {
|
| static bool Run(const void* data,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| DCHECK(!validate_params)
|
| << "Struct type should not have array validate params";
|
|
|
| @@ -255,7 +255,7 @@ struct ArraySerializationHelper<P*, false> {
|
| struct ValidateCaller<Map_Data<Key, Value>> {
|
| static bool Run(const void* data,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| return Map_Data<Key, Value>::Validate(data, bounds_checker,
|
| validate_params);
|
| }
|
| @@ -265,7 +265,7 @@ struct ArraySerializationHelper<P*, false> {
|
| struct ValidateCaller<Array_Data<T>> {
|
| static bool Run(const void* data,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| return Array_Data<T>::Validate(data, bounds_checker, validate_params);
|
| }
|
| };
|
| @@ -288,7 +288,7 @@ struct ArraySerializationHelper<U, true> {
|
| static bool ValidateElements(const ArrayHeader* header,
|
| const ElementType* elements,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| for (uint32_t i = 0; i < header->num_elements; ++i) {
|
| if (!validate_params->element_is_nullable && elements[i].is_null()) {
|
| ReportValidationError(
|
| @@ -329,7 +329,7 @@ class Array_Data {
|
|
|
| static bool Validate(const void* data,
|
| BoundsChecker* bounds_checker,
|
| - const ArrayValidateParams* validate_params) {
|
| + const ContainerValidateParams* validate_params) {
|
| if (!data)
|
| return true;
|
| if (!IsAligned(data)) {
|
|
|