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

Unified Diff: util/mac/checked_mach_address_range.cc

Issue 1052813002: win: make CrashpadInfo retrievable (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: more fixes Created 5 years, 8 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
« no previous file with comments | « util/mac/checked_mach_address_range.h ('k') | util/numeric/checked_address_range.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/mac/checked_mach_address_range.cc
diff --git a/util/mac/checked_mach_address_range.cc b/util/mac/checked_mach_address_range.cc
deleted file mode 100644
index 5fdabe36e492e883aad52a6d575400b4a887e2d8..0000000000000000000000000000000000000000
--- a/util/mac/checked_mach_address_range.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2014 The Crashpad Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "util/mac/checked_mach_address_range.h"
-
-#include "base/logging.h"
-#include "base/numerics/safe_conversions.h"
-
-namespace crashpad {
-
-CheckedMachAddressRange::CheckedMachAddressRange()
- : range_32_(0, 0), is_64_bit_(false), range_ok_(true) {
-}
-
-CheckedMachAddressRange::CheckedMachAddressRange(
- bool is_64_bit,
- mach_vm_address_t base,
- mach_vm_size_t size) {
- SetRange(is_64_bit, base, size);
-}
-
-void CheckedMachAddressRange::SetRange(bool is_64_bit,
- mach_vm_address_t base,
- mach_vm_size_t size) {
- is_64_bit_ = is_64_bit;
- if (is_64_bit_) {
- range_64_.SetRange(base, size);
- range_ok_ = true;
- } else {
- range_32_.SetRange(base, size);
- range_ok_ = base::IsValueInRangeForNumericType<uint32_t>(base) &&
- base::IsValueInRangeForNumericType<uint32_t>(size);
- }
-}
-
-mach_vm_address_t CheckedMachAddressRange::Base() const {
- return is_64_bit_ ? range_64_.base() : range_32_.base();
-}
-
-mach_vm_size_t CheckedMachAddressRange::Size() const {
- return is_64_bit_ ? range_64_.size() : range_32_.size();
-}
-
-mach_vm_address_t CheckedMachAddressRange::End() const {
- return is_64_bit_ ? range_64_.end() : range_32_.end();
-}
-
-bool CheckedMachAddressRange::IsValid() const {
- return range_ok_ && (is_64_bit_ ? range_64_.IsValid() : range_32_.IsValid());
-}
-
-bool CheckedMachAddressRange::ContainsValue(mach_vm_address_t value) const {
- DCHECK(range_ok_);
-
- if (is_64_bit_) {
- return range_64_.ContainsValue(value);
- }
-
- if (!base::IsValueInRangeForNumericType<uint32_t>(value)) {
- return false;
- }
-
- return range_32_.ContainsValue(value);
-}
-
-bool CheckedMachAddressRange::ContainsRange(
- const CheckedMachAddressRange& that) const {
- DCHECK_EQ(is_64_bit_, that.is_64_bit_);
- DCHECK(range_ok_);
- DCHECK(that.range_ok_);
-
- return is_64_bit_ ? range_64_.ContainsRange(that.range_64_)
- : range_32_.ContainsRange(that.range_32_);
-}
-
-} // namespace crashpad
« no previous file with comments | « util/mac/checked_mach_address_range.h ('k') | util/numeric/checked_address_range.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698