mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-31 01:43:03 +08:00
7a849482ea
Update mini_chromium to 7d6697ceb5cb5ca02fde3813496f48b9b1d76d0c
47ff9691450e Switch the language standard to C++14
7d6697ceb5cb Remove base/memory/ptr_util.h and base::WrapUnique
base::WrapUnique and std::make_unique are similar, but the latter is
standardized and preferred.
Most of the mechanical changes were made with this sed:
for f in $(git grep -l base::WrapUnique | uniq); do
sed -E \
-e 's%base::WrapUnique\(new ([^(]+)\((.*)\)\);%std::make_unique<\1>(\2);%g' \
-e 's%base::WrapUnique\(new ([^(]+)\);%std::make_unique<\1>();%g' \
-e 's%^#include "base/memory/ptr_util.h"$%#include <memory>%' \
-i '' "${f}"
done
Several uses of base::WrapUnique that did not fit on a single line and
were not matched by this sed were adjusted manually. All #include
changes were audited manually, to at least move <memory> into the
correct section. Where <memory> was already #included by a file (or its
corresponding header), the extra #include was removed. Where <memory>
should have been #included by a header, it was added. Other similar
adjustments to other #includes were also made.
Change-Id: Id4e0baad8b3652646bede4c3f30f41fcabfdbd4f
Reviewed-on: https://chromium-review.googlesource.com/714658
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: Leonard Mosescu <mosescu@chromium.org>
139 lines
4.1 KiB
C++
139 lines
4.1 KiB
C++
// 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 "minidump/minidump_string_writer.h"
|
||
|
||
#include <utility>
|
||
|
||
#include "base/logging.h"
|
||
#include "minidump/minidump_writer_util.h"
|
||
#include "util/file/file_writer.h"
|
||
#include "util/numeric/safe_assignment.h"
|
||
|
||
namespace crashpad {
|
||
namespace internal {
|
||
|
||
template <typename Traits>
|
||
MinidumpStringWriter<Traits>::MinidumpStringWriter()
|
||
: MinidumpWritable(), string_base_(new MinidumpStringType()), string_() {
|
||
}
|
||
|
||
template <typename Traits>
|
||
MinidumpStringWriter<Traits>::~MinidumpStringWriter() {
|
||
}
|
||
|
||
template <typename Traits>
|
||
bool MinidumpStringWriter<Traits>::Freeze() {
|
||
DCHECK_EQ(state(), kStateMutable);
|
||
|
||
if (!MinidumpWritable::Freeze()) {
|
||
return false;
|
||
}
|
||
|
||
size_t string_bytes = string_.size() * sizeof(string_[0]);
|
||
if (!AssignIfInRange(&string_base_->Length, string_bytes)) {
|
||
LOG(ERROR) << "string_bytes " << string_bytes << " out of range";
|
||
return false;
|
||
}
|
||
|
||
return true;
|
||
}
|
||
|
||
template <typename Traits>
|
||
size_t MinidumpStringWriter<Traits>::SizeOfObject() {
|
||
DCHECK_GE(state(), kStateFrozen);
|
||
|
||
// Include the NUL terminator.
|
||
return sizeof(*string_base_) + (string_.size() + 1) * sizeof(string_[0]);
|
||
}
|
||
|
||
template <typename Traits>
|
||
bool MinidumpStringWriter<Traits>::WriteObject(
|
||
FileWriterInterface* file_writer) {
|
||
DCHECK_EQ(state(), kStateWritable);
|
||
|
||
// The string’s length is stored in string_base_, and its data is stored in
|
||
// string_. Write them both.
|
||
WritableIoVec iov;
|
||
iov.iov_base = string_base_.get();
|
||
iov.iov_len = sizeof(*string_base_);
|
||
std::vector<WritableIoVec> iovecs(1, iov);
|
||
|
||
// Include the NUL terminator.
|
||
iov.iov_base = &string_[0];
|
||
iov.iov_len = (string_.size() + 1) * sizeof(string_[0]);
|
||
iovecs.push_back(iov);
|
||
|
||
return file_writer->WriteIoVec(&iovecs);
|
||
}
|
||
|
||
// Explicit template instantiation of the forms of MinidumpStringWriter<> used
|
||
// as base classes.
|
||
template class MinidumpStringWriter<MinidumpStringWriterUTF16Traits>;
|
||
template class MinidumpStringWriter<MinidumpStringWriterUTF8Traits>;
|
||
|
||
MinidumpUTF16StringWriter::~MinidumpUTF16StringWriter() {
|
||
}
|
||
|
||
void MinidumpUTF16StringWriter::SetUTF8(const std::string& string_utf8) {
|
||
DCHECK_EQ(state(), kStateMutable);
|
||
|
||
set_string(MinidumpWriterUtil::ConvertUTF8ToUTF16(string_utf8));
|
||
}
|
||
|
||
MinidumpUTF8StringWriter::~MinidumpUTF8StringWriter() {
|
||
}
|
||
|
||
template <typename MinidumpStringWriterType>
|
||
MinidumpStringListWriter<MinidumpStringWriterType>::MinidumpStringListWriter()
|
||
: MinidumpRVAListWriter() {
|
||
}
|
||
|
||
template <typename MinidumpStringWriterType>
|
||
MinidumpStringListWriter<
|
||
MinidumpStringWriterType>::~MinidumpStringListWriter() {
|
||
}
|
||
|
||
template <typename MinidumpStringWriterType>
|
||
void MinidumpStringListWriter<MinidumpStringWriterType>::InitializeFromVector(
|
||
const std::vector<std::string>& vector) {
|
||
DCHECK_EQ(state(), kStateMutable);
|
||
DCHECK(IsEmpty());
|
||
|
||
for (const std::string& string : vector) {
|
||
AddStringUTF8(string);
|
||
}
|
||
}
|
||
|
||
template <typename MinidumpStringWriterType>
|
||
void MinidumpStringListWriter<MinidumpStringWriterType>::AddStringUTF8(
|
||
const std::string& string_utf8) {
|
||
auto string_writer = std::make_unique<MinidumpStringWriterType>();
|
||
string_writer->SetUTF8(string_utf8);
|
||
AddChild(std::move(string_writer));
|
||
}
|
||
|
||
template <typename MinidumpStringWriterType>
|
||
bool MinidumpStringListWriter<MinidumpStringWriterType>::IsUseful() const {
|
||
return !IsEmpty();
|
||
}
|
||
|
||
// Explicit template instantiation of the forms of MinidumpStringListWriter<>
|
||
// used as type aliases.
|
||
template class MinidumpStringListWriter<MinidumpUTF16StringWriter>;
|
||
template class MinidumpStringListWriter<MinidumpUTF8StringWriter>;
|
||
|
||
} // namespace internal
|
||
} // namespace crashpad
|