| Index: mojo/edk/system/mapping_table.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/mapping_table.h b/mojo/edk/system/mapping_table.h
|
| similarity index 69%
|
| copy from third_party/mojo/src/mojo/edk/system/mapping_table.h
|
| copy to mojo/edk/system/mapping_table.h
|
| index cc74acae02dbe6edcb9cd525c7282fbea8a4bdc9..fb2acf365fec3df16ce782557653326fbf5a32e6 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/mapping_table.h
|
| +++ b/mojo/edk/system/mapping_table.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
| -#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
| +#ifndef MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
| +#define MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -11,19 +11,15 @@
|
|
|
| #include "base/containers/hash_tables.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/c/system/types.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
|
|
| -namespace embedder {
|
| -class PlatformSharedBufferMapping;
|
| -}
|
| -
|
| -namespace system {
|
| -
|
| +namespace edk {
|
| class Core;
|
| +class PlatformSharedBufferMapping;
|
|
|
| // Test-only function (defined/used in embedder/test_embedder.cc). Declared here
|
| // so it can be friended.
|
| @@ -42,21 +38,20 @@ class MOJO_SYSTEM_IMPL_EXPORT MappingTable {
|
|
|
| // Tries to add a mapping. (Takes ownership of the mapping in all cases; on
|
| // failure, it will be destroyed.)
|
| - MojoResult AddMapping(
|
| - scoped_ptr<embedder::PlatformSharedBufferMapping> mapping);
|
| - MojoResult RemoveMapping(uintptr_t address);
|
| + MojoResult AddMapping(scoped_ptr<PlatformSharedBufferMapping> mapping);
|
| + MojoResult RemoveMapping(void* address);
|
|
|
| private:
|
| friend bool internal::ShutdownCheckNoLeaks(Core*);
|
|
|
| using AddressToMappingMap =
|
| - base::hash_map<uintptr_t, embedder::PlatformSharedBufferMapping*>;
|
| + base::hash_map<void*, PlatformSharedBufferMapping*>;
|
| AddressToMappingMap address_to_mapping_map_;
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(MappingTable);
|
| };
|
|
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| -#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
| +#endif // MOJO_EDK_SYSTEM_MAPPING_TABLE_H_
|
|
|