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

Side by Side Diff: base/mac/scoped_mach_vm.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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 | « base/mac/scoped_mach_vm.h ('k') | base/memory/BUILD.gn » ('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 "base/mac/scoped_mach_vm.h" 5 #include "base/mac/scoped_mach_vm.h"
6 6
7 namespace base { 7 namespace base {
8 namespace mac { 8 namespace mac {
9 9
10 void ScopedMachVM::reset(vm_address_t address, vm_size_t size) { 10 void ScopedMachVM::reset(vm_address_t address, vm_size_t size) {
11 DCHECK(address % PAGE_SIZE == 0); 11 DCHECK_EQ(address % PAGE_SIZE, 0u);
12 DCHECK(size % PAGE_SIZE == 0); 12 DCHECK_EQ(size % PAGE_SIZE, 0u);
13 13
14 if (size_) { 14 if (size_) {
15 if (address_ < address) { 15 if (address_ < address) {
16 vm_deallocate(mach_task_self(), 16 vm_deallocate(mach_task_self(),
17 address_, 17 address_,
18 std::min(size_, address - address_)); 18 std::min(size_, address - address_));
19 } 19 }
20 if (address_ + size_ > address + size) { 20 if (address_ + size_ > address + size) {
21 vm_address_t deallocate_start = std::max(address_, address + size); 21 vm_address_t deallocate_start = std::max(address_, address + size);
22 vm_deallocate(mach_task_self(), 22 vm_deallocate(mach_task_self(),
23 deallocate_start, 23 deallocate_start,
24 address_ + size_ - deallocate_start); 24 address_ + size_ - deallocate_start);
25 } 25 }
26 } 26 }
27 27
28 address_ = address; 28 address_ = address;
29 size_ = size; 29 size_ = size;
30 } 30 }
31 31
32 } // namespace mac 32 } // namespace mac
33 } // namespace base 33 } // namespace base
OLDNEW
« no previous file with comments | « base/mac/scoped_mach_vm.h ('k') | base/memory/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698