diff options
author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/public/cpp/bindings/lib/map_data_internal.h | |
parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/public/cpp/bindings/lib/map_data_internal.h')
-rw-r--r-- | mojo/public/cpp/bindings/lib/map_data_internal.h | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/mojo/public/cpp/bindings/lib/map_data_internal.h b/mojo/public/cpp/bindings/lib/map_data_internal.h deleted file mode 100644 index 7787714..0000000 --- a/mojo/public/cpp/bindings/lib/map_data_internal.h +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright 2014 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. - -#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ -#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ - -#include "mojo/public/cpp/bindings/lib/array_internal.h" -#include "mojo/public/cpp/bindings/lib/validate_params.h" -#include "mojo/public/cpp/bindings/lib/validation_errors.h" - -namespace mojo { -namespace internal { - -// Data types for keys. -template <typename MapKey> -struct MapKeyValidateParams { - public: - typedef NoValidateParams ElementValidateParams; - static const uint32_t expected_num_elements = 0; - static const bool element_is_nullable = false; -}; - -// For non-nullable strings only. (Which is OK; map keys can't be null.) -template <> -struct MapKeyValidateParams<mojo::internal::Array_Data<char>*> { - public: - typedef ArrayValidateParams<0, false, NoValidateParams> ElementValidateParams; - static const uint32_t expected_num_elements = 0; - static const bool element_is_nullable = false; -}; - -// Map serializes into a struct which has two arrays as struct fields, the keys -// and the values. -template <typename Key, typename Value> -class Map_Data { - public: - static Map_Data* New(Buffer* buf) { - return new (buf->Allocate(sizeof(Map_Data))) Map_Data(); - } - - template <typename ValueParams> - static bool Validate(const void* data, BoundsChecker* bounds_checker) { - if (!data) - return true; - - if (!ValidateStructHeader(data, sizeof(Map_Data), 2, bounds_checker)) - return false; - - const Map_Data* object = static_cast<const Map_Data*>(data); - if (!ValidateEncodedPointer(&object->keys.offset)) { - ReportValidationError(VALIDATION_ERROR_ILLEGAL_POINTER); - return false; - } - if (!object->keys.offset) { - ReportValidationError(VALIDATION_ERROR_UNEXPECTED_NULL_POINTER, - "null key array in map struct"); - return false; - } - if (!Array_Data<Key>::template Validate<MapKeyValidateParams<Key>>( - DecodePointerRaw(&object->keys.offset), bounds_checker)) { - return false; - } - - if (!ValidateEncodedPointer(&object->values.offset)) { - ReportValidationError(VALIDATION_ERROR_ILLEGAL_POINTER); - return false; - } - if (!object->values.offset) { - ReportValidationError(VALIDATION_ERROR_UNEXPECTED_NULL_POINTER, - "null value array in map struct"); - return false; - } - if (!Array_Data<Value>::template Validate<ValueParams>( - DecodePointerRaw(&object->values.offset), bounds_checker)) { - return false; - } - - const ArrayHeader* key_header = - static_cast<const ArrayHeader*>(DecodePointerRaw(&object->keys.offset)); - const ArrayHeader* value_header = static_cast<const ArrayHeader*>( - DecodePointerRaw(&object->values.offset)); - if (key_header->num_elements != value_header->num_elements) { - ReportValidationError(VALIDATION_ERROR_DIFFERENT_SIZED_ARRAYS_IN_MAP); - return false; - } - - return true; - } - - StructHeader header_; - - ArrayPointer<Key> keys; - ArrayPointer<Value> values; - - void EncodePointersAndHandles(std::vector<mojo::Handle>* handles) { - Encode(&keys, handles); - Encode(&values, handles); - } - - void DecodePointersAndHandles(std::vector<mojo::Handle>* handles) { - Decode(&keys, handles); - Decode(&values, handles); - } - - private: - Map_Data() { - header_.num_bytes = sizeof(*this); - header_.num_fields = 2; - } - ~Map_Data() = delete; -}; -static_assert(sizeof(Map_Data<char, char>) == 24, "Bad sizeof(Map_Data)"); - -} // namespace internal -} // namespace mojo - -#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_DATA_INTERNAL_H_ |