mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-08 16:22:34 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
45 lines
1.3 KiB
C++
45 lines
1.3 KiB
C++
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// This file is used for debugging assertion support. The Lock class
|
|
// is functionally a wrapper around the LockImpl class, so the only
|
|
// real intelligence in the class is in the debugging logic.
|
|
|
|
#if !defined(NDEBUG)
|
|
|
|
#include "include/base/cef_lock.h"
|
|
#include "include/base/cef_logging.h"
|
|
|
|
namespace base {
|
|
|
|
Lock::Lock() : lock_() {
|
|
}
|
|
|
|
Lock::~Lock() {
|
|
DCHECK(owning_thread_ref_.is_null());
|
|
}
|
|
|
|
void Lock::AssertAcquired() const {
|
|
DCHECK(owning_thread_ref_ == PlatformThread::CurrentRef());
|
|
}
|
|
|
|
void Lock::CheckHeldAndUnmark() {
|
|
DCHECK(owning_thread_ref_ == PlatformThread::CurrentRef());
|
|
owning_thread_ref_ = PlatformThreadRef();
|
|
}
|
|
|
|
void Lock::CheckUnheldAndMark() {
|
|
// Hitting this DCHECK means that your code is trying to re-enter a lock that
|
|
// is already held. The Chromium Lock implementation is not reentrant.
|
|
// See "Why can the holder of a Lock not reacquire it?" at
|
|
// http://www.chromium.org/developers/lock-and-condition-variable for more
|
|
// information.
|
|
DCHECK(owning_thread_ref_.is_null());
|
|
owning_thread_ref_ = PlatformThread::CurrentRef();
|
|
}
|
|
|
|
} // namespace base
|
|
|
|
#endif // NDEBUG
|