mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-30 19:14:56 +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
78 lines
1.9 KiB
C++
78 lines
1.9 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.
|
|
|
|
#include "include/base/cef_weak_ptr.h"
|
|
|
|
namespace base {
|
|
namespace internal {
|
|
|
|
WeakReference::Flag::Flag() : is_valid_(true) {
|
|
// Flags only become bound when checked for validity, or invalidated,
|
|
// so that we can check that later validity/invalidation operations on
|
|
// the same Flag take place on the same thread.
|
|
thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
void WeakReference::Flag::Invalidate() {
|
|
// The flag being invalidated with a single ref implies that there are no
|
|
// weak pointers in existence. Allow deletion on other thread in this case.
|
|
DCHECK(thread_checker_.CalledOnValidThread() || HasOneRef())
|
|
<< "WeakPtrs must be invalidated on the same thread.";
|
|
is_valid_ = false;
|
|
}
|
|
|
|
bool WeakReference::Flag::IsValid() const {
|
|
DCHECK(thread_checker_.CalledOnValidThread())
|
|
<< "WeakPtrs must be checked on the same thread.";
|
|
return is_valid_;
|
|
}
|
|
|
|
WeakReference::Flag::~Flag() {
|
|
}
|
|
|
|
WeakReference::WeakReference() {
|
|
}
|
|
|
|
WeakReference::WeakReference(const Flag* flag) : flag_(flag) {
|
|
}
|
|
|
|
WeakReference::~WeakReference() {
|
|
}
|
|
|
|
bool WeakReference::is_valid() const { return flag_.get() && flag_->IsValid(); }
|
|
|
|
WeakReferenceOwner::WeakReferenceOwner() {
|
|
}
|
|
|
|
WeakReferenceOwner::~WeakReferenceOwner() {
|
|
Invalidate();
|
|
}
|
|
|
|
WeakReference WeakReferenceOwner::GetRef() const {
|
|
// If we hold the last reference to the Flag then create a new one.
|
|
if (!HasRefs())
|
|
flag_ = new WeakReference::Flag();
|
|
|
|
return WeakReference(flag_.get());
|
|
}
|
|
|
|
void WeakReferenceOwner::Invalidate() {
|
|
if (flag_.get()) {
|
|
flag_->Invalidate();
|
|
flag_ = NULL;
|
|
}
|
|
}
|
|
|
|
WeakPtrBase::WeakPtrBase() {
|
|
}
|
|
|
|
WeakPtrBase::~WeakPtrBase() {
|
|
}
|
|
|
|
WeakPtrBase::WeakPtrBase(const WeakReference& ref) : ref_(ref) {
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace base
|