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

Side by Side Diff: mojo/system/handle_table.cc

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE 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/system/entrypoints.cc ('k') | mojo/system/local_data_pipe_unittest.cc » ('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/handle_table.h" 5 #include "mojo/system/handle_table.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "mojo/system/constants.h" 9 #include "mojo/system/constants.h"
10 #include "mojo/system/dispatcher.h" 10 #include "mojo/system/dispatcher.h"
(...skipping 18 matching lines...) Expand all
29 HandleTable::~HandleTable() { 29 HandleTable::~HandleTable() {
30 // This should usually not be reached (the only instance should be owned by 30 // This should usually not be reached (the only instance should be owned by
31 // the singleton |Core|, which lives forever), except in tests. 31 // the singleton |Core|, which lives forever), except in tests.
32 } 32 }
33 33
34 Dispatcher* HandleTable::GetDispatcher(MojoHandle handle) { 34 Dispatcher* HandleTable::GetDispatcher(MojoHandle handle) {
35 DCHECK_NE(handle, MOJO_HANDLE_INVALID); 35 DCHECK_NE(handle, MOJO_HANDLE_INVALID);
36 36
37 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle); 37 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle);
38 if (it == handle_to_entry_map_.end()) 38 if (it == handle_to_entry_map_.end())
39 return NULL; 39 return nullptr;
40 return it->second.dispatcher.get(); 40 return it->second.dispatcher.get();
41 } 41 }
42 42
43 MojoResult HandleTable::GetAndRemoveDispatcher( 43 MojoResult HandleTable::GetAndRemoveDispatcher(
44 MojoHandle handle, 44 MojoHandle handle,
45 scoped_refptr<Dispatcher>* dispatcher) { 45 scoped_refptr<Dispatcher>* dispatcher) {
46 DCHECK_NE(handle, MOJO_HANDLE_INVALID); 46 DCHECK_NE(handle, MOJO_HANDLE_INVALID);
47 DCHECK(dispatcher); 47 DCHECK(dispatcher);
48 48
49 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle); 49 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle);
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 for (uint32_t i = 0; i < num_handles; i++) { 231 for (uint32_t i = 0; i < num_handles; i++) {
232 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handles[i]); 232 HandleToEntryMap::iterator it = handle_to_entry_map_.find(handles[i]);
233 DCHECK(it != handle_to_entry_map_.end()); 233 DCHECK(it != handle_to_entry_map_.end());
234 DCHECK(it->second.busy); 234 DCHECK(it->second.busy);
235 it->second.busy = false; 235 it->second.busy = false;
236 } 236 }
237 } 237 }
238 238
239 } // namespace system 239 } // namespace system
240 } // namespace mojo 240 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/entrypoints.cc ('k') | mojo/system/local_data_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698