| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "third_party/mojo/src/mojo/edk/system/mapping_table.h" | 5 #include "mojo/edk/system/mapping_table.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h" | 8 #include "mojo/edk/embedder/platform_shared_buffer.h" |
| 9 #include "third_party/mojo/src/mojo/edk/system/configuration.h" | 9 #include "mojo/edk/system/configuration.h" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 namespace system { | 12 namespace edk { |
| 13 | 13 |
| 14 MappingTable::MappingTable() { | 14 MappingTable::MappingTable() { |
| 15 } | 15 } |
| 16 | 16 |
| 17 MappingTable::~MappingTable() { | 17 MappingTable::~MappingTable() { |
| 18 // This should usually not be reached (the only instance should be owned by | 18 // This should usually not be reached (the only instance should be owned by |
| 19 // the singleton |Core|, which lives forever), except in tests. | 19 // the singleton |Core|, which lives forever), except in tests. |
| 20 } | 20 } |
| 21 | 21 |
| 22 MojoResult MappingTable::AddMapping( | 22 MojoResult MappingTable::AddMapping( |
| 23 scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) { | 23 scoped_ptr<PlatformSharedBufferMapping> mapping) { |
| 24 DCHECK(mapping); | 24 DCHECK(mapping); |
| 25 | 25 |
| 26 if (address_to_mapping_map_.size() >= | 26 if (address_to_mapping_map_.size() >= |
| 27 GetConfiguration().max_mapping_table_sze) | 27 GetConfiguration().max_mapping_table_sze) |
| 28 return MOJO_RESULT_RESOURCE_EXHAUSTED; | 28 return MOJO_RESULT_RESOURCE_EXHAUSTED; |
| 29 | 29 |
| 30 uintptr_t address = reinterpret_cast<uintptr_t>(mapping->GetBase()); | 30 void* address = mapping->GetBase(); |
| 31 DCHECK(address_to_mapping_map_.find(address) == | 31 DCHECK(address_to_mapping_map_.find(address) == |
| 32 address_to_mapping_map_.end()); | 32 address_to_mapping_map_.end()); |
| 33 address_to_mapping_map_[address] = mapping.release(); | 33 address_to_mapping_map_[address] = mapping.release(); |
| 34 return MOJO_RESULT_OK; | 34 return MOJO_RESULT_OK; |
| 35 } | 35 } |
| 36 | 36 |
| 37 MojoResult MappingTable::RemoveMapping(uintptr_t address) { | 37 MojoResult MappingTable::RemoveMapping(void* address) { |
| 38 AddressToMappingMap::iterator it = address_to_mapping_map_.find(address); | 38 AddressToMappingMap::iterator it = address_to_mapping_map_.find(address); |
| 39 if (it == address_to_mapping_map_.end()) | 39 if (it == address_to_mapping_map_.end()) |
| 40 return MOJO_RESULT_INVALID_ARGUMENT; | 40 return MOJO_RESULT_INVALID_ARGUMENT; |
| 41 embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second; | 41 PlatformSharedBufferMapping* mapping_to_delete = it->second; |
| 42 address_to_mapping_map_.erase(it); | 42 address_to_mapping_map_.erase(it); |
| 43 delete mapping_to_delete; | 43 delete mapping_to_delete; |
| 44 return MOJO_RESULT_OK; | 44 return MOJO_RESULT_OK; |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace system | 47 } // namespace edk |
| 48 } // namespace mojo | 48 } // namespace mojo |
| OLD | NEW |