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

Side by Side Diff: snapshot/mac/thread_snapshot_mac.h

Issue 1382963002: mac: build fix after http://crrev.com/1364803004 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: . Created 5 years, 2 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 | « no previous file | snapshot/mac/thread_snapshot_mac.cc » ('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 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,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 const ProcessReader::Thread& process_reader_thread); 52 const ProcessReader::Thread& process_reader_thread);
53 53
54 // ThreadSnapshot: 54 // ThreadSnapshot:
55 55
56 const CPUContext* Context() const override; 56 const CPUContext* Context() const override;
57 const MemorySnapshot* Stack() const override; 57 const MemorySnapshot* Stack() const override;
58 uint64_t ThreadID() const override; 58 uint64_t ThreadID() const override;
59 int SuspendCount() const override; 59 int SuspendCount() const override;
60 int Priority() const override; 60 int Priority() const override;
61 uint64_t ThreadSpecificDataAddress() const override; 61 uint64_t ThreadSpecificDataAddress() const override;
62 std::vector<const MemorySnapshot*> ExtraMemory() const override;
62 63
63 private: 64 private:
64 #if defined(ARCH_CPU_X86_FAMILY) 65 #if defined(ARCH_CPU_X86_FAMILY)
65 union { 66 union {
66 CPUContextX86 x86; 67 CPUContextX86 x86;
67 CPUContextX86_64 x86_64; 68 CPUContextX86_64 x86_64;
68 } context_union_; 69 } context_union_;
69 #endif 70 #endif
70 CPUContext context_; 71 CPUContext context_;
71 MemorySnapshotMac stack_; 72 MemorySnapshotMac stack_;
72 uint64_t thread_id_; 73 uint64_t thread_id_;
73 uint64_t thread_specific_data_address_; 74 uint64_t thread_specific_data_address_;
74 thread_t thread_; 75 thread_t thread_;
75 int suspend_count_; 76 int suspend_count_;
76 int priority_; 77 int priority_;
77 InitializationStateDcheck initialized_; 78 InitializationStateDcheck initialized_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(ThreadSnapshotMac); 80 DISALLOW_COPY_AND_ASSIGN(ThreadSnapshotMac);
80 }; 81 };
81 82
82 } // namespace internal 83 } // namespace internal
83 } // namespace crashpad 84 } // namespace crashpad
84 85
85 #endif // CRASHPAD_SNAPSHOT_MAC_THREAD_SNAPSHOT_MAC_H_ 86 #endif // CRASHPAD_SNAPSHOT_MAC_THREAD_SNAPSHOT_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | snapshot/mac/thread_snapshot_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698