From 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 5 Apr 2017 17:15:33 +0200 Subject: BASELINE: Update Chromium to 58.0.3029.54 Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1 Reviewed-by: Peter Varga --- chromium/base/threading/thread.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'chromium/base/threading/thread.cc') diff --git a/chromium/base/threading/thread.cc b/chromium/base/threading/thread.cc index ec2f98dd4b3..0aeed2a9e4b 100644 --- a/chromium/base/threading/thread.cc +++ b/chromium/base/threading/thread.cc @@ -213,6 +213,11 @@ void Thread::StopSoon() { FROM_HERE, base::Bind(&Thread::ThreadQuitHelper, Unretained(this))); } +void Thread::DetachFromSequence() { + DCHECK(owning_sequence_checker_.CalledOnValidSequence()); + owning_sequence_checker_.DetachFromSequence(); +} + PlatformThreadId Thread::GetThreadId() const { // If the thread is created but not started yet, wait for |id_| being ready. base::ThreadRestrictions::ScopedAllowWait allow_wait; @@ -277,7 +282,7 @@ void Thread::ThreadMain() { // any place in the following thread initialization code. DCHECK(!id_event_.IsSignaled()); // Note: this read of |id_| while |id_event_| isn't signaled is exceptionally - // okay because ThreadMain has an happens-after relationship with the other + // okay because ThreadMain has a happens-after relationship with the other // write in StartWithOptions(). DCHECK_EQ(kInvalidThreadId, id_); id_ = PlatformThread::CurrentId(); -- cgit v1.2.3