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

Side by Side Diff: mojo/edk/system/mapping_table.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps Created 6 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 unified diff | Download patch
« no previous file with comments | « mojo/edk/system/mapping_table.h ('k') | mojo/edk/system/memory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/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 "mojo/embedder/platform_shared_buffer.h" 8 #include "mojo/edk/embedder/platform_shared_buffer.h"
9 #include "mojo/system/constants.h" 9 #include "mojo/edk/system/constants.h"
10 10
11 namespace mojo { 11 namespace mojo {
12 namespace system { 12 namespace system {
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.
(...skipping 18 matching lines...) Expand all
38 if (it == address_to_mapping_map_.end()) 38 if (it == address_to_mapping_map_.end())
39 return MOJO_RESULT_INVALID_ARGUMENT; 39 return MOJO_RESULT_INVALID_ARGUMENT;
40 embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second; 40 embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second;
41 address_to_mapping_map_.erase(it); 41 address_to_mapping_map_.erase(it);
42 delete mapping_to_delete; 42 delete mapping_to_delete;
43 return MOJO_RESULT_OK; 43 return MOJO_RESULT_OK;
44 } 44 }
45 45
46 } // namespace system 46 } // namespace system
47 } // namespace mojo 47 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/system/mapping_table.h ('k') | mojo/edk/system/memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698