3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upstream change from chromium

Browse Source 
This was part of a change to delete base::ThreadLocalStorage::StaticSlot.

Bug: crashpad:271
Change-Id: I0df76318aef05cbaecab660253cb388e3929f693
Reviewed-on: https://chromium-review.googlesource.com/c/1405788
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
This commit is contained in:
Vlad Tsyrklevich 2019-01-10 10:25:28 -08:00 committed by Commit Bot
parent e7895b4404
commit 732768cc9d
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/thread/thread_log_messages.cc
View File

@ -46,10 +46,6 @@ class ThreadLogMessagesMaster {
private:
ThreadLogMessagesMaster() {
DCHECK(!tls_.initialized());
tls_.Initialize(nullptr);
DCHECK(tls_.initialized());
DCHECK(!logging::GetLogMessageHandler());
logging::SetLogMessageHandler(LogMessageHandler);
}
@ -62,7 +58,7 @@ class ThreadLogMessagesMaster {
size_t message_start,
const std::string& string) {
std::vector<std::string>* log_messages =
reinterpret_cast<std::vector<std::string>*>(tls_.Get());
reinterpret_cast<std::vector<std::string>*>(GetInstance()->tls_.Get());
if (log_messages) {
log_messages->push_back(string);
}
@ -72,15 +68,11 @@ class ThreadLogMessagesMaster {
return false;
}
static base::ThreadLocalStorage::StaticSlot tls_;
base::ThreadLocalStorage::Slot tls_;
DISALLOW_COPY_AND_ASSIGN(ThreadLogMessagesMaster);
};
// static
base::ThreadLocalStorage::StaticSlot ThreadLogMessagesMaster::tls_
= TLS_INITIALIZER;
} // namespace
ThreadLogMessages::ThreadLogMessages() : log_messages_() {