crashpad/minidump/minidump_user_stream_writer.cc
Mark Mentovai 7a849482ea Switch the language standard to C++14 and use std::make_unique
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>
2017-10-12 19:07:13 +00:00

139 lines
4.1 KiB
C++

// Copyright 2016 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_user_stream_writer.h"
#include "util/file/file_writer.h"
namespace crashpad {
class MinidumpUserStreamWriter::ContentsWriter {
public:
virtual ~ContentsWriter() {}
virtual bool WriteContents(FileWriterInterface* writer) = 0;
virtual size_t GetSize() const = 0;
};
class MinidumpUserStreamWriter::SnapshotContentsWriter final
: public MinidumpUserStreamWriter::ContentsWriter,
public MemorySnapshot::Delegate {
public:
explicit SnapshotContentsWriter(const MemorySnapshot* snapshot)
: snapshot_(snapshot), writer_(nullptr) {}
bool WriteContents(FileWriterInterface* writer) override {
DCHECK(!writer_);
writer_ = writer;
if (!snapshot_)
return true;
return snapshot_->Read(this);
}
size_t GetSize() const override { return snapshot_ ? snapshot_->Size() : 0; };
bool MemorySnapshotDelegateRead(void* data, size_t size) override {
return writer_->Write(data, size);
}
private:
const MemorySnapshot* snapshot_;
FileWriterInterface* writer_;
DISALLOW_COPY_AND_ASSIGN(SnapshotContentsWriter);
};
class MinidumpUserStreamWriter::ExtensionStreamContentsWriter final
: public MinidumpUserStreamWriter::ContentsWriter,
public MinidumpUserExtensionStreamDataSource::Delegate {
public:
explicit ExtensionStreamContentsWriter(
std::unique_ptr<MinidumpUserExtensionStreamDataSource> data_source)
: data_source_(std::move(data_source)), writer_(nullptr) {}
bool WriteContents(FileWriterInterface* writer) override {
DCHECK(!writer_);
writer_ = writer;
return data_source_->ReadStreamData(this);
}
size_t GetSize() const override { return data_source_->StreamDataSize(); }
bool ExtensionStreamDataSourceRead(const void* data, size_t size) override {
return writer_->Write(data, size);
}
private:
std::unique_ptr<MinidumpUserExtensionStreamDataSource> data_source_;
FileWriterInterface* writer_;
DISALLOW_COPY_AND_ASSIGN(ExtensionStreamContentsWriter);
};
MinidumpUserStreamWriter::MinidumpUserStreamWriter() : stream_type_() {}
MinidumpUserStreamWriter::~MinidumpUserStreamWriter() {
}
void MinidumpUserStreamWriter::InitializeFromSnapshot(
const UserMinidumpStream* stream) {
DCHECK_EQ(state(), kStateMutable);
DCHECK(!contents_writer_.get());
stream_type_ = static_cast<MinidumpStreamType>(stream->stream_type());
contents_writer_ = std::make_unique<SnapshotContentsWriter>(stream->memory());
}
void MinidumpUserStreamWriter::InitializeFromUserExtensionStream(
std::unique_ptr<MinidumpUserExtensionStreamDataSource> data_source) {
DCHECK_EQ(state(), kStateMutable);
DCHECK(!contents_writer_.get());
stream_type_ = data_source->stream_type();
contents_writer_ =
std::make_unique<ExtensionStreamContentsWriter>(std::move(data_source));
}
bool MinidumpUserStreamWriter::Freeze() {
DCHECK_EQ(state(), kStateMutable);
DCHECK_NE(stream_type_, 0u);
return MinidumpStreamWriter::Freeze();
}
size_t MinidumpUserStreamWriter::SizeOfObject() {
DCHECK_GE(state(), kStateFrozen);
return contents_writer_->GetSize();
}
std::vector<internal::MinidumpWritable*>
MinidumpUserStreamWriter::Children() {
DCHECK_GE(state(), kStateFrozen);
return std::vector<internal::MinidumpWritable*>();
}
bool MinidumpUserStreamWriter::WriteObject(FileWriterInterface* file_writer) {
DCHECK_EQ(state(), kStateWritable);
return contents_writer_->WriteContents(file_writer);
}
MinidumpStreamType MinidumpUserStreamWriter::StreamType() const {
return static_cast<MinidumpStreamType>(stream_type_);
}
} // namespace crashpad