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

Side by Side Diff: minidump/minidump_exception_writer.cc

Issue 1483073004: Replace use of .Pass() with crashpad::move(). (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: pass: . Created 5 years 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
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "minidump/minidump_exception_writer.h" 15 #include "minidump/minidump_exception_writer.h"
16 16
17 #include <sys/types.h> 17 #include <sys/types.h>
18 18
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/numerics/safe_conversions.h" 20 #include "base/numerics/safe_conversions.h"
21 #include "minidump/minidump_context_writer.h" 21 #include "minidump/minidump_context_writer.h"
22 #include "snapshot/exception_snapshot.h" 22 #include "snapshot/exception_snapshot.h"
23 #include "util/file/file_writer.h" 23 #include "util/file/file_writer.h"
24 #include "util/stdlib/move.h"
24 25
25 namespace crashpad { 26 namespace crashpad {
26 27
27 MinidumpExceptionWriter::MinidumpExceptionWriter() 28 MinidumpExceptionWriter::MinidumpExceptionWriter()
28 : MinidumpStreamWriter(), exception_(), context_(nullptr) { 29 : MinidumpStreamWriter(), exception_(), context_(nullptr) {
29 } 30 }
30 31
31 MinidumpExceptionWriter::~MinidumpExceptionWriter() { 32 MinidumpExceptionWriter::~MinidumpExceptionWriter() {
32 } 33 }
33 34
34 void MinidumpExceptionWriter::InitializeFromSnapshot( 35 void MinidumpExceptionWriter::InitializeFromSnapshot(
35 const ExceptionSnapshot* exception_snapshot, 36 const ExceptionSnapshot* exception_snapshot,
36 const MinidumpThreadIDMap& thread_id_map) { 37 const MinidumpThreadIDMap& thread_id_map) {
37 DCHECK_EQ(state(), kStateMutable); 38 DCHECK_EQ(state(), kStateMutable);
38 DCHECK(!context_); 39 DCHECK(!context_);
39 40
40 auto thread_id_it = thread_id_map.find(exception_snapshot->ThreadID()); 41 auto thread_id_it = thread_id_map.find(exception_snapshot->ThreadID());
41 DCHECK(thread_id_it != thread_id_map.end()); 42 DCHECK(thread_id_it != thread_id_map.end());
42 SetThreadID(thread_id_it->second); 43 SetThreadID(thread_id_it->second);
43 44
44 SetExceptionCode(exception_snapshot->Exception()); 45 SetExceptionCode(exception_snapshot->Exception());
45 SetExceptionFlags(exception_snapshot->ExceptionInfo()); 46 SetExceptionFlags(exception_snapshot->ExceptionInfo());
46 SetExceptionAddress(exception_snapshot->ExceptionAddress()); 47 SetExceptionAddress(exception_snapshot->ExceptionAddress());
47 SetExceptionInformation(exception_snapshot->Codes()); 48 SetExceptionInformation(exception_snapshot->Codes());
48 49
49 scoped_ptr<MinidumpContextWriter> context = 50 scoped_ptr<MinidumpContextWriter> context =
50 MinidumpContextWriter::CreateFromSnapshot(exception_snapshot->Context()); 51 MinidumpContextWriter::CreateFromSnapshot(exception_snapshot->Context());
51 SetContext(context.Pass()); 52 SetContext(crashpad::move(context));
52 } 53 }
53 54
54 void MinidumpExceptionWriter::SetContext( 55 void MinidumpExceptionWriter::SetContext(
55 scoped_ptr<MinidumpContextWriter> context) { 56 scoped_ptr<MinidumpContextWriter> context) {
56 DCHECK_EQ(state(), kStateMutable); 57 DCHECK_EQ(state(), kStateMutable);
57 58
58 context_ = context.Pass(); 59 context_ = crashpad::move(context);
59 } 60 }
60 61
61 void MinidumpExceptionWriter::SetExceptionInformation( 62 void MinidumpExceptionWriter::SetExceptionInformation(
62 const std::vector<uint64_t>& exception_information) { 63 const std::vector<uint64_t>& exception_information) {
63 DCHECK_EQ(state(), kStateMutable); 64 DCHECK_EQ(state(), kStateMutable);
64 65
65 const size_t parameters = exception_information.size(); 66 const size_t parameters = exception_information.size();
66 const size_t kMaxParameters = 67 const size_t kMaxParameters =
67 arraysize(exception_.ExceptionRecord.ExceptionInformation); 68 arraysize(exception_.ExceptionRecord.ExceptionInformation);
68 CHECK_LE(parameters, kMaxParameters); 69 CHECK_LE(parameters, kMaxParameters);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 DCHECK_EQ(state(), kStateWritable); 113 DCHECK_EQ(state(), kStateWritable);
113 114
114 return file_writer->Write(&exception_, sizeof(exception_)); 115 return file_writer->Write(&exception_, sizeof(exception_));
115 } 116 }
116 117
117 MinidumpStreamType MinidumpExceptionWriter::StreamType() const { 118 MinidumpStreamType MinidumpExceptionWriter::StreamType() const {
118 return kMinidumpStreamTypeException; 119 return kMinidumpStreamTypeException;
119 } 120 }
120 121
121 } // namespace crashpad 122 } // namespace crashpad
OLDNEW
« no previous file with comments | « minidump/minidump_crashpad_info_writer_test.cc ('k') | minidump/minidump_exception_writer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698