mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 17:15:57 +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
127 lines
5.1 KiB
C++
127 lines
5.1 KiB
C++
// Copyright (c) 2011 Google Inc. All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following disclaimer
|
|
// in the documentation and/or other materials provided with the
|
|
// distribution.
|
|
// * Neither the name of Google Inc. nor the name Chromium Embedded
|
|
// Framework nor the names of its contributors may be used to endorse
|
|
// or promote products derived from this software without specific prior
|
|
// written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
// Do not include this header file directly. Use base/cef_atomicops.h
|
|
// instead.
|
|
|
|
#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
|
|
#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
|
|
|
|
// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32,
|
|
// which in turn means int. On some LP32 platforms, intptr_t is an int, but
|
|
// on others, it's a long. When AtomicWord and Atomic32 are based on different
|
|
// fundamental types, their pointers are incompatible.
|
|
//
|
|
// This file defines function overloads to allow both AtomicWord and Atomic32
|
|
// data to be used with this interface.
|
|
//
|
|
// On LP64 platforms, AtomicWord and Atomic64 are both always long,
|
|
// so this problem doesn't occur.
|
|
|
|
#if !defined(ARCH_CPU_64_BITS)
|
|
|
|
namespace base {
|
|
namespace subtle {
|
|
|
|
inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr,
|
|
AtomicWord old_value,
|
|
AtomicWord new_value) {
|
|
return NoBarrier_CompareAndSwap(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
|
|
}
|
|
|
|
inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr,
|
|
AtomicWord new_value) {
|
|
return NoBarrier_AtomicExchange(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), new_value);
|
|
}
|
|
|
|
inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr,
|
|
AtomicWord increment) {
|
|
return NoBarrier_AtomicIncrement(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), increment);
|
|
}
|
|
|
|
inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr,
|
|
AtomicWord increment) {
|
|
return Barrier_AtomicIncrement(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), increment);
|
|
}
|
|
|
|
inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr,
|
|
AtomicWord old_value,
|
|
AtomicWord new_value) {
|
|
return base::subtle::Acquire_CompareAndSwap(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
|
|
}
|
|
|
|
inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr,
|
|
AtomicWord old_value,
|
|
AtomicWord new_value) {
|
|
return base::subtle::Release_CompareAndSwap(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), old_value, new_value);
|
|
}
|
|
|
|
inline void NoBarrier_Store(volatile AtomicWord *ptr, AtomicWord value) {
|
|
NoBarrier_Store(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), value);
|
|
}
|
|
|
|
inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) {
|
|
return base::subtle::Acquire_Store(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), value);
|
|
}
|
|
|
|
inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) {
|
|
return base::subtle::Release_Store(
|
|
reinterpret_cast<volatile Atomic32*>(ptr), value);
|
|
}
|
|
|
|
inline AtomicWord NoBarrier_Load(volatile const AtomicWord *ptr) {
|
|
return NoBarrier_Load(
|
|
reinterpret_cast<volatile const Atomic32*>(ptr));
|
|
}
|
|
|
|
inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) {
|
|
return base::subtle::Acquire_Load(
|
|
reinterpret_cast<volatile const Atomic32*>(ptr));
|
|
}
|
|
|
|
inline AtomicWord Release_Load(volatile const AtomicWord* ptr) {
|
|
return base::subtle::Release_Load(
|
|
reinterpret_cast<volatile const Atomic32*>(ptr));
|
|
}
|
|
|
|
} // namespace base::subtle
|
|
} // namespace base
|
|
|
|
#endif // !defined(ARCH_CPU_64_BITS)
|
|
|
|
#endif // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_ATOMICWORD_COMPAT_H_
|