synchronization/condition_variable_win.cc - Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: synchronization/condition_variable_win.cc

Issue 2045223003: Update to Chromium //base at Chromium commit 82baa9afc6620c68cb2168f20bb65e77e3e57f0a. (Closed) Base URL: https://github.com/domokit/base.git@master

Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: synchronization/condition_variable_win.cc

diff --git a/synchronization/condition_variable_win.cc b/synchronization/condition_variable_win.cc

index 470e564c5b071b75dc3c5219423ec191cefd9f4f..4256ac8224d48de600a50c18e1b3d3cf1aed36f6 100644

--- a/synchronization/condition_variable_win.cc

+++ b/synchronization/condition_variable_win.cc

@@ -8,7 +8,6 @@

#include <stack>

#include "base/compiler_specific.h"

-#include "base/logging.h"

#include "base/synchronization/lock.h"

#include "base/threading/thread_restrictions.h"

#include "base/time/time.h"

@@ -99,7 +98,7 @@ void WinVistaCondVar::TimedWait(const TimeDelta& max_time) {

DWORD timeout = static_cast<DWORD>(max_time.InMilliseconds());

CRITICAL_SECTION* cs = user_lock_.lock_.native_handle();

-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)

+#if DCHECK_IS_ON()

user_lock_.CheckHeldAndUnmark();

#endif

« no previous file with comments | « synchronization/condition_variable_posix.cc ('k') | synchronization/lock.h » ('j') | no next file with comments »