mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 18:16:20 +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
102 lines
3.1 KiB
C++
102 lines
3.1 KiB
C++
// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#ifndef CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_
|
|
#define CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_
|
|
#pragma once
|
|
|
|
#include "include/base/cef_logging.h"
|
|
#include "include/base/cef_macros.h"
|
|
#include "include/cef_base.h"
|
|
#include "include/capi/cef_base_capi.h"
|
|
|
|
|
|
// CefCToCpp implementation for CefBase.
|
|
class CefBaseCToCpp : public CefBase {
|
|
public:
|
|
// Use this method to create a wrapper class instance for a structure
|
|
// received from the other side.
|
|
static CefRefPtr<CefBase> Wrap(cef_base_t* s) {
|
|
if (!s)
|
|
return NULL;
|
|
|
|
// Wrap their structure with the CefCToCpp object.
|
|
CefBaseCToCpp* wrapper = new CefBaseCToCpp(s);
|
|
// Put the wrapper object in a smart pointer.
|
|
CefRefPtr<CefBase> wrapperPtr(wrapper);
|
|
// Release the reference that was added to the CefCppToC wrapper object on
|
|
// the other side before their structure was passed to us.
|
|
wrapper->UnderlyingRelease();
|
|
// Return the smart pointer.
|
|
return wrapperPtr;
|
|
}
|
|
|
|
// Use this method to retrieve the underlying structure from a wrapper class
|
|
// instance for return back to the other side.
|
|
static cef_base_t* Unwrap(CefRefPtr<CefBase> c) {
|
|
if (!c.get())
|
|
return NULL;
|
|
|
|
// Cast the object to our wrapper class type.
|
|
CefBaseCToCpp* wrapper = static_cast<CefBaseCToCpp*>(c.get());
|
|
// Add a reference to the CefCppToC wrapper object on the other side that
|
|
// will be released once the structure is received.
|
|
wrapper->UnderlyingAddRef();
|
|
// Return their original structure.
|
|
return wrapper->GetStruct();
|
|
}
|
|
|
|
explicit CefBaseCToCpp(cef_base_t* str)
|
|
: struct_(str) {
|
|
DCHECK(str);
|
|
}
|
|
virtual ~CefBaseCToCpp() {}
|
|
|
|
// If returning the structure across the DLL boundary you should call
|
|
// UnderlyingAddRef() on this wrapping CefCToCpp object. On the other side of
|
|
// the DLL boundary, call Release() on the CefCppToC object.
|
|
cef_base_t* GetStruct() { return struct_; }
|
|
|
|
// CefBase methods increment/decrement reference counts on both this object
|
|
// and the underlying wrapped structure.
|
|
void AddRef() const {
|
|
UnderlyingAddRef();
|
|
ref_count_.AddRef();
|
|
}
|
|
bool Release() const {
|
|
UnderlyingRelease();
|
|
if (ref_count_.Release()) {
|
|
delete this;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
bool HasOneRef() const { return ref_count_.HasOneRef(); }
|
|
|
|
// Increment/decrement reference counts on only the underlying class.
|
|
void UnderlyingAddRef() const {
|
|
if (struct_->add_ref)
|
|
struct_->add_ref(struct_);
|
|
}
|
|
bool UnderlyingRelease() const {
|
|
if (!struct_->release)
|
|
return false;
|
|
return struct_->release(struct_) ? true : false;
|
|
}
|
|
bool UnderlyingHasOneRef() const {
|
|
if (!struct_->has_one_ref)
|
|
return false;
|
|
return struct_->has_one_ref(struct_) ? true : false;
|
|
}
|
|
|
|
private:
|
|
CefRefCount ref_count_;
|
|
cef_base_t* struct_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(CefBaseCToCpp);
|
|
};
|
|
|
|
|
|
#endif // CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_
|