From 866cf337ee0834ccc1555cb645280b4a6047e4c3 Mon Sep 17 00:00:00 2001 From: "steveblock@chromium.org" Date: Wed, 12 Oct 2011 03:09:42 +0000 Subject: Modify WaitableEvent::Wait() to return void Currently, WaitableEvent::Wait() returns bool. However, the Windows implementation DCHECKs that the return value is true and the POSIX implementation can never return false. Also, all call sites that use the return value simply DCHECK that it's true. This change modifies the method to return void, adds a DCHECK in the POSIX implementation and updates call sites. Review URL: http://codereview.chromium.org/8221021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104990 0039d316-1c4b-4281-b951-d872f2087c98 --- .../in_process_webkit/indexed_db_key_utility_client.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'content') diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc index 701b964..9683385 100644 --- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc +++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc @@ -197,9 +197,9 @@ void KeyUtilityClientImpl::StartUtilityProcess() { DCHECK(state_ == STATE_UNINITIALIZED); GetRDHAndStartUtilityProcess(); - bool ret = waitable_event_.Wait(); + waitable_event_.Wait(); - DCHECK(ret && state_ == STATE_INITIALIZED); + DCHECK(state_ == STATE_INITIALIZED); } void KeyUtilityClientImpl::CreateIDBKeysFromSerializedValuesAndKeyPath( @@ -216,8 +216,8 @@ void KeyUtilityClientImpl::CreateIDBKeysFromSerializedValuesAndKeyPath( state_ = STATE_CREATING_KEYS; CallStartIDBKeyFromValueAndKeyPathFromIOThread(values, key_path); - bool ret = waitable_event_.Wait(); - DCHECK(ret && state_ == STATE_INITIALIZED); + waitable_event_.Wait(); + DCHECK(state_ == STATE_INITIALIZED); *keys = keys_; } @@ -235,8 +235,8 @@ SerializedScriptValue KeyUtilityClientImpl::InjectIDBKeyIntoSerializedValue( state_ = STATE_INJECTING_KEY; CallStartInjectIDBKeyFromIOThread(key, value, key_path); - bool ret = waitable_event_.Wait(); - DCHECK(ret && state_ == STATE_INITIALIZED); + waitable_event_.Wait(); + DCHECK(state_ == STATE_INITIALIZED); return value_after_injection_; } -- cgit v1.1