Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: mojo/edk/system/mapping_table.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/system/mapping_table.cc
diff --git a/third_party/mojo/src/mojo/edk/system/mapping_table.cc b/mojo/edk/system/mapping_table.cc
similarity index 67%
copy from third_party/mojo/src/mojo/edk/system/mapping_table.cc
copy to mojo/edk/system/mapping_table.cc
index fab79c36fefcaee0cdfc1c0c3a9bd7a7c147e79f..46afe5a56bb7c2a30ea6cd43eb5ac7a4d73693fb 100644
--- a/third_party/mojo/src/mojo/edk/system/mapping_table.cc
+++ b/mojo/edk/system/mapping_table.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/mojo/src/mojo/edk/system/mapping_table.h"
+#include "mojo/edk/system/mapping_table.h"
#include "base/logging.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h"
-#include "third_party/mojo/src/mojo/edk/system/configuration.h"
+#include "mojo/edk/embedder/platform_shared_buffer.h"
+#include "mojo/edk/system/configuration.h"
namespace mojo {
-namespace system {
+namespace edk {
MappingTable::MappingTable() {
}
@@ -20,29 +20,29 @@ MappingTable::~MappingTable() {
}
MojoResult MappingTable::AddMapping(
- scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) {
+ scoped_ptr<PlatformSharedBufferMapping> mapping) {
DCHECK(mapping);
if (address_to_mapping_map_.size() >=
GetConfiguration().max_mapping_table_sze)
return MOJO_RESULT_RESOURCE_EXHAUSTED;
- uintptr_t address = reinterpret_cast<uintptr_t>(mapping->GetBase());
+ void* address = mapping->GetBase();
DCHECK(address_to_mapping_map_.find(address) ==
address_to_mapping_map_.end());
address_to_mapping_map_[address] = mapping.release();
return MOJO_RESULT_OK;
}
-MojoResult MappingTable::RemoveMapping(uintptr_t address) {
+MojoResult MappingTable::RemoveMapping(void* address) {
AddressToMappingMap::iterator it = address_to_mapping_map_.find(address);
if (it == address_to_mapping_map_.end())
return MOJO_RESULT_INVALID_ARGUMENT;
- embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second;
+ PlatformSharedBufferMapping* mapping_to_delete = it->second;
address_to_mapping_map_.erase(it);
delete mapping_to_delete;
return MOJO_RESULT_OK;
}
-} // namespace system
+} // namespace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698