Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / system / mapping_table.cc

diff --git a/src/mojo/system/mapping_table.cc b/src/mojo/system/mapping_table.cc
index a6e5bb3..7aeb04d 100644 (file)
--- a/src/mojo/system/mapping_table.cc
+++ b/src/mojo/system/mapping_table.cc
@@ -5,8 +5,8 @@
 #include "mojo/system/mapping_table.h"
 
 #include "base/logging.h"
+#include "mojo/embedder/platform_shared_buffer.h"
 #include "mojo/system/constants.h"
-#include "mojo/system/raw_shared_buffer.h"
 
 namespace mojo {
 namespace system {
@@ -20,25 +20,24 @@ MappingTable::~MappingTable() {
 }
 
 MojoResult MappingTable::AddMapping(
-    scoped_ptr<RawSharedBufferMapping> mapping) {
+    scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) {
   DCHECK(mapping);
 
   if (address_to_mapping_map_.size() >= kMaxMappingTableSize)
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
 
-  uintptr_t address = reinterpret_cast<uintptr_t>(mapping->base());
+  uintptr_t address = reinterpret_cast<uintptr_t>(mapping->GetBase());
   DCHECK(address_to_mapping_map_.find(address) ==
-             address_to_mapping_map_.end());
+         address_to_mapping_map_.end());
   address_to_mapping_map_[address] = mapping.release();
   return MOJO_RESULT_OK;
 }
 
-MojoResult MappingTable::RemoveMapping(void* address) {
-  AddressToMappingMap::iterator it =
-      address_to_mapping_map_.find(reinterpret_cast<uintptr_t>(address));
+MojoResult MappingTable::RemoveMapping(uintptr_t address) {
+  AddressToMappingMap::iterator it = address_to_mapping_map_.find(address);
   if (it == address_to_mapping_map_.end())
     return MOJO_RESULT_INVALID_ARGUMENT;
-  RawSharedBufferMapping* mapping_to_delete = it->second;
+  embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second;
   address_to_mapping_map_.erase(it);
   delete mapping_to_delete;
   return MOJO_RESULT_OK;