From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/threading/thread.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chromium/base/threading/thread.cc') diff --git a/chromium/base/threading/thread.cc b/chromium/base/threading/thread.cc index d264c1d2602..8659724616a 100644 --- a/chromium/base/threading/thread.cc +++ b/chromium/base/threading/thread.cc @@ -278,9 +278,11 @@ void Thread::DetachFromSequence() { } PlatformThreadId Thread::GetThreadId() const { - // If the thread is created but not started yet, wait for |id_| being ready. - base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait; - id_event_.Wait(); + if (!id_event_.IsSignaled()) { + // If the thread is created but not started yet, wait for |id_| being ready. + base::ScopedAllowBaseSyncPrimitivesOutsideBlockingScope allow_wait; + id_event_.Wait(); + } return id_; } -- cgit v1.2.1