mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-19 05:04:08 +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
126 lines
4.9 KiB
C++
126 lines
4.9 KiB
C++
// Copyright (c) 2014 Marshall A. Greenblatt. Portions copyright (c) 2012
|
|
// 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.
|
|
|
|
#ifndef CEF_INCLUDE_BASE_THREAD_CHECKER_H_
|
|
#define CEF_INCLUDE_BASE_THREAD_CHECKER_H_
|
|
#pragma once
|
|
|
|
#if defined(BASE_THREADING_THREAD_CHECKER_H_)
|
|
// Do nothing if the Chromium header has already been included.
|
|
// This can happen in cases where Chromium code is used directly by the
|
|
// client application. When using Chromium code directly always include
|
|
// the Chromium header first to avoid type conflicts.
|
|
#elif defined(BUILDING_CEF_SHARED)
|
|
// When building CEF include the Chromium header directly.
|
|
#include "base/threading/thread_checker.h"
|
|
#else // !BUILDING_CEF_SHARED
|
|
// The following is substantially similar to the Chromium implementation.
|
|
// If the Chromium implementation diverges the below implementation should be
|
|
// updated to match.
|
|
|
|
// Apart from debug builds, we also enable the thread checker in
|
|
// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
|
|
// with this define will get the same level of thread checking as
|
|
// debug bots.
|
|
//
|
|
// Note that this does not perfectly match situations where DCHECK is
|
|
// enabled. For example a non-official release build may have
|
|
// DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be
|
|
// disabled) but have DCHECKs enabled at runtime.
|
|
#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
|
|
#define ENABLE_THREAD_CHECKER 1
|
|
#else
|
|
#define ENABLE_THREAD_CHECKER 0
|
|
#endif
|
|
|
|
#include "include/base/internal/cef_thread_checker_impl.h"
|
|
|
|
namespace base {
|
|
|
|
// Do nothing implementation, for use in release mode.
|
|
//
|
|
// Note: You should almost always use the ThreadChecker class to get the
|
|
// right version for your build configuration.
|
|
class ThreadCheckerDoNothing {
|
|
public:
|
|
bool CalledOnValidThread() const {
|
|
return true;
|
|
}
|
|
|
|
void DetachFromThread() {}
|
|
};
|
|
|
|
// ThreadChecker is a helper class used to help verify that some methods of a
|
|
// class are called from the same thread. It provides identical functionality to
|
|
// base::NonThreadSafe, but it is meant to be held as a member variable, rather
|
|
// than inherited from base::NonThreadSafe.
|
|
//
|
|
// While inheriting from base::NonThreadSafe may give a clear indication about
|
|
// the thread-safety of a class, it may also lead to violations of the style
|
|
// guide with regard to multiple inheritance. The choice between having a
|
|
// ThreadChecker member and inheriting from base::NonThreadSafe should be based
|
|
// on whether:
|
|
// - Derived classes need to know the thread they belong to, as opposed to
|
|
// having that functionality fully encapsulated in the base class.
|
|
// - Derived classes should be able to reassign the base class to another
|
|
// thread, via DetachFromThread.
|
|
//
|
|
// If neither of these are true, then having a ThreadChecker member and calling
|
|
// CalledOnValidThread is the preferable solution.
|
|
//
|
|
// Example:
|
|
// class MyClass {
|
|
// public:
|
|
// void Foo() {
|
|
// DCHECK(thread_checker_.CalledOnValidThread());
|
|
// ... (do stuff) ...
|
|
// }
|
|
//
|
|
// private:
|
|
// ThreadChecker thread_checker_;
|
|
// }
|
|
//
|
|
// In Release mode, CalledOnValidThread will always return true.
|
|
#if ENABLE_THREAD_CHECKER
|
|
class ThreadChecker : public ThreadCheckerImpl {
|
|
};
|
|
#else
|
|
class ThreadChecker : public ThreadCheckerDoNothing {
|
|
};
|
|
#endif // ENABLE_THREAD_CHECKER
|
|
|
|
#undef ENABLE_THREAD_CHECKER
|
|
|
|
} // namespace base
|
|
|
|
#endif // !BUILDING_CEF_SHARED
|
|
|
|
#endif // CEF_INCLUDE_BASE_THREAD_CHECKER_H_
|